(iotdb) branch master updated: Added the missed separate mTree logic for tree/table database plans (#14509)

[jackietien]

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

jackietien 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 fa4f6da8da0 Added the missed separate mTree logic for tree/table 
database plans (#14509)
fa4f6da8da0 is described below

commit fa4f6da8da079fad1e287b1b0ce2e78ce2c695ca
Author: Caideyipi <87789683+caidey...@users.noreply.github.com>
AuthorDate: Sat Dec 21 09:07:34 2024 +0800

    Added the missed separate mTree logic for tree/table database plans (#14509)
---
 .../iotdb/relational/it/schema/IoTDBDatabaseIT.java  |  9 +++++++++
 .../persistence/schema/ClusterSchemaInfo.java        | 20 +++++++++++++-------
 .../plan/analyze/ClusterPartitionFetcher.java        |  1 -
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
index db6d72b08c5..6db3ab356f8 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
@@ -438,6 +438,15 @@ public class IoTDBDatabaseIT {
         assertEquals(0, resultSet.getInt(7));
         assertFalse(resultSet.next());
       }
+
+      // Test adjustMaxRegionGroupNum
+      statement.execute("use test");
+      statement.execute(
+          "create table table2(region_id STRING ID, plant_id STRING ID, color 
STRING ATTRIBUTE, temperature FLOAT MEASUREMENT, speed DOUBLE MEASUREMENT)");
+      statement.execute(
+          "insert into table2(region_id, plant_id, color, temperature, speed) 
values(1, 1, 1, 1, 1)");
+
+      statement.execute("create database test1");
     }
 
     try (final Connection connection = EnvFactory.getEnv().getConnection();
diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
index 8e136b62c34..847c791351d 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
@@ -375,9 +375,11 @@ public class ClusterSchemaInfo implements 
SnapshotProcessor {
     final TSStatus result = new TSStatus();
     databaseReadWriteLock.writeLock().lock();
     try {
+      final ConfigMTree mTree =
+          PathUtils.isTableModelDatabase(plan.getDatabase()) ? tableModelMTree 
: treeModelMTree;
       final PartialPath path = 
getQualifiedDatabasePartialPath(plan.getDatabase());
-      if (treeModelMTree.isDatabaseAlreadySet(path)) {
-        treeModelMTree
+      if (mTree.isDatabaseAlreadySet(path)) {
+        mTree
             .getDatabaseNodeByDatabasePath(path)
             .getAsMNode()
             .getDatabaseSchema()
@@ -399,9 +401,11 @@ public class ClusterSchemaInfo implements 
SnapshotProcessor {
     final TSStatus result = new TSStatus();
     databaseReadWriteLock.writeLock().lock();
     try {
+      final ConfigMTree mTree =
+          PathUtils.isTableModelDatabase(plan.getDatabase()) ? tableModelMTree 
: treeModelMTree;
       final PartialPath path = 
getQualifiedDatabasePartialPath(plan.getDatabase());
-      if (treeModelMTree.isDatabaseAlreadySet(path)) {
-        treeModelMTree
+      if (mTree.isDatabaseAlreadySet(path)) {
+        mTree
             .getDatabaseNodeByDatabasePath(path)
             .getAsMNode()
             .getDatabaseSchema()
@@ -423,9 +427,11 @@ public class ClusterSchemaInfo implements 
SnapshotProcessor {
     final TSStatus result = new TSStatus();
     databaseReadWriteLock.writeLock().lock();
     try {
+      final ConfigMTree mTree =
+          PathUtils.isTableModelDatabase(plan.getDatabase()) ? tableModelMTree 
: treeModelMTree;
       final PartialPath path = 
getQualifiedDatabasePartialPath(plan.getDatabase());
-      if (treeModelMTree.isDatabaseAlreadySet(path)) {
-        treeModelMTree
+      if (mTree.isDatabaseAlreadySet(path)) {
+        mTree
             .getDatabaseNodeByDatabasePath(path)
             .getAsMNode()
             .getDatabaseSchema()
@@ -456,7 +462,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor 
{
       for (final Map.Entry<String, Pair<Integer, Integer>> entry :
           plan.getMaxRegionGroupNumMap().entrySet()) {
         final TDatabaseSchema databaseSchema =
-            treeModelMTree
+            (PathUtils.isTableModelDatabase(entry.getKey()) ? tableModelMTree 
: treeModelMTree)
                 
.getDatabaseNodeByDatabasePath(getQualifiedDatabasePartialPath(entry.getKey()))
                 .getAsMNode()
                 .getDatabaseSchema();
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
index d08d4ca013b..e7bbaa369a7 100644
--- 
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
@@ -349,7 +349,6 @@ public class ClusterPartitionFetcher implements 
IPartitionFetcher {
                   schemaPartitionTableResp.getStatus().getCode()));
         }
       }
-      System.out.println(schemaPartition.getSchemaPartitionMap());
       return schemaPartition;
     } catch (final ClientManagerException | TException e) {
       throw new StatementAnalyzeException(