(iotdb) branch master updated: Load: Deleted the unnecessary auto-creation (#16624)

[justinchen]

This is an automated email from the ASF dual-hosted git repository.

justinchen 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 01ae4dcc481 Load: Deleted the unnecessary auto-creation (#16624)
01ae4dcc481 is described below

commit 01ae4dcc48194779d756e0d8c429b0a7b84ac111
Author: Caideyipi <87789683+caidey...@users.noreply.github.com>
AuthorDate: Mon Oct 20 19:45:34 2025 +0800

    Load: Deleted the unnecessary auto-creation (#16624)
---
 .../iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java | 3 ++-
 .../plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java           | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
index ad503f5fe81..88b8f463a94 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
@@ -582,7 +582,8 @@ public class IoTDBDataNodeReceiver extends 
IoTDBFileReceiver {
     statement.setDeleteAfterLoad(true);
     statement.setConvertOnTypeMismatch(true);
     statement.setVerifySchema(validateTsFile.get());
-    statement.setAutoCreateDatabase(true);
+    statement.setAutoCreateDatabase(
+        IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled());
     statement.setDatabase(dataBaseName);
 
     return executeStatementAndClassifyExceptions(statement);
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java
index 6f269ade38f..f0412c36bb8 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java
@@ -299,6 +299,10 @@ public class TreeSchemaAutoCreatorAndVerifier {
 
         for (final String databaseName : resp.getDatabaseInfoMap().keySet()) {
           schemaCache.addAlreadySetDatabase(new PartialPath(databaseName));
+          databasesNeededToBeSet.removeIf(
+              database ->
+                  database.startsWith(databaseName)
+                      || databaseName.startsWith(database.getFullPath()));
         }
       } catch (IOException | TException | ClientManagerException e) {
         throw new LoadFileException(e);