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 612d3da654f fix imports
612d3da654f is described below

commit 612d3da654fd6bb77580e8e2b1360b91e33ba7eb
Author: Tian Jiang <[email protected]>
AuthorDate: Fri Apr 19 19:43:17 2024 +0800

    fix imports
---
 .../src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java   | 1 +
 .../src/main/java/org/apache/iotdb/CountPointProcessor.java          | 2 +-
 .../main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java  | 1 +
 .../session/src/main/java/org/apache/iotdb/DataMigrationExample.java | 1 +
 .../main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java   | 1 +
 .../src/main/java/org/apache/iotdb/SessionConcurrentExample.java     | 1 +
 example/session/src/main/java/org/apache/iotdb/SessionExample.java   | 1 +
 example/session/src/main/java/org/apache/iotdb/TabletExample.java    | 1 +
 .../src/main/java/org/apache/iotdb/trigger/LoggerTrigger.java        | 2 +-
 iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java | 2 +-
 .../cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java        | 5 +++--
 .../org/apache/iotdb/flink/sql/function/IoTDBCDCSourceFunction.java  | 2 +-
 .../test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java   | 1 +
 .../src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java        | 1 +
 .../main/java/org/apache/iotdb/confignode/manager/ConfigManager.java | 4 ++--
 .../execution/operator/AlignedSeriesAggregationScanOperatorTest.java | 1 -
 .../execution/operator/AlignedSeriesScanOperatorTest.java            | 1 -
 .../execution/operator/SeriesAggregationScanOperatorTest.java        | 1 +
 .../iotdb/db/queryengine/execution/operator/TopKOperatorTest.java    | 1 +
 .../db/storageengine/dataregion/compaction/cross/MergeTest.java      | 1 +
 .../compaction/cross/RewriteCompactionFileSelectorTest.java          | 2 +-
 .../compaction/inner/AbstractInnerSpaceCompactionTest.java           | 1 +
 .../dataregion/compaction/inner/InnerCompactionMoreDataTest.java     | 1 +
 .../dataregion/compaction/inner/InnerCompactionTest.java             | 1 +
 .../compaction/inner/sizetiered/SizeTieredCompactionTest.java        | 1 +
 .../dataregion/compaction/utils/CompactionFileGeneratorUtils.java    | 1 -
 .../iotdb/db/storageengine/rescon/memory/ResourceManagerTest.java    | 1 +
 27 files changed, 27 insertions(+), 12 deletions(-)

diff --git 
a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java 
b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
index 12825b682c2..90853ad10cd 100644
--- 
a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
+++ 
b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
@@ -25,6 +25,7 @@ import org.apache.tsfile.read.TsFileSequenceReader;
 import org.apache.tsfile.read.common.Path;
 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.slf4j.Logger;
diff --git 
a/example/pipe-count-point-processor/src/main/java/org/apache/iotdb/CountPointProcessor.java
 
