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

jiangtian pushed a commit to branch tableModelIngestion
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 83972d5133170f613f7d00a7ecf99e3e02b1a5ac
Merge: e03efd10277 661f436a47a
Author: jt2594838 <[email protected]>
AuthorDate: Wed Jul 3 16:32:55 2024 +0800

    Merge branch 'ty/TableModelGrammar' into tableModelIngestion
    
    # Conflicts:
    #       
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java

 .../execution/config/TableConfigTaskVisitor.java   | 35 +---------
 .../metadata/fetcher/TableDeviceSchemaFetcher.java | 15 +++--
 .../fetcher/TableHeaderSchemaValidator.java        | 78 +++++++++++++++++++++-
 3 files changed, 89 insertions(+), 39 deletions(-)

diff --cc 
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
index 52b0f17203f,3588d670298..4f12a12fa26
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
@@@ -126,9 -135,12 +136,13 @@@ public class TableHeaderSchemaValidato
  
      // auto create missing table or columns
      if (table == null) {
 +      LOGGER.info("Trying to auto-create table: {}", tableSchema);
-       autoCreateTable(database, tableSchema, context);
+       autoCreateTable(database, tableSchema);
        table = DataNodeTableCache.getInstance().getTable(database, 
tableSchema.getTableName());
+       if (table == null) {
+         throw new IllegalStateException(
+             "auto create table succeed, but cannot get table schema in 
current node's DataNodeTableCache, may be caused by concurrently auto creating 
table");
+       }
      } else if (inputColumnList == null) {
        // do nothing
      } else {

Reply via email to