Fix auto-create table

jt2594838 · jt2594838 · commit 7c809068b1ee · 2026-01-27T18:06:01.000+08:00
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/CreateTableProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/CreateTableProcedure.java
@@ -129,6 +129,9 @@ protected void checkTableExistence(final ConfigNodeProcedureEnv env) {
             && schema.getTTL() != Long.MAX_VALUE) {
           table.addProp(TsTable.TTL_PROPERTY, String.valueOf(schema.getTTL()));
         }
+        if (!table.getPropValue(TsTable.ALLOW_ALTER_NAME_PROPERTY).isPresent()) {
+          table.addProp(TsTable.ALLOW_ALTER_NAME_PROPERTY, String.valueOf(TsTable.ALLOW_ALTER_NAME_DEFAULT));
+        }
         setNextState(CreateTableState.PRE_CREATE);
       }
     } catch (final MetadataException | DatabaseNotExistsException e) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ClusterPartitionFetcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ClusterPartitionFetcher.java
@@ -348,7 +348,7 @@ private SchemaPartition getOrCreateSchemaPartition(
         final List<TSeriesPartitionSlot> partitionSlots =
             Objects.nonNull(deviceIDs)
                 ? deviceIDs.stream()
-                    .map(deviceID -> CommonUtils.getSeriesPartitionKey(deviceID, database))
+                    .map(deviceID -> CommonUtils.getSeriesPartitionKey(deviceID, database, false))
                     .map(partitionExecutor::getSeriesPartitionSlot)
                     .distinct()
                     .collect(Collectors.toList())
@@ -471,7 +471,8 @@ private TDataPartitionReq constructDataPartitionReq(
         seriesSlotTimePartitionMap
             .computeIfAbsent(
                 partitionExecutor.getSeriesPartitionSlot(
-                    CommonUtils.getSeriesPartitionKey(queryParam.getDeviceID(), databaseName)),
+                    CommonUtils.getSeriesPartitionKey(
+                        queryParam.getDeviceID(), databaseName, false)),
                 k ->
                     new ComplexTimeSlotList(
                         queryParam.isNeedLeftAll(), queryParam.isNeedRightAll()))
@@ -509,7 +510,7 @@ private TDataPartitionReq constructDataPartitionReqForQuery(
         }
         deviceToTimePartitionMap.putIfAbsent(
             partitionExecutor.getSeriesPartitionSlot(
-                CommonUtils.getSeriesPartitionKey(queryParam.getDeviceID(), databaseName)),
+                CommonUtils.getSeriesPartitionKey(queryParam.getDeviceID(), databaseName, false)),
             sharedTTimeSlotList);
       }
       partitionSlotsMap.put(databaseName, deviceToTimePartitionMap);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java