b/example/pipe-count-point-processor/src/main/java/org/apache/iotdb/CountPointProcessor.java
index 27781ab83e9..61a888d4eca 100644
--- 
a/example/pipe-count-point-processor/src/main/java/org/apache/iotdb/CountPointProcessor.java
+++ 
b/example/pipe-count-point-processor/src/main/java/org/apache/iotdb/CountPointProcessor.java
@@ -65,7 +65,7 @@ public class CountPointProcessor implements PipeProcessor {
     if (event instanceof PipeHeartbeatEvent) {
       Tablet tablet =
           new Tablet(
-              aggregateSeries.getIDeviceID(),
+              aggregateSeries.getIDeviceID().toString(),
               Collections.singletonList(
                   new MeasurementSchema(aggregateSeries.getMeasurement(), 
TSDataType.INT64)),
               1);
diff --git 
a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
 
b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
index ce4871b1cd4..1c412482800 100644
--- 
a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
+++ 
b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
@@ -32,6 +32,7 @@ import org.apache.tsfile.file.metadata.enums.CompressionType;
 import org.apache.tsfile.file.metadata.enums.TSEncoding;
 import org.apache.tsfile.utils.BitMap;
 import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.apache.tsfile.write.schema.MeasurementSchema;
 
 import java.io.IOException;
diff --git 
a/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java 
b/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
index 78eaae6adbf..1e75414fc52 100644
--- a/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
@@ -28,6 +28,7 @@ import org.apache.iotdb.session.pool.SessionPool;
 
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.apache.tsfile.write.schema.MeasurementSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git 
a/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
 
b/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
index 9400549072d..a913e5336ee 100644
--- 
a/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
+++ 
b/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.session.Session;
 
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.apache.tsfile.write.schema.MeasurementSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git 
a/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java 
b/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
index bdd7a528296..68e2696724d 100644
--- 
a/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
+++ 
b/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
@@ -29,6 +29,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.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.apache.tsfile.write.schema.MeasurementSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java 
b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index 930f778b088..47254abfae6 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -37,6 +37,7 @@ import org.apache.tsfile.file.metadata.enums.TSEncoding;
 import org.apache.tsfile.utils.Binary;
 import org.apache.tsfile.utils.BitMap;
 import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.apache.tsfile.write.schema.MeasurementSchema;
 
 import java.io.IOException;
diff --git a/example/session/src/main/java/org/apache/iotdb/TabletExample.java 
b/example/session/src/main/java/org/apache/iotdb/TabletExample.java
index 2652d1ecb42..43e5459a22f 100644
--- a/example/session/src/main/java/org/apache/iotdb/TabletExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/TabletExample.java
@@ -24,6 +24,7 @@ import org.apache.iotdb.session.Session;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.utils.BytesUtils;
 import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.apache.tsfile.write.schema.MeasurementSchema;
 
 import java.io.BufferedReader;
diff --git 
a/example/trigger/src/main/java/org/apache/iotdb/trigger/LoggerTrigger.java 
b/example/trigger/src/main/java/org/apache/iotdb/trigger/LoggerTrigger.java
index 2af21188bbb..81aab6e748f 100644
--- a/example/trigger/src/main/java/org/apache/iotdb/trigger/LoggerTrigger.java
+++ b/example/trigger/src/main/java/org/apache/iotdb/trigger/LoggerTrigger.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.trigger.api.Trigger;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.utils.Binary;
 import org.apache.tsfile.write.record.Tablet;
-import org.apache.tsfile.write.schema.MeasurementSchema;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git 
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java
index 69c342cec73..74496ac79a2 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java
@@ -486,7 +486,7 @@ public class ExportData extends AbstractDataTool {
         seriesList.remove("Device");
       } else {
         Path path = new Path(seriesList.get(1), true);
-        deviceName = path.getDevice();
+        deviceName = path.getDeviceString();
         seriesList.remove("Time");
         for (int i = 0; i < seriesList.size(); i++) {
           String series = seriesList.get(i);
diff --git 
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
index 66ec4927a43..c8d08f7de82 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
@@ -46,6 +46,7 @@ import org.apache.tsfile.read.common.Path;
 import org.apache.tsfile.read.common.RowRecord;
 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.jline.reader.LineReader;
 
@@ -331,7 +332,7 @@ public class ExportTsFile extends AbstractTsFileTool {
         }
         TSDataType tsDataType = getTsDataType(columnTypes.get(i));
         Path path = new Path(column, true);
-        String deviceId = path.getDevice();
+        String deviceId = path.getDeviceString();
         try (SessionDataSet deviceDataSet =
             session.executeQueryStatement("show devices " + deviceId, 
timeout)) {
           List<Field> deviceList = deviceDataSet.next().getFields();
@@ -379,7 +380,7 @@ public class ExportTsFile extends AbstractTsFileTool {
             tablet.addTimestamp(rowIndex, rowRecord.getTimestamp());
             List<IMeasurementSchema> schemas = tablet.getSchemas();
             for (int j = 0; j < schemas.size(); j++) {
-              MeasurementSchema measurementSchema = schemas.get(j);
+              IMeasurementSchema measurementSchema = schemas.get(j);
               Object value = 
fields.get(i).getObjectValue(measurementSchema.getType());
               if (value == null) {
                 tablet.bitMaps[j].mark(rowIndex);
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 187b123182b..bdc5819ca3f 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
@@ -41,7 +41,7 @@ import org.apache.tsfile.read.common.RowRecord;
 import org.apache.tsfile.utils.BitMap;
 import org.apache.tsfile.utils.Pair;
 import org.apache.tsfile.write.record.Tablet;
-import org.apache.tsfile.write.schema.MeasurementSchema;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.enums.ReadyState;
 import org.slf4j.Logger;
diff --git 
a/iotdb-connector/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java
 
b/iotdb-connector/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java
index 74b03379459..bf6dd0475eb 100644
--- 
a/iotdb-connector/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java
+++ 
b/iotdb-connector/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java
@@ -24,6 +24,7 @@ import org.apache.tsfile.read.TsFileSequenceReader;
 import org.apache.tsfile.read.common.Path;
 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.slf4j.Logger;
diff --git 
a/iotdb-connector/hive-connector/src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java
 
b/iotdb-connector/hive-connector/src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java
index d7bd1186752..5692be24d7b 100644
--- 
a/iotdb-connector/hive-connector/src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java
+++ 
b/iotdb-connector/hive-connector/src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java
@@ -25,6 +25,7 @@ import org.apache.tsfile.read.TsFileSequenceReader;
 import org.apache.tsfile.read.common.Path;
 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.slf4j.Logger;
diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 5a1c5265c1a..16f210f8abb 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -642,11 +642,11 @@ public class ConfigManager implements IManager {
     }
     PartialPath innerPath = innerPathList.get(0);
     // The innerPath contains `*` and the only `*` is not in last level
-    if 
(innerPath.getIDeviceID().contains(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD)) {
+    if 
(innerPath.getIDeviceID().toString().contains(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD))
 {
       return new ArrayList<>();
     }
     return Collections.singletonList(
-        
getPartitionManager().getSeriesPartitionSlot(innerPath.getIDeviceID()));
+        
getPartitionManager().getSeriesPartitionSlot(innerPath.getIDeviceID().toString()));
   }
 
   @Override
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 d97ba5e159a..0a7158d92aa 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
@@ -52,7 +52,6 @@ import org.apache.tsfile.read.filter.factory.FilterFactory;
 import org.apache.tsfile.read.filter.factory.TimeFilterApi;
 import org.apache.tsfile.utils.TimeDuration;
 import org.apache.tsfile.write.schema.IMeasurementSchema;
-import org.apache.tsfile.write.schema.MeasurementSchema;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
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 a195dc362f5..50704126a3c 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
@@ -53,7 +53,6 @@ import org.apache.tsfile.read.common.block.column.FloatColumn;
 import org.apache.tsfile.read.common.block.column.IntColumn;
 import org.apache.tsfile.read.common.block.column.LongColumn;
 import org.apache.tsfile.write.schema.IMeasurementSchema;
-import org.apache.tsfile.write.schema.MeasurementSchema;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java
index 75b3caf6791..f293a28931d 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java
@@ -50,6 +50,7 @@ import org.apache.tsfile.read.filter.basic.Filter;
 import org.apache.tsfile.read.filter.factory.FilterFactory;
 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/TopKOperatorTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TopKOperatorTest.java
index ce3d7fcc6e3..8c01fe02ea4 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TopKOperatorTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TopKOperatorTest.java
@@ -59,6 +59,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/storageengine/dataregion/compaction/cross/MergeTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/MergeTest.java
index 1c1cc434cca..05f3c2c5206 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
@@ -40,6 +40,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;
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 09ecad3b991..bce6c0d8a2b 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
@@ -39,7 +39,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.MeasurementSchema;
+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/storageengine/dataregion/compaction/inner/AbstractInnerSpaceCompactionTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/AbstractInnerSpaceCompactionTest.java
index 169b9d16536..dd962fa6e6e 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
@@ -44,6 +44,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;
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 49242b290b5..e684c16a5e7 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
@@ -43,6 +43,7 @@ import org.apache.tsfile.read.common.block.TsBlock;
 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;
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 1ce9591144c..f9bf34f2a46 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
@@ -43,6 +43,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.Before;
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 ec6de921ed7..e286f3c939f 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
@@ -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.Before;
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 389519862eb..5fd78920cee 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
@@ -32,7 +32,6 @@ import org.apache.iotdb.db.utils.constant.TestConstant;
 import org.apache.tsfile.common.conf.TSFileDescriptor;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.file.metadata.IDeviceID;
-import org.apache.tsfile.file.metadata.PlainDeviceID;
 import org.apache.tsfile.file.metadata.enums.CompressionType;
 import org.apache.tsfile.file.metadata.enums.TSEncoding;
 import org.apache.tsfile.utils.Pair;
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 817376aa518..f9ced29cb72 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
@@ -43,6 +43,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.Before;

Reply via email to