This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch h/TableModelWrite in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 821291e07b46f56c4f74dc4f517ed3e0e7907fc0 Author: HTHou <[email protected]> AuthorDate: Thu Apr 18 11:59:57 2024 +0800 fix format and query issue --- .../java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java | 2 +- .../iotdb/db/storageengine/dataregion/tsfile/timeindex/ITimeIndex.java | 3 ++- .../src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index 9555eb0b7f2..d11115ea9ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -1872,7 +1872,7 @@ public class DataRegion implements IDataRegionForQuery { for (TsFileResource tsFileResource : tsFileResources) { if (!tsFileResource.isSatisfied( - singleDeviceId == null ? null : new PlainDeviceID(singleDeviceId), + singleDeviceId == null ? null : IDeviceID.Factory.DEFAULT_FACTORY.create(singleDeviceId), globalTimeFilter, isSeq, dataTTL, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/ITimeIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/ITimeIndex.java index b66a6692b9a..d1de89087c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/ITimeIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/ITimeIndex.java @@ -205,7 +205,8 @@ public interface ITimeIndex { /** * Get TimeIndex Type * - * @return V012FileTimeIndex = 0, plainDeviceTimeIndex = 1, fileTimeIndex = 2, arrayDeviceTimeIndex = 3 + * @return V012FileTimeIndex = 0, plainDeviceTimeIndex = 1, fileTimeIndex = 2, + * arrayDeviceTimeIndex = 3 */ byte getTimeIndexType(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java index 3c72175ef46..748fb7c7e69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.tsfile.file.metadata.IDeviceID; -import org.apache.iotdb.tsfile.file.metadata.PlainDeviceID; import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer; import java.io.File;
