You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2023/12/25 06:06:44 UTC
(iotdb) branch master updated: dev (#11762)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 4023934e9af dev (#11762)
4023934e9af is described below
commit 4023934e9af4db0b955ee9a69ab9586e02d04eb1
Author: Haonan <hh...@outlook.com>
AuthorDate: Mon Dec 25 14:06:39 2023 +0800
dev (#11762)
---
.../db/storageengine/dataregion/tsfile/TsFileManager.java | 13 +++++++++----
.../db/storageengine/dataregion/LastFlushTimeMapTest.java | 2 ++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileManager.java
index 53a6ee357b6..69a3cff6901 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileManager.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.storageengine.dataregion.tsfile;
import org.apache.iotdb.commons.utils.TimePartitionUtils;
+import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.ITimeIndex;
import org.apache.iotdb.db.storageengine.rescon.memory.TsFileResourceManager;
import java.io.IOException;
@@ -119,10 +120,14 @@ public class TsFileManager {
if (!seqResource.isClosed()) {
continue;
}
- Set<String> deviceSet = seqResource.getDevices();
- if (deviceSet.contains(devicePath)) {
- lastFlushTime = seqTsFileResourceList.get(i).getEndTime(devicePath);
- break;
+ if (seqResource.getTimeIndexType() == ITimeIndex.DEVICE_TIME_INDEX_TYPE) {
+ Set<String> deviceSet = seqResource.getDevices();
+ if (deviceSet.contains(devicePath)) {
+ lastFlushTime = Math.max(lastFlushTime, seqResource.getEndTime(devicePath));
+ break;
+ }
+ } else {
+ lastFlushTime = Math.max(lastFlushTime, seqResource.getEndTime(devicePath));
}
}
List<TsFileResource> unseqTsFileResourceList =
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/LastFlushTimeMapTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/LastFlushTimeMapTest.java
index ffdb1177a39..55ce6ef22f6 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/LastFlushTimeMapTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/LastFlushTimeMapTest.java
@@ -139,6 +139,8 @@ public class LastFlushTimeMapTest {
}
Assert.assertEquals(
10000, dataRegion.getLastFlushTimeMap().getFlushedTime(0, "root.vehicle.d0"));
+ Assert.assertEquals(
+ 10000, dataRegion.getLastFlushTimeMap().getFlushedTime(0, "root.vehicle.d1"));
}
@Test