Remove unrelated load changes from LIKE fix

DaZuiZui · DaZuiZui · commit 89e1abb77564 · 2026-05-22T17:41:18.000+08:00
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
@@ -555,7 +555,6 @@ public PlanNode visitLoadFile(
         loadTsFileStatement.getResources(),
         isTableModel,
         loadTsFileStatement.getDatabase(),
-        loadTsFileStatement.getDatabaseLevel(),
         loadTsFileStatement.isNeedDecode4TimeColumn());
   }
 
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java
@@ -60,7 +60,6 @@ public class LoadSingleTsFileNode extends WritePlanNode {
   private final TsFileResource resource;
   private final boolean isTableModel;
   private final String database;
-  private final int databaseLevel;
   private final boolean deleteAfterLoad;
   private final long writePointCount;
   private boolean needDecodeTsFile;
@@ -72,7 +71,6 @@ public LoadSingleTsFileNode(
       final TsFileResource resource,
       final boolean isTableModel,
       final String database,
-      final int databaseLevel,
       final boolean deleteAfterLoad,
       final long writePointCount,
       final boolean needDecodeTsFile) {
@@ -81,7 +79,6 @@ public LoadSingleTsFileNode(
     this.resource = resource;
     this.isTableModel = isTableModel;
     this.database = database;
-    this.databaseLevel = databaseLevel;
     this.deleteAfterLoad = deleteAfterLoad;
     this.writePointCount = writePointCount;
     this.needDecodeTsFile = needDecodeTsFile;
@@ -179,10 +176,6 @@ public String getDatabase() {
     return database;
   }
 
-  public int getDatabaseLevel() {
-    return databaseLevel;
-  }
-
   @Override
   public TRegionReplicaSet getRegionReplicaSet() {
     return null;
@@ -268,7 +261,6 @@ public boolean equals(Object o) {
         && Objects.equals(resource, loadSingleTsFileNode.resource)
         && Objects.equals(isTableModel, loadSingleTsFileNode.isTableModel)
         && Objects.equals(database, loadSingleTsFileNode.database)
-        && Objects.equals(databaseLevel, loadSingleTsFileNode.databaseLevel)
         && Objects.equals(needDecodeTsFile, loadSingleTsFileNode.needDecodeTsFile)
         && Objects.equals(deleteAfterLoad, loadSingleTsFileNode.deleteAfterLoad)
         && Objects.equals(localRegionReplicaSet, loadSingleTsFileNode.localRegionReplicaSet);
@@ -281,7 +273,6 @@ public int hashCode() {
         resource,
         isTableModel,
         database,
-        databaseLevel,
         needDecodeTsFile,
         deleteAfterLoad,
         localRegionReplicaSet);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java
@@ -47,21 +47,18 @@ public class LoadTsFileNode extends WritePlanNode {
   private final List<TsFileResource> resources;
   private final List<Boolean> isTableModel;
   private final String database;
-  private final int databaseLevel;
   private final boolean needDecode4TimeColumn;
 
   public LoadTsFileNode(
       final PlanNodeId id,
       final List<TsFileResource> resources,
       final List<Boolean> isTableModel,
       final String database,
-      final int databaseLevel,
       final boolean needDecode4TimeColumn) {
     super(id);
     this.resources = resources;
     this.isTableModel = isTableModel;
     this.database = database;
-    this.databaseLevel = databaseLevel;
     this.needDecode4TimeColumn = needDecode4TimeColumn;
   }
 
@@ -131,7 +128,6 @@ private List<WritePlanNode> splitByPartitionForTreeModel(Analysis analysis) {
               resources.get(i),
               isTableModel.get(i),
               database,
-              databaseLevel,
               statement.isDeleteAfterLoad(),
               statement.getWritePointCount(i),
               needDecode4TimeColumn));
@@ -155,7 +151,6 @@ private List<WritePlanNode> splitByPartitionForTableModel(
                 resources.get(i),
                 isTableModel.get(i),
                 database,
-                databaseLevel,
                 statement.isDeleteAfterLoad(),
                 statement.getWritePointCount(i),
                 needDecode4TimeColumn));
@@ -178,12 +173,11 @@ public boolean equals(Object o) {
     LoadTsFileNode loadTsFileNode = (LoadTsFileNode) o;
     return Objects.equals(resources, loadTsFileNode.resources)
         && Objects.equals(database, loadTsFileNode.database)
-        && Objects.equals(databaseLevel, loadTsFileNode.databaseLevel)
         && Objects.equals(isTableModel, loadTsFileNode.isTableModel);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(resources, database, databaseLevel, isTableModel);
+    return Objects.hash(resources, database, isTableModel);
   }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
@@ -1410,7 +1410,6 @@ public RelationPlan visitLoadTsFile(final LoadTsFile node, final Void context) {
             node.getResources(),
             isTableModel,
             node.getDatabase(),
-            node.getDatabaseLevel(),
             node.isNeedDecode4TimeColumn()),
         analysis.getRootScope(),
         Collections.emptyList(),
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
@@ -30,12 +30,10 @@
 import org.apache.iotdb.commons.consensus.ConsensusGroupId;
 import org.apache.iotdb.commons.consensus.DataRegionId;
 import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.exception.IllegalPathException;
 import org.apache.iotdb.commons.exception.IoTDBException;
 import org.apache.iotdb.commons.partition.DataPartition;
 import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
 import org.apache.iotdb.commons.partition.StorageExecutor;
-import org.apache.iotdb.commons.path.PartialPath;
 import org.apache.iotdb.commons.service.metric.MetricService;
 import org.apache.iotdb.commons.service.metric.enums.Metric;
 import org.apache.iotdb.commons.service.metric.enums.Tag;
@@ -183,8 +181,7 @@ public void start() {
         final LoadSingleTsFileNode node = tsFileNodeList.get(i);
         final String filePath = node.getTsFileResource().getTsFilePath();
 
-        partitionFetcher.setDatabase(
-            getPartitionQueryDatabase(node, isGeneratedByPipe), node.getDatabaseLevel());
+        partitionFetcher.setDatabase(getPartitionQueryDatabase(node, isGeneratedByPipe));
 
         boolean isLoadSingleTsFileSuccess = true;
         boolean shouldRemoveFileFromLoadingSet = false;
@@ -643,38 +640,7 @@ private void convertFailedTsFilesToTabletsAndRetry() {
 
   static String getPartitionQueryDatabase(
       final LoadSingleTsFileNode node, final boolean isGeneratedByPipe) {
-    if (node.isTableModel()) {
-      return node.getDatabase();
-    }
-    if (!isGeneratedByPipe) {
-      return null;
-    }
-    return node.getDatabase() != null
-        ? node.getDatabase()
-        : inferDatabaseName(node.getTsFileResource().getDevices(), node.getDatabaseLevel());
-  }
-
-  private static String inferDatabaseName(final Set<IDeviceID> devices, final int databaseLevel) {
-    if (devices == null || devices.isEmpty()) {
-      return null;
-    }
-    return inferDatabaseName(devices.iterator().next(), databaseLevel);
-  }
-
-  private static String inferDatabaseName(final IDeviceID deviceID, final int databaseLevel) {
-    try {
-      final String[] deviceNodes = new PartialPath(deviceID).getNodes();
-      final int databaseNodesLength = databaseLevel + 1;
-      if (deviceNodes.length < databaseNodesLength) {
-        return null;
-      }
-      final String[] databaseNodes = new String[databaseNodesLength];
-      System.arraycopy(deviceNodes, 0, databaseNodes, 0, databaseNodesLength);
-      return new PartialPath(databaseNodes).getFullPath();
-    } catch (final IllegalPathException e) {
-      LOGGER.warn("Failed to infer database name from device {}.", deviceID, e);
-      return null;
-    }
+    return node.isTableModel() || isGeneratedByPipe ? node.getDatabase() : null;
   }
 
   private LoadTsFileStatement buildRetryTreeLoadStatement(
@@ -887,15 +853,13 @@ private void clear() {
   private static class DataPartitionBatchFetcher {
     private final IPartitionFetcher fetcher;
     private String database;
-    private int databaseLevel;
 
     public DataPartitionBatchFetcher(IPartitionFetcher fetcher) {
       this.fetcher = fetcher;
     }
 
-    public void setDatabase(String database, int databaseLevel) {
+    public void setDatabase(String database) {
       this.database = database;
-      this.databaseLevel = databaseLevel;
     }
 
     public List<TRegionReplicaSet> queryDataPartition(
@@ -911,17 +875,14 @@ public List<TRegionReplicaSet> queryDataPartition(
         replicaSets.addAll(
             subSlotList.stream()
                 .map(
-                    pair -> {
-                      // database is an explicit database hint for table-model loads and
-                      // pipe-generated tree-model loads. When a pipe-generated tree-model load
-                      // only carries database-level, infer the database from the device.
-                      final String queryDatabase =
-                          database != null ? database : inferDatabaseName(pair.left, databaseLevel);
-                      return queryDatabase != null
-                          ? dataPartition.getDataRegionReplicaSetForWriting(
-                              pair.left, pair.right, queryDatabase)
-                          : dataPartition.getDataRegionReplicaSetForWriting(pair.left, pair.right);
-                    })
+                    pair ->
+                        // database is an explicit database hint for table-model loads and
+                        // pipe-generated tree-model loads.
+                        database != null
+                            ? dataPartition.getDataRegionReplicaSetForWriting(
+                                pair.left, pair.right, database)
+                            : dataPartition.getDataRegionReplicaSetForWriting(
+                                pair.left, pair.right))
                 .collect(Collectors.toList()));
       }
       return replicaSets;
@@ -940,12 +901,9 @@ private List<DataPartitionQueryParam> toQueryParam(
                 DataPartitionQueryParam queryParam =
                     new DataPartitionQueryParam(entry.getKey(), new ArrayList<>(entry.getValue()));
                 // database is an explicit database hint for table-model loads and
-                // pipe-generated tree-model loads. When a pipe-generated tree-model load
-                // only carries database-level, infer the database from the device.
-                final String queryDatabase =
-                    database != null ? database : inferDatabaseName(entry.getKey(), databaseLevel);
-                if (queryDatabase != null) {
-                  queryParam.setDatabaseName(queryDatabase);
+                // pipe-generated tree-model loads.
+                if (database != null) {
+                  queryParam.setDatabaseName(database);
                 }
                 return queryParam;
               })
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java
@@ -40,14 +40,11 @@ public class LoadTsFileNodeTest {
   public void testLoadSingleTsFileNode() {
     TsFileResource resource = new TsFileResource(new File("1"));
     String database = "root.db";
-    int databaseLevel = 1;
     LoadSingleTsFileNode node =
-        new LoadSingleTsFileNode(
-            new PlanNodeId(""), resource, false, database, databaseLevel, true, 0L, false);
+        new LoadSingleTsFileNode(new PlanNodeId(""), resource, false, database, true, 0L, false);
     Assert.assertTrue(node.isDeleteAfterLoad());
     Assert.assertEquals(resource, node.getTsFileResource());
     Assert.assertEquals(database, node.getDatabase());
-    Assert.assertEquals(databaseLevel, node.getDatabaseLevel());
     Assert.assertNull(node.getLocalRegionReplicaSet());
     Assert.assertNull(node.getRegionReplicaSet());
     Assert.assertEquals(Collections.emptyList(), node.getChildren());

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,6 @@ public PlanNode visitLoadFile(`
`555`	`555`	`loadTsFileStatement.getResources(),`
`556`	`556`	`isTableModel,`
`557`	`557`	`loadTsFileStatement.getDatabase(),`
`558`		`- loadTsFileStatement.getDatabaseLevel(),`
`559`	`558`	`loadTsFileStatement.isNeedDecode4TimeColumn());`
`560`	`559`	`}`
`561`	`560`