You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2024/04/18 04:00:21 UTC
(iotdb) 03/04: fix query issue
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 e9a68fc8fd2745252f000b12723738ce3c4768ed
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Apr 18 10:52:33 2024 +0800
fix query issue
---
.../db/storageengine/dataregion/tsfile/timeindex/ITimeIndex.java | 2 +-
.../dataregion/tsfile/timeindex/PlainDeviceTimeIndex.java | 6 +++---
.../main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
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 f180ad1036a..b66a6692b9a 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,7 @@ public interface ITimeIndex {
/**
* Get TimeIndex Type
*
- * @return V012FileTimeIndex = 0, deviceTimeIndex = 1, fileTimeIndex = 2
+ * @return V012FileTimeIndex = 0, plainDeviceTimeIndex = 1, fileTimeIndex = 2, arrayDeviceTimeIndex = 3
*/
byte getTimeIndexType();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/PlainDeviceTimeIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/PlainDeviceTimeIndex.java
index 6f5e3d3c258..fe251175994 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/PlainDeviceTimeIndex.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/PlainDeviceTimeIndex.java
@@ -70,7 +70,7 @@ public class PlainDeviceTimeIndex extends ArrayDeviceTimeIndex implements ITimeI
DataNodeDevicePathCache.getInstance()
.getDeviceId(ReadWriteIOUtils.readString(inputStream));
int index = ReadWriteIOUtils.readInt(inputStream);
- deviceToIndex.put(new PlainDeviceID(path), index);
+ deviceToIndex.put(IDeviceID.Factory.DEFAULT_FACTORY.create(path), index);
}
return this;
}
@@ -92,7 +92,7 @@ public class PlainDeviceTimeIndex extends ArrayDeviceTimeIndex implements ITimeI
String path =
DataNodeDevicePathCache.getInstance().getDeviceId(ReadWriteIOUtils.readString(buffer));
int index = buffer.getInt();
- deviceToIndex.put(new PlainDeviceID(path), index);
+ deviceToIndex.put(IDeviceID.Factory.DEFAULT_FACTORY.create(path), index);
}
return this;
}
@@ -112,7 +112,7 @@ public class PlainDeviceTimeIndex extends ArrayDeviceTimeIndex implements ITimeI
DataNodeDevicePathCache.getInstance()
.getDeviceId(ReadWriteIOUtils.readString(inputStream));
ReadWriteIOUtils.skip(inputStream, ReadWriteIOUtils.INT_LEN);
- devices.add(new PlainDeviceID(path));
+ devices.add(IDeviceID.Factory.DEFAULT_FACTORY.create(path));
}
return devices;
}
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 931decb8cbb..3c72175ef46 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
@@ -70,6 +70,7 @@ public class TsFileResourcePrinter {
System.out.printf("Analyzing %s ...%n", filename);
System.out.println();
resource.deserialize();
+ System.out.println("Time index type: " + resource.getTimeIndexType());
System.out.printf(
"Resource plan index range [%d, %d]%n",
@@ -78,7 +79,7 @@ public class TsFileResourcePrinter {
for (IDeviceID device : resource.getDevices()) {
System.out.printf(
"device %s, start time %d (%s), end time %d (%s)%n",
- ((PlainDeviceID) device).toStringID(),
+ device,
resource.getStartTime(device),
DateTimeUtils.convertLongToDate(resource.getStartTime(device)),
resource.getEndTime(device),