You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ju...@apache.org on 2025/10/23 11:56:06 UTC

(iotdb) branch dev/1.3 updated: [To dev/1.3] Load: Deleted the unnecessary auto-creation (#16624) (#16628)

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

justinchen pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/dev/1.3 by this push:
     new d866e34b1b1 [To dev/1.3] Load: Deleted the unnecessary auto-creation (#16624) (#16628)
d866e34b1b1 is described below

commit d866e34b1b18ca7843aca1f59ce28b0456d38582
Author: Caideyipi <87...@users.noreply.github.com>
AuthorDate: Thu Oct 23 19:56:01 2025 +0800

    [To dev/1.3] Load: Deleted the unnecessary auto-creation (#16624) (#16628)
    
    * fix
    
    * remove-uls
---
 .../iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java | 3 ++-
 .../iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.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 5965d362564..de3ae290e89 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
@@ -487,7 +487,8 @@ public class IoTDBDataNodeReceiver extends IoTDBFileReceiver {
     statement.setDeleteAfterLoad(true);
     statement.setConvertOnTypeMismatch(true);
     statement.setVerifySchema(validateTsFile.get());
-    statement.setAutoCreateDatabase(false);
+    statement.setAutoCreateDatabase(
+        IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled());
 
     return executeStatementAndClassifyExceptions(statement);
   }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java
index 555374af1b1..765300a65c1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java
@@ -722,6 +722,10 @@ public class LoadTsFileAnalyzer implements AutoCloseable {
 
           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);