Skip to content

Commit 4588b8d

Browse files
authored
[To dev/1.3] Pipe: Upgraded bouncy castle && Added logs for pipe tsFile parser (#17504) (#17523)
* [To dev/1.3] Pipe: Upgraded bouncy castle && Added logs for pipe tsFile parser (#17504) * fixed
1 parent ecef8f7 commit 4588b8d

4 files changed

Lines changed: 36 additions & 4 deletions

File tree

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.slf4j.Logger;
4040
import org.slf4j.LoggerFactory;
4141

42+
import java.io.File;
4243
import java.io.IOException;
4344

4445
public abstract class TsFileInsertionDataContainer implements AutoCloseable {
@@ -69,13 +70,15 @@ public abstract class TsFileInsertionDataContainer implements AutoCloseable {
6970
protected Iterable<TabletInsertionEvent> tabletInsertionIterable;
7071

7172
protected TsFileInsertionDataContainer(
73+
final File tsFile,
7274
final String pipeName,
7375
final long creationTime,
7476
final PipePattern pattern,
7577
final long startTime,
7678
final long endTime,
7779
final PipeTaskMeta pipeTaskMeta,
78-
final EnrichedEvent sourceEvent) {
80+
final EnrichedEvent sourceEvent,
81+
final boolean isWithMod) {
7982
this.pipeName = pipeName;
8083
this.creationTime = creationTime;
8184

@@ -93,6 +96,17 @@ protected TsFileInsertionDataContainer(
9396
PipeDataNodeResourceManager.memory()
9497
.forceAllocateForTabletWithRetry(
9598
IoTDBDescriptor.getInstance().getConfig().getPipeDataStructureTabletSizeInBytes());
99+
100+
LOGGER.info(
101+
"TsFile {} has initialized {}, pipeName: {}, creation time: {}, pattern: {}, startTime: {}, endTime: {}, withMod: {}",
102+
tsFile,
103+
getClass().getSimpleName(),
104+
pipeName,
105+
creationTime,
106+
pattern,
107+
startTime,
108+
endTime,
109+
isWithMod);
96110
}
97111

98112
/**

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,16 @@ public TsFileInsertionQueryDataContainer(
114114
final Map<IDeviceID, Boolean> deviceIsAlignedMap,
115115
final boolean isWithMod)
116116
throws IOException {
117-
super(pipeName, creationTime, pattern, startTime, endTime, pipeTaskMeta, sourceEvent);
117+
super(
118+
tsFile,
119+
pipeName,
120+
creationTime,
121+
pattern,
122+
startTime,
123+
endTime,
124+
pipeTaskMeta,
125+
sourceEvent,
126+
isWithMod);
118127

119128
try {
120129
currentModifications =

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,16 @@ public TsFileInsertionScanDataContainer(
116116
final EnrichedEvent sourceEvent,
117117
final boolean isWithMod)
118118
throws IOException {
119-
super(pipeName, creationTime, pattern, startTime, endTime, pipeTaskMeta, sourceEvent);
119+
super(
120+
tsFile,
121+
pipeName,
122+
creationTime,
123+
pattern,
124+
startTime,
125+
endTime,
126+
pipeTaskMeta,
127+
sourceEvent,
128+
isWithMod);
120129

121130
this.startTime = startTime;
122131
this.endTime = endTime;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<argLine/>
6161
<awaitility.version>4.2.0</awaitility.version>
6262
<boost.include.dir/>
63-
<bouncycastle.version>1.81</bouncycastle.version>
63+
<bouncycastle.version>1.84</bouncycastle.version>
6464
<!-- This was the last version to support Java 8 -->
6565
<caffeine.version>2.9.3</caffeine.version>
6666
<cglib.version>3.3.0</cglib.version>

0 commit comments

Comments
 (0)