[To dev/1.3] Fix PartitionTable auto cleaner IT #15044

apache · Mar 9, 2025 · d469c58 · d469c58
1 parent 5968100
commit d469c58
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ignode/src/main/java/org/apache/iotdb/confignode/procedure/PartitionTableAutoCleaner.java b/...ignode/src/main/java/org/apache/iotdb/confignode/procedure/PartitionTableAutoCleaner.java
@@ -32,6 +32,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import static org.apache.iotdb.confignode.manager.partition.PartitionManager.CONSENSUS_WRITE_ERROR;
 
@@ -54,13 +55,10 @@ public PartitionTableAutoCleaner(ConfigManager configManager) {
   @Override
   protected void periodicExecute(Env env) {
     List<String> databases = configManager.getClusterSchemaManager().getDatabaseNames();
-    Map<String, Long> databaseTTLMap =
-        configManager.getClusterSchemaManager().getTTLInfoForUpgrading();
+    Map<String, Long> databaseTTLMap = new TreeMap<>();
     for (String database : databases) {
-      long subTreeMaxTTL = configManager.getTTLManager().getDatabaseMaxTTL(database);
-      databaseTTLMap.put(
-          database, Math.max(subTreeMaxTTL, databaseTTLMap.getOrDefault(database, -1L)));
-      long databaseTTL = databaseTTLMap.get(database);
+      long databaseTTL = configManager.getTTLManager().getDatabaseMaxTTL(database);
+      databaseTTLMap.put(database, databaseTTL);
       if (!configManager.getPartitionManager().isDatabaseExist(database)
           || databaseTTL < 0
           || databaseTTL == Long.MAX_VALUE) {

diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/ttl/TTLCache.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/ttl/TTLCache.java
@@ -290,6 +290,9 @@ public void removeAllChildren() {
     }
 
     public CacheNode getChild(String name) {
+      if (name.startsWith("root.")) {
+        name = name.substring("root.".length());
+      }
       return children.get(name);
     }