Skip to content

Commit cb62b42

Browse files
committed
[To dev/1.3] Pipe: Upgraded bouncy castle && Added logs for pipe tsFile parser (#17504)
1 parent 413b074 commit cb62b42

4 files changed

Lines changed: 37 additions & 4 deletions

File tree

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern;
2525
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
2626
import org.apache.iotdb.db.conf.IoTDBDescriptor;
27+
import org.apache.iotdb.db.pipe.event.common.tsfile.parser.table.TsFileInsertionEventTableParser;
2728
import org.apache.iotdb.db.pipe.metric.overview.PipeTsFileToTabletsMetrics;
2829
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
2930
import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryBlock;
@@ -39,6 +40,7 @@
3940
import org.slf4j.Logger;
4041
import org.slf4j.LoggerFactory;
4142

43+
import java.io.File;
4244
import java.io.IOException;
4345

4446
public abstract class TsFileInsertionDataContainer implements AutoCloseable {
@@ -69,13 +71,15 @@ public abstract class TsFileInsertionDataContainer implements AutoCloseable {
6971
protected Iterable<TabletInsertionEvent> tabletInsertionIterable;
7072

7173
protected TsFileInsertionDataContainer(
74+
final File tsFile,
7275
final String pipeName,
7376
final long creationTime,
7477
final PipePattern pattern,
7578
final long startTime,
7679
final long endTime,
7780
final PipeTaskMeta pipeTaskMeta,
78-
final EnrichedEvent sourceEvent) {
81+
final EnrichedEvent sourceEvent,
82+
final boolean isWithMod) {
7983
this.pipeName = pipeName;
8084
this.creationTime = creationTime;
8185

@@ -93,6 +97,17 @@ protected TsFileInsertionDataContainer(
9397
PipeDataNodeResourceManager.memory()
9498
.forceAllocateForTabletWithRetry(
9599
IoTDBDescriptor.getInstance().getConfig().getPipeDataStructureTabletSizeInBytes());
100+
101+
LOGGER.info(
102+
"TsFile {} has initialized {}, pipeName: {}, creation time: {}, pattern: {}, startTime: {}, endTime: {}, withMod: {}",
103+
tsFile,
104+
getClass().getSimpleName(),
105+
pipeName,
106+
creationTime,
107+
this instanceof TsFileInsertionEventTableParser ? tablePattern : treePattern,
108+
startTime,
109+
endTime,
110+
isWithMod);
96111
}
97112

98113
/**

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)