fix PlainDeviceID usage

apache · Aug 12, 2024 · 00f6732 · 00f6732
1 parent 3c0d09d
commit 00f6732
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...iotdb/db/storageengine/dataregion/compaction/BatchedCompactionWithTsFileSplitterTest.java b/...iotdb/db/storageengine/dataregion/compaction/BatchedCompactionWithTsFileSplitterTest.java
@@ -40,7 +40,6 @@
 import org.apache.tsfile.exception.write.WriteProcessException;
 import org.apache.tsfile.file.metadata.ChunkMetadata;
 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.read.common.TimeRange;
@@ -279,7 +278,8 @@ private void consumeChunkDataAndValidate(TsFileResource resource)
                         }
                       });
               try {
-                IDeviceID deviceID = new PlainDeviceID(alignedChunkData.getDevice());
+                IDeviceID deviceID =
+                    IDeviceID.Factory.DEFAULT_FACTORY.create(alignedChunkData.getDevice());
                 if (!deviceID.equals(writer.currentDevice)) {
                   if (writer.currentDevice != null) {
                     writer.endChunkGroup();

diff --git a/...g/apache/iotdb/db/storageengine/dataregion/compaction/utils/BatchCompactionUtilsTest.java b/...g/apache/iotdb/db/storageengine/dataregion/compaction/utils/BatchCompactionUtilsTest.java
@@ -37,7 +37,7 @@
 import org.apache.tsfile.file.metadata.AlignedChunkMetadata;
 import org.apache.tsfile.file.metadata.ChunkMetadata;
 import org.apache.tsfile.file.metadata.IChunkMetadata;
-import org.apache.tsfile.file.metadata.PlainDeviceID;
+import org.apache.tsfile.file.metadata.IDeviceID;
 import org.apache.tsfile.file.metadata.enums.CompressionType;
 import org.apache.tsfile.file.metadata.enums.TSEncoding;
 import org.apache.tsfile.file.metadata.statistics.IntegerStatistics;
@@ -109,7 +109,9 @@ public void testBatchCompactionPointReader() throws IOException {
     try (TsFileSequenceReader reader =
         new TsFileSequenceReader(seqResource1.getTsFile().getAbsolutePath())) {
       AlignedChunkMetadata alignedChunkMetadata =
-          reader.getAlignedChunkMetadata(new PlainDeviceID("root.testsg.d0")).get(0);
+          reader
+              .getAlignedChunkMetadata(IDeviceID.Factory.DEFAULT_FACTORY.create("root.testsg.d0"))
+              .get(0);
       ChunkMetadata timeChunkMetadata = (ChunkMetadata) alignedChunkMetadata.getTimeChunkMetadata();
       List<IChunkMetadata> valueChunkMetadataList =
           alignedChunkMetadata.getValueChunkMetadataList();