This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch removeTsFIleModule_v4
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/removeTsFIleModule_v4 by this
push:
new f0230d46594 fix imports
f0230d46594 is described below
commit f0230d4659452374f8733f50214bd6f1b806756b
Author: Tian Jiang <[email protected]>
AuthorDate: Fri Apr 19 19:04:45 2024 +0800
fix imports
---
.../main/java/org/apache/iotdb/it/utils/TsFileGenerator.java | 2 +-
.../iotdb/flink/sql/function/IoTDBCDCSourceFunction.java | 2 +-
.../iotdb/db/pipe/event/common/row/PipeRowCollector.java | 1 -
.../db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java | 3 ++-
.../iotdb/db/pipe/connector/PipeDataNodeThriftRequestTest.java | 1 +
.../queryengine/common/schematree/ClusterSchemaTreeTest.java | 5 +++--
.../apache/iotdb/db/queryengine/execution/DataDriverTest.java | 1 +
.../execution/operator/AggregationOperatorTest.java | 1 +
.../operator/AlignedSeriesAggregationScanOperatorTest.java | 2 +-
.../execution/operator/AlignedSeriesScanOperatorTest.java | 10 +++++-----
.../queryengine/execution/operator/AlignedSeriesTestUtil.java | 3 ++-
.../queryengine/execution/operator/DeviceViewOperatorTest.java | 1 +
.../execution/operator/HorizontallyConcatOperatorTest.java | 1 +
.../queryengine/execution/operator/LastQueryOperatorTest.java | 1 +
.../execution/operator/LastQuerySortOperatorTest.java | 1 +
.../db/queryengine/execution/operator/LimitOperatorTest.java | 1 +
.../queryengine/execution/operator/MergeSortOperatorTest.java | 1 +
.../db/queryengine/execution/operator/OffsetOperatorTest.java | 1 +
.../execution/operator/RawDataAggregationOperatorTest.java | 1 +
.../queryengine/execution/operator/SeriesScanOperatorTest.java | 1 +
.../execution/operator/SingleDeviceViewOperatorTest.java | 1 +
.../operator/SlidingWindowAggregationOperatorTest.java | 1 +
.../db/queryengine/execution/operator/SortOperatorTest.java | 1 +
.../execution/operator/UpdateLastCacheOperatorTest.java | 1 +
.../execution/operator/sink/IdentitySinkOperatorTest.java | 1 +
.../db/queryengine/plan/optimization/TestPlanBuilder.java | 2 +-
.../iotdb/db/storageengine/buffer/BloomFilterCacheTest.java | 1 +
.../apache/iotdb/db/storageengine/buffer/ChunkCacheTest.java | 5 +++--
.../dataregion/compaction/CompactionDataTypeNotMatchTest.java | 1 +
.../dataregion/compaction/CompactionValidationTest.java | 1 +
.../storageengine/dataregion/compaction/cross/MergeTest.java | 2 +-
.../compaction/cross/RewriteCompactionFileSelectorTest.java | 8 ++++----
.../compaction/inner/AbstractInnerSpaceCompactionTest.java | 2 +-
.../compaction/inner/FastCompactionPerformerNoAlignedTest.java | 2 +-
.../compaction/inner/InnerCompactionMoreDataTest.java | 2 +-
.../dataregion/compaction/inner/InnerCompactionTest.java | 2 +-
.../inner/ReadChunkCompactionPerformerNoAlignedTest.java | 2 +-
.../compaction/inner/sizetiered/SizeTieredCompactionTest.java | 2 +-
.../dataregion/compaction/utils/CompactionCheckerUtils.java | 2 +-
.../compaction/utils/CompactionFileGeneratorUtils.java | 6 +++---
.../dataregion/read/reader/series/SeriesReaderTestUtil.java | 7 ++++---
.../db/storageengine/rescon/memory/ResourceManagerTest.java | 2 +-
.../org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java | 1 +
.../java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java | 1 +
.../main/java/org/apache/iotdb/commons/path/AlignedPath.java | 7 +++++++
45 files changed, 68 insertions(+), 35 deletions(-)
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
b/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
index 451ae345be6..eb3b98b53f8 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
@@ -242,7 +242,7 @@ public class TsFileGenerator implements AutoCloseable {
for (int i = 0; i < number; i++) {
int endTime = random.nextInt((int) (maxTime)) + 1;
int startTime = random.nextInt(endTime);
- for (MeasurementSchema measurementSchema :
device2MeasurementSchema.get(device)) {
+ for (IMeasurementSchema measurementSchema :
device2MeasurementSchema.get(device)) {
Deletion deletion =
new Deletion(
new PartialPath(
diff --git
a/iotdb-connector/flink-sql-iotdb-connector/src/main/java/org/apache/iotdb/flink/sql/function/IoTDBCDCSourceFunction.java
b/iotdb-connector/flink-sql-iotdb-connector/src/main/java/org/apache/iotdb/flink/sql/function/IoTDBCDCSourceFunction.java
index 8123d59f00f..187b123182b 100644
---
a/iotdb-connector/flink-sql-iotdb-connector/src/main/java/org/apache/iotdb/flink/sql/function/IoTDBCDCSourceFunction.java
+++
b/iotdb-connector/flink-sql-iotdb-connector/src/main/java/org/apache/iotdb/flink/sql/function/IoTDBCDCSourceFunction.java
@@ -235,7 +235,7 @@ public class IoTDBCDCSourceFunction extends
RichSourceFunction<RowData> {
List<IMeasurementSchema> schemas = tablet.getSchemas();
int rowSize = tablet.rowSize;
HashMap<String, Pair<BitMap, List<Object>>> values = new HashMap<>();
- for (MeasurementSchema schema : schemas) {
+ for (IMeasurementSchema schema : schemas) {
String timeseries = String.format("%s.%s", tablet.getDeviceId(),
schema.getMeasurementId());
TSDataType iotdbType = schema.getType();
int index = timeseriesList.indexOf(timeseries);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java
index cd8265ea7a1..45afdef36bb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java
@@ -30,7 +30,6 @@ import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import java.util.ArrayList;
import java.util.Arrays;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java
index 0f96510f737..36f98833ea8 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java
@@ -98,7 +98,8 @@ public class ReadOnlyMemChunk {
private void initChunkMetaFromTsBlock() throws QueryProcessException {
Statistics statsByType = Statistics.getStatsByType(dataType);
- IChunkMetadata metaData = new ChunkMetadata(measurementUid, dataType,
null, null, 0, statsByType);
+ IChunkMetadata metaData =
+ new ChunkMetadata(measurementUid, dataType, null, null, 0,
statsByType);
if (!isEmpty()) {
switch (dataType) {
case BOOLEAN:
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeDataNodeThriftRequestTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeDataNodeThriftRequestTest.java
index 222f8c7db1b..d7188aad946 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeDataNodeThriftRequestTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeDataNodeThriftRequestTest.java
@@ -44,6 +44,7 @@ import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.utils.PublicBAOS;
import org.apache.tsfile.utils.ReadWriteIOUtils;
import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTreeTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTreeTest.java
index e221fd7a6d1..14d91737676 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTreeTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTreeTest.java
@@ -36,6 +36,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.utils.Pair;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
import org.junit.Ignore;
@@ -708,7 +709,7 @@ public class ClusterSchemaTreeTest {
Assert.assertEquals(
measurements,
deviceSchemaInfo.getMeasurementSchemaList().stream()
- .map(MeasurementSchema::getMeasurementId)
+ .map(IMeasurementSchema::getMeasurementId)
.collect(Collectors.toList()));
devicePath = new PartialPath("root.sg.d2.a");
@@ -721,7 +722,7 @@ public class ClusterSchemaTreeTest {
Assert.assertEquals(
measurements,
deviceSchemaInfo.getMeasurementSchemaList().stream()
- .map(MeasurementSchema::getMeasurementId)
+ .map(IMeasurementSchema::getMeasurementId)
.collect(Collectors.toList()));
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java
index ef2cd39b44d..0d8c5a144b5 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java
@@ -54,6 +54,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java
index 73bb2a2dc63..555756fa70e 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java
@@ -52,6 +52,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.utils.TimeDuration;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java
index 3d9f90e5685..d97ba5e159a 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java
@@ -710,7 +710,7 @@ public class AlignedSeriesAggregationScanOperatorTest {
new AlignedPath(
SERIES_AGGREGATION_SCAN_OPERATOR_TEST_SG + ".device0",
measurementSchemas.stream()
- .map(MeasurementSchema::getMeasurementId)
+ .map(IMeasurementSchema::getMeasurementId)
.collect(Collectors.toList()),
measurementSchemas.stream()
.map(m -> (IMeasurementSchema) m)
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java
index f899d210e51..a195dc362f5 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java
@@ -104,7 +104,7 @@ public class AlignedSeriesScanOperatorTest {
new AlignedPath(
SERIES_SCAN_OPERATOR_TEST_SG + ".device0",
measurementSchemas.stream()
- .map(MeasurementSchema::getMeasurementId)
+ .map(IMeasurementSchema::getMeasurementId)
.collect(Collectors.toList()),
measurementSchemas.stream()
.map(m -> (IMeasurementSchema) m)
@@ -184,7 +184,7 @@ public class AlignedSeriesScanOperatorTest {
new AlignedPath(
SERIES_SCAN_OPERATOR_TEST_SG + ".device0",
measurementSchemas.stream()
- .map(MeasurementSchema::getMeasurementId)
+ .map(IMeasurementSchema::getMeasurementId)
.collect(Collectors.toList()),
measurementSchemas.stream()
.map(m -> (IMeasurementSchema) m)
@@ -236,7 +236,7 @@ public class AlignedSeriesScanOperatorTest {
new AlignedPath(
SERIES_SCAN_OPERATOR_TEST_SG + ".device1",
measurementSchemas.stream()
- .map(MeasurementSchema::getMeasurementId)
+ .map(IMeasurementSchema::getMeasurementId)
.collect(Collectors.toList()),
measurementSchemas.stream()
.map(m -> (IMeasurementSchema) m)
@@ -480,7 +480,7 @@ public class AlignedSeriesScanOperatorTest {
new AlignedPath(
SERIES_SCAN_OPERATOR_TEST_SG + ".device0",
measurementSchemas.stream()
- .map(MeasurementSchema::getMeasurementId)
+ .map(IMeasurementSchema::getMeasurementId)
.collect(Collectors.toList()),
measurementSchemas.stream()
.map(m -> (IMeasurementSchema) m)
@@ -532,7 +532,7 @@ public class AlignedSeriesScanOperatorTest {
new AlignedPath(
SERIES_SCAN_OPERATOR_TEST_SG + ".device1",
measurementSchemas.stream()
- .map(MeasurementSchema::getMeasurementId)
+ .map(IMeasurementSchema::getMeasurementId)
.collect(Collectors.toList()),
measurementSchemas.stream()
.map(m -> (IMeasurementSchema) m)
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesTestUtil.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesTestUtil.java
index ef41d117c3e..2d9a30c71c1 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesTestUtil.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesTestUtil.java
@@ -37,6 +37,7 @@ import org.apache.tsfile.read.common.Path;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.TSRecord;
import org.apache.tsfile.write.record.datapoint.DataPoint;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
@@ -147,7 +148,7 @@ public class AlignedSeriesTestUtil {
TSRecord record = new TSRecord(i, device0);
int index = 0;
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
record.addTuple(
DataPoint.getDataPoint(
measurementSchema.getType(),
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java
index d1767847669..ecbf4fe9ec7 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java
@@ -41,6 +41,7 @@ import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java
index c7eca63978b..696a3102d39 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java
@@ -48,6 +48,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.utils.TimeDuration;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java
index 91091415dd7..54c56dd9b67 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java
@@ -47,6 +47,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.TsBlockBuilder;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java
index fb43888a9cc..95c8f8099a0 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java
@@ -47,6 +47,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.TsBlockBuilder;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java
index a17aea60f14..d5ea1642a87 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java
@@ -46,6 +46,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java
index e5df0902b98..2fd1828404d 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java
@@ -65,6 +65,7 @@ import
org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.TsBlockBuilder;
import org.apache.tsfile.read.common.block.column.TimeColumnBuilder;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java
index c98ecab1883..bd5c91e25e5 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java
@@ -47,6 +47,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java
index 90a5a8b35dc..32e753d770b 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java
@@ -60,6 +60,7 @@ import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.filter.basic.Filter;
import org.apache.tsfile.read.filter.factory.TimeFilterApi;
import org.apache.tsfile.utils.TimeDuration;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java
index 14bb25cc8f5..f5350ae165b 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java
@@ -42,6 +42,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java
index f8511854959..2385b683c42 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java
@@ -44,6 +44,7 @@ import io.airlift.units.Duration;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java
index b5a677933fe..0bfbe302c3d 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java
@@ -51,6 +51,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.utils.TimeDuration;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java
index f750934b723..34c8cb69517 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java
@@ -50,6 +50,7 @@ import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java
index 00fced213bc..3b5e1ae09d1 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java
@@ -47,6 +47,7 @@ import
org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.filter.basic.Filter;
import org.apache.tsfile.read.filter.factory.TimeFilterApi;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
index c2d6a3231e1..e0a3138bf63 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
@@ -45,6 +45,7 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
index 3dda8bc28ca..e8771c51c1e 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
@@ -343,7 +343,7 @@ public class TestPlanBuilder {
public TestPlanBuilder into(String id, PartialPath sourcePath, PartialPath
intoPath) {
IntoPathDescriptor intoPathDescriptor = new IntoPathDescriptor();
intoPathDescriptor.specifyTargetPath(sourcePath.toString(), "", intoPath);
- intoPathDescriptor.specifyDeviceAlignment(intoPath.getIDeviceID(), false);
+
intoPathDescriptor.specifyDeviceAlignment(intoPath.getIDeviceID().toString(),
false);
intoPathDescriptor.recordSourceColumnDataType(
sourcePath.toString(), sourcePath.getSeriesType());
this.root = new IntoNode(new PlanNodeId(id), getRoot(),
intoPathDescriptor);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCacheTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCacheTest.java
index 66dca5828c4..1758be2d43e 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCacheTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCacheTest.java
@@ -30,6 +30,7 @@ import org.apache.tsfile.read.common.Path;
import org.apache.tsfile.utils.BloomFilter;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.apache.tsfile.write.schema.Schema;
import org.junit.After;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/buffer/ChunkCacheTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/buffer/ChunkCacheTest.java
index 63d176a6b49..b86987ed674 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/buffer/ChunkCacheTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/buffer/ChunkCacheTest.java
@@ -41,6 +41,7 @@ import org.apache.tsfile.read.common.Path;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.TSRecord;
import org.apache.tsfile.write.record.datapoint.DataPoint;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -115,7 +116,7 @@ public class ChunkCacheTest {
false);
ChunkMetadata chunkMetadataKey =
- new ChunkMetadata("sensor0", TSDataType.DOUBLE, 25, new
DoubleStatistics());
+ new ChunkMetadata("sensor0", TSDataType.DOUBLE, null, null, 25, new
DoubleStatistics());
chunkMetadataKey.setVersion(0);
// get cache
@@ -176,7 +177,7 @@ public class ChunkCacheTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionDataTypeNotMatchTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionDataTypeNotMatchTest.java
index 69bc0c2b8c3..2440dc561e9 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionDataTypeNotMatchTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionDataTypeNotMatchTest.java
@@ -38,6 +38,7 @@ import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.TSRecord;
import org.apache.tsfile.write.record.datapoint.BooleanDataPoint;
import org.apache.tsfile.write.record.datapoint.IntDataPoint;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionValidationTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionValidationTest.java
index e27ef333895..27d9ced7cc1 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionValidationTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionValidationTest.java
@@ -36,6 +36,7 @@ import org.apache.tsfile.read.common.Path;
import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeTest.java
index 681f50642db..1c1cc434cca 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeTest.java
@@ -155,7 +155,7 @@ abstract class MergeTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (IDeviceID deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCompactionFileSelectorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCompactionFileSelectorTest.java
index 42078abf3b6..09ecad3b991 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCompactionFileSelectorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCompactionFileSelectorTest.java
@@ -751,7 +751,7 @@ public class RewriteCompactionFileSelectorTest extends
MergeTest {
TsFileWriter fileWriter = new TsFileWriter(firstFile);
for (IDeviceID deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
@@ -804,7 +804,7 @@ public class RewriteCompactionFileSelectorTest extends
MergeTest {
}
fileWriter = new TsFileWriter(secondFile);
for (IDeviceID deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
@@ -850,7 +850,7 @@ public class RewriteCompactionFileSelectorTest extends
MergeTest {
}
fileWriter = new TsFileWriter(thirdFile);
for (IDeviceID deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
@@ -896,7 +896,7 @@ public class RewriteCompactionFileSelectorTest extends
MergeTest {
}
fileWriter = new TsFileWriter(fourthFile);
for (IDeviceID deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/AbstractInnerSpaceCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/AbstractInnerSpaceCompactionTest.java
index cddca4d854b..169b9d16536 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/AbstractInnerSpaceCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/AbstractInnerSpaceCompactionTest.java
@@ -191,7 +191,7 @@ public abstract class AbstractInnerSpaceCompactionTest {
throws IOException, WriteProcessException {
try (TsFileWriter fileWriter = new
TsFileWriter(tsFileResource.getTsFile()); ) {
for (String deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/FastCompactionPerformerNoAlignedTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/FastCompactionPerformerNoAlignedTest.java
index 39ecb056133..4c5c079690b 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/FastCompactionPerformerNoAlignedTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/FastCompactionPerformerNoAlignedTest.java
@@ -152,7 +152,7 @@ public class FastCompactionPerformerNoAlignedTest {
devicePath[i] = new PartialPath(storageGroup + "." + devices[i]);
}
for (PartialPath device : devicePath) {
- for (MeasurementSchema schema : schemas) {
+ for (IMeasurementSchema schema : schemas) {
fullPathSet.add(device.getFullPath() + "." +
schema.getMeasurementId());
paths.add(
new MeasurementPath(
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionMoreDataTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionMoreDataTest.java
index d3a37e6f426..49242b290b5 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionMoreDataTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionMoreDataTest.java
@@ -106,7 +106,7 @@ public class InnerCompactionMoreDataTest extends
InnerCompactionTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionTest.java
index 2c78c019cd8..1ce9591144c 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionTest.java
@@ -173,7 +173,7 @@ public abstract class InnerCompactionTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/ReadChunkCompactionPerformerNoAlignedTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/ReadChunkCompactionPerformerNoAlignedTest.java
index 28c55a4d558..99e2e9f8200 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/ReadChunkCompactionPerformerNoAlignedTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/ReadChunkCompactionPerformerNoAlignedTest.java
@@ -151,7 +151,7 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
devicePath[i] = new PartialPath(storageGroup + "." + devices[i]);
}
for (PartialPath device : devicePath) {
- for (MeasurementSchema schema : schemas) {
+ for (IMeasurementSchema schema : schemas) {
fullPathSet.add(device.getFullPath() + "." +
schema.getMeasurementId());
paths.add(
new MeasurementPath(
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/sizetiered/SizeTieredCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/sizetiered/SizeTieredCompactionTest.java
index 206cf098dcc..ec6de921ed7 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/sizetiered/SizeTieredCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/sizetiered/SizeTieredCompactionTest.java
@@ -186,7 +186,7 @@ public class SizeTieredCompactionTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(
new Path(deviceId, measurementSchema.getMeasurementId(), true),
measurementSchema);
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionCheckerUtils.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionCheckerUtils.java
index d2192836eb9..1e22718878c 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionCheckerUtils.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionCheckerUtils.java
@@ -323,7 +323,7 @@ public class CompactionCheckerUtils {
Map<IDeviceID, long[]> devicePointNumMap = new HashMap<>();
for (Entry<String, List<TimeValuePair>> dataEntry : sourceData.entrySet())
{
PartialPath partialPath = new PartialPath(dataEntry.getKey());
- IDeviceID device = new PlainDeviceID(partialPath.getIDeviceID());
+ IDeviceID device = partialPath.getIDeviceID();
long[] statistics =
devicePointNumMap.computeIfAbsent(
device, k -> new long[] {Long.MAX_VALUE, Long.MIN_VALUE});
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionFileGeneratorUtils.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionFileGeneratorUtils.java
index 95da3661664..389519862eb 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionFileGeneratorUtils.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionFileGeneratorUtils.java
@@ -164,7 +164,7 @@ public class CompactionFileGeneratorUtils {
PartialPath partialPath = new PartialPath(fullPath);
List<String> sensors =
deviceMeasurementMap.computeIfAbsent(
- new PlainDeviceID(partialPath.getIDeviceID()), (s) -> new
ArrayList<>());
+ partialPath.getIDeviceID(), (s) -> new ArrayList<>());
sensors.add(partialPath.getMeasurement());
}
for (Entry<IDeviceID, List<String>> deviceMeasurementEntry :
deviceMeasurementMap.entrySet()) {
@@ -222,7 +222,7 @@ public class CompactionFileGeneratorUtils {
PartialPath partialPath = new PartialPath(fullPath);
List<String> sensors =
deviceMeasurementMap.computeIfAbsent(
- new PlainDeviceID(partialPath.getIDeviceID()), (s) -> new
ArrayList<>());
+ partialPath.getIDeviceID(), (s) -> new ArrayList<>());
sensors.add(partialPath.getMeasurement());
}
int currChunksIndex = 0;
@@ -314,7 +314,7 @@ public class CompactionFileGeneratorUtils {
PartialPath partialPath = new PartialPath(fullPath);
List<String> sensors =
deviceMeasurementMap.computeIfAbsent(
- new PlainDeviceID(partialPath.getIDeviceID()), (s) -> new
ArrayList<>());
+ partialPath.getIDeviceID(), (s) -> new ArrayList<>());
sensors.add(partialPath.getMeasurement());
}
for (Entry<IDeviceID, List<String>> deviceMeasurementEntry :
deviceMeasurementMap.entrySet()) {
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesReaderTestUtil.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesReaderTestUtil.java
index a4c5042c588..8742291af10 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesReaderTestUtil.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesReaderTestUtil.java
@@ -37,6 +37,7 @@ import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.TSRecord;
import org.apache.tsfile.write.record.datapoint.DataPoint;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
@@ -163,8 +164,8 @@ public class SeriesReaderTestUtil {
Assert.assertTrue(file.getParentFile().mkdirs());
}
TsFileWriter fileWriter = new TsFileWriter(file);
- Map<String, MeasurementSchema> template = new HashMap<>();
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ Map<String, IMeasurementSchema> template = new HashMap<>();
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
template.put(measurementSchema.getMeasurementId(), measurementSchema);
}
fileWriter.registerSchemaTemplate("template0", template, false);
@@ -174,7 +175,7 @@ public class SeriesReaderTestUtil {
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
for (String deviceId : deviceIds) {
TSRecord record = new TSRecord(i, deviceId);
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
record.addTuple(
DataPoint.getDataPoint(
measurementSchema.getType(),
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/ResourceManagerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/ResourceManagerTest.java
index efa285f7082..817376aa518 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/ResourceManagerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/ResourceManagerTest.java
@@ -138,7 +138,7 @@ public class ResourceManagerTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
+ for (IMeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java
index 6fd9adb8f92..e447dfa7737 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java
@@ -33,6 +33,7 @@ import org.apache.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.tsfile.utils.ReadWriteIOUtils;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.apache.tsfile.write.schema.Schema;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
index 786f1a78103..b41954c78fd 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
@@ -30,6 +30,7 @@ import org.apache.tsfile.read.common.Path;
import org.apache.tsfile.utils.MeasurementGroup;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.apache.tsfile.write.schema.Schema;
import org.junit.After;
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java
index 75fe1136bdb..aba31e432e9 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java
@@ -25,6 +25,7 @@ import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.IDeviceID;
+import org.apache.tsfile.file.metadata.IDeviceID.Factory;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.ReadWriteIOUtils;
@@ -70,6 +71,12 @@ public class AlignedPath extends PartialPath {
this.measurementList = subSensorsList;
}
+ public AlignedPath(
+ String vectorPath, List<String> measurementList,
List<IMeasurementSchema> schemaList)
+ throws IllegalPathException {
+ this(Factory.DEFAULT_FACTORY.create(vectorPath), measurementList,
schemaList);
+ }
+
public AlignedPath(
IDeviceID vectorPath, List<String> measurementList,
List<IMeasurementSchema> schemaList)
throws IllegalPathException {