@@ -709,7 +709,7 @@ public SchemaPartition getSchemaPartition(
         for (final IDeviceID device : entry.getValue()) {
           final TSeriesPartitionSlot seriesPartitionSlot =
               partitionExecutor.getSeriesPartitionSlot(
-                  CommonUtils.getSeriesPartitionKey(device, databaseName));
+                  CommonUtils.getSeriesPartitionKey(device, databaseName, true));
           if (!map.containsKey(seriesPartitionSlot)) {
             // if one device not find, then return cache miss.
             if (logger.isDebugEnabled()) {
@@ -878,7 +878,7 @@ public DataPartition getDataPartition(
           if (null != param.getDeviceID()) {
             seriesPartitionSlot =
                 partitionExecutor.getSeriesPartitionSlot(
-                    CommonUtils.getSeriesPartitionKey(param.getDeviceID(), databaseName));
+                    CommonUtils.getSeriesPartitionKey(param.getDeviceID(), databaseName, true));
           } else {
             return null;
           }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java
@@ -578,7 +578,8 @@ private Pair<String, TsTable> parseTable4CreateTableOrView(
 
     Map<String, String> properties = convertPropertiesToMap(node.getProperties(), false);
     // new tables' names can be altered by default
-    properties.putIfAbsent(ALLOW_ALTER_NAME_PROPERTY, "true");
+    properties.putIfAbsent(
+        ALLOW_ALTER_NAME_PROPERTY, String.valueOf(TsTable.ALLOW_ALTER_NAME_DEFAULT));
     table.setProps(properties);
     if (Objects.nonNull(node.getComment())) {
       table.addProp(TsTable.COMMENT_KEY, node.getComment());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
@@ -1445,7 +1445,7 @@ private List<TRegionReplicaSet> getDeviceReplicaSets(
     Map<Integer, List<TRegionReplicaSet>> slot2ReplicasMap =
         cache.computeIfAbsent(db, k -> new HashMap<>());
 
-    SeriesPartitionKey seriesPartitionKey = CommonUtils.getSeriesPartitionKey(deviceID, db);
+    SeriesPartitionKey seriesPartitionKey = CommonUtils.getSeriesPartitionKey(deviceID, db, true);
     TSeriesPartitionSlot tSeriesPartitionSlot =
         dataPartition.calculateDeviceGroupId(seriesPartitionKey);
 
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java
@@ -172,7 +172,7 @@ public List<WritePlanNode> splitByPartition(IAnalysis analysis) {
       // each row may belong to different database, pass null for auto-detection
       SeriesPartitionKey seriesPartitionKey =
           CommonUtils.getSeriesPartitionKey(
-              insertRowNode.getDeviceID(), analysis.getDatabaseName());
+              insertRowNode.getDeviceID(), analysis.getDatabaseName(), true);
       TRegionReplicaSet dataRegionReplicaSet =
           analysis
               .getDataPartitionInfo()
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java
@@ -210,7 +210,7 @@ protected Map<TRegionReplicaSet, List<Integer>> splitByReplicaSet(
       final IDeviceID deviceID = entry.getKey();
       final PartitionSplitInfo splitInfo = entry.getValue();
       SeriesPartitionKey seriesPartitionKey =
-          CommonUtils.getSeriesPartitionKey(deviceID, analysis.getDatabaseName());
+          CommonUtils.getSeriesPartitionKey(deviceID, analysis.getDatabaseName(), true);
       final List<TRegionReplicaSet> replicaSets =
           analysis
               .getDataPartitionInfo()
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
@@ -1309,7 +1309,7 @@ private List<TRegionReplicaSet> getDeviceReplicaSets(
 
     // given seriesPartitionSlot has already been calculated
     SeriesPartitionKey seriesPartitionKey =
-        CommonUtils.getSeriesPartitionKey(deviceId, databaseName);
+        CommonUtils.getSeriesPartitionKey(deviceId, databaseName, true);
     final TSeriesPartitionSlot seriesPartitionSlot =
         dataPartition.calculateDeviceGroupId(seriesPartitionKey);
     List<TRegionReplicaSet> regionReplicaSets =
@@ -1791,7 +1791,7 @@ public List<PlanNode> visitTableDeviceFetch(
       final List<Object[]> deviceIDArray = node.getDeviceIdList();
       for (int i = 0; i < node.getPartitionKeyList().size(); ++i) {
         SeriesPartitionKey seriesPartitionKey =
-            CommonUtils.getSeriesPartitionKey(partitionKeyList.get(i), database);
+            CommonUtils.getSeriesPartitionKey(partitionKeyList.get(i), database, true);
         final TRegionReplicaSet regionReplicaSet =
             databaseMap.get(schemaPartition.calculateDeviceGroupId(seriesPartitionKey));
         if (Objects.nonNull(regionReplicaSet)) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java
@@ -263,7 +263,7 @@ public List<WritePlanNode> splitByPartition(final IAnalysis analysis) {
     for (int i = 0; i < partitionKeyList.size(); i++) {
       // Use the string literal of deviceId as the partition key
       SeriesPartitionKey seriesPartitionKey =
-          CommonUtils.getSeriesPartitionKey(partitionKeyList.get(i), database);
+          CommonUtils.getSeriesPartitionKey(partitionKeyList.get(i), database, true);
       final TRegionReplicaSet regionReplicaSet =
           analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(database, seriesPartitionKey);
       splitMap.computeIfAbsent(regionReplicaSet, k -> new ArrayList<>()).add(i);
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
@@ -851,7 +851,7 @@ public List<TRegionReplicaSet> queryDataPartition(
                     // (database != null) means this file will be loaded into table-model
                     {
                       SeriesPartitionKey seriesPartitionKey =
-                          CommonUtils.getSeriesPartitionKey(pair.left, database);
+                          CommonUtils.getSeriesPartitionKey(pair.left, database, false);
                       return database != null
                           ? dataPartition.getDataRegionReplicaSetForWriting(
                               seriesPartitionKey, pair.right, database)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
@@ -462,12 +462,20 @@ public static String toString(TsBlock tsBlock) {
     return tsBlockBuilder.toString();
   }
 
-  public static SeriesPartitionKey getSeriesPartitionKey(IDeviceID deviceID, String databaseName) {
+  public static SeriesPartitionKey getSeriesPartitionKey(
+      IDeviceID deviceID, String databaseName, boolean tableMustExist) {
     if (databaseName != null && deviceID.isTableModel()) {
       TsTable table =
-          DataNodeTableCache.getInstance().getTable(databaseName, deviceID.getTableName());
-      boolean canAlterName = table.canAlterName();
-      if (canAlterName) {
+          DataNodeTableCache.getInstance()
+              .getTable(databaseName, deviceID.getTableName(), tableMustExist);
+      if (table == null) {
+        // if table does not exist, then we are creating a new table
+        // use the default setting
+        return TsTable.ALLOW_ALTER_NAME_DEFAULT
+            ? new NoTableNameDeviceIdKey(deviceID)
+            : new FullDeviceIdKey(deviceID);
+      }
+      if (table.canAlterName()) {
         return new NoTableNameDeviceIdKey(deviceID);
       } else {
         return new FullDeviceIdKey(deviceID);
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java
@@ -70,6 +70,7 @@ public class TsTable {
 
   public static final String TTL_PROPERTY = "ttl";
   public static final String ALLOW_ALTER_NAME_PROPERTY = "allow_alter_name";
+  public static final boolean ALLOW_ALTER_NAME_DEFAULT = true;
   public static final Set<String> TABLE_ALLOWED_PROPERTIES =
       new HashSet<>(Arrays.asList(TTL_PROPERTY, ALLOW_ALTER_NAME_PROPERTY));
   private static final String OBJECT_STRING_ERROR =
@@ -444,6 +445,9 @@ public String toString() {
   }
 
   public boolean canAlterName() {
+    if (getProps() == null) {
+      return false;
+    }
     return Boolean.parseBoolean(
         getProps().getOrDefault(TsTable.ALLOW_ALTER_NAME_PROPERTY, "false"));
   }

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,9 @@ protected void checkTableExistence(final ConfigNodeProcedureEnv env) {`
`129`	`129`	`&& schema.getTTL() != Long.MAX_VALUE) {`
`130`	`130`	`table.addProp(TsTable.TTL_PROPERTY, String.valueOf(schema.getTTL()));`
`131`	`131`	`}`
	`132`	`+ if (!table.getPropValue(TsTable.ALLOW_ALTER_NAME_PROPERTY).isPresent()) {`
	`133`	`+ table.addProp(TsTable.ALLOW_ALTER_NAME_PROPERTY, String.valueOf(TsTable.ALLOW_ALTER_NAME_DEFAULT));`
	`134`	`+ }`
`132`	`135`	`setNextState(CreateTableState.PRE_CREATE);`
`133`	`136`	`}`
`134`	`137`	`} catch (final MetadataException \| DatabaseNotExistsException e) {`
Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ public List<TRegionReplicaSet> queryDataPartition(`
`851`	`851`	`// (database != null) means this file will be loaded into table-model`
`852`	`852`	`{`
`853`	`853`	`SeriesPartitionKey seriesPartitionKey =`
`854`		`- CommonUtils.getSeriesPartitionKey(pair.left, database);`
	`854`	`+ CommonUtils.getSeriesPartitionKey(pair.left, database, false);`
`855`	`855`	`return database != null`
`856`	`856`	`? dataPartition.getDataRegionReplicaSetForWriting(`
`857`	`857`	`seriesPartitionKey, pair.right, database)`