From cb62b4241a7f35238ca6b3a091657854b0543969 Mon Sep 17 00:00:00 2001 From: Caideyipi <87789683+Caideyipi@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:39:51 +0800 Subject: [PATCH 1/2] [To dev/1.3] Pipe: Upgraded bouncy castle && Added logs for pipe tsFile parser (#17504) --- .../container/TsFileInsertionDataContainer.java | 17 ++++++++++++++++- .../TsFileInsertionQueryDataContainer.java | 11 ++++++++++- .../scan/TsFileInsertionScanDataContainer.java | 11 ++++++++++- pom.xml | 2 +- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java index 279996690ff92..2fe891ea2fb9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.pipe.event.common.tsfile.parser.table.TsFileInsertionEventTableParser; import org.apache.iotdb.db.pipe.metric.overview.PipeTsFileToTabletsMetrics; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryBlock; @@ -39,6 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; import java.io.IOException; public abstract class TsFileInsertionDataContainer implements AutoCloseable { @@ -69,13 +71,15 @@ public abstract class TsFileInsertionDataContainer implements AutoCloseable { protected Iterable tabletInsertionIterable; protected TsFileInsertionDataContainer( + final File tsFile, final String pipeName, final long creationTime, final PipePattern pattern, final long startTime, final long endTime, final PipeTaskMeta pipeTaskMeta, - final EnrichedEvent sourceEvent) { + final EnrichedEvent sourceEvent, + final boolean isWithMod) { this.pipeName = pipeName; this.creationTime = creationTime; @@ -93,6 +97,17 @@ protected TsFileInsertionDataContainer( PipeDataNodeResourceManager.memory() .forceAllocateForTabletWithRetry( IoTDBDescriptor.getInstance().getConfig().getPipeDataStructureTabletSizeInBytes()); + + LOGGER.info( + "TsFile {} has initialized {}, pipeName: {}, creation time: {}, pattern: {}, startTime: {}, endTime: {}, withMod: {}", + tsFile, + getClass().getSimpleName(), + pipeName, + creationTime, + this instanceof TsFileInsertionEventTableParser ? tablePattern : treePattern, + startTime, + endTime, + isWithMod); } /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java index 15732fd0e8db2..4353e4984a259 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java @@ -114,7 +114,16 @@ public TsFileInsertionQueryDataContainer( final Map deviceIsAlignedMap, final boolean isWithMod) throws IOException { - super(pipeName, creationTime, pattern, startTime, endTime, pipeTaskMeta, sourceEvent); + super( + tsFile, + pipeName, + creationTime, + pattern, + startTime, + endTime, + pipeTaskMeta, + sourceEvent, + isWithMod); try { currentModifications = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java index 271bc317d0f96..8ed9bdcd6625a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java @@ -116,7 +116,16 @@ public TsFileInsertionScanDataContainer( final EnrichedEvent sourceEvent, final boolean isWithMod) throws IOException { - super(pipeName, creationTime, pattern, startTime, endTime, pipeTaskMeta, sourceEvent); + super( + tsFile, + pipeName, + creationTime, + pattern, + startTime, + endTime, + pipeTaskMeta, + sourceEvent, + isWithMod); this.startTime = startTime; this.endTime = endTime; diff --git a/pom.xml b/pom.xml index 35c7eeb481e15..294a1231e355f 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 4.2.0 - 1.81 + 1.84 2.9.3 3.3.0 From b971ffb491a49c9a8b403fe67df4771f06769b9d Mon Sep 17 00:00:00 2001 From: Caideyipi <87789683+Caideyipi@users.noreply.github.com> Date: Tue, 21 Apr 2026 11:11:26 +0800 Subject: [PATCH 2/2] fixed --- .../common/tsfile/container/TsFileInsertionDataContainer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java index 2fe891ea2fb9e..f335cff10354a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.pipe.event.common.tsfile.parser.table.TsFileInsertionEventTableParser; import org.apache.iotdb.db.pipe.metric.overview.PipeTsFileToTabletsMetrics; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryBlock; @@ -104,7 +103,7 @@ protected TsFileInsertionDataContainer( getClass().getSimpleName(), pipeName, creationTime, - this instanceof TsFileInsertionEventTableParser ? tablePattern : treePattern, + pattern, startTime, endTime, isWithMod);