Revert "[BugFix] Set ColocateGroupSchema bucketNum to the calculated …

…num" (StarRocks#27546) Reverts StarRocks#27086
packy92 · Jul 19, 2023 · 1e5e391 · 1e5e391
1 parent 15cd500
commit 1e5e391
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/ColocateTableIndex.java b/fe/fe-core/src/main/java/com/starrocks/catalog/ColocateTableIndex.java
@@ -240,13 +240,6 @@ public GroupId addTableToGroup(long dbId, OlapTable tbl, String groupName, Group
                     groupAlreadyExist = false;
                 }
                 HashDistributionInfo distributionInfo = (HashDistributionInfo) tbl.getDefaultDistributionInfo();
-                if (!(tbl instanceof ExternalOlapTable)) {
-                    // Colocate table should keep the same bucket number across the partitions
-                    if (distributionInfo.getBucketNum() == 0) {
-                        int bucketNum = CatalogUtils.calBucketNumAccordingToBackends();
-                        distributionInfo.setBucketNum(bucketNum);
-                    }
-                }
                 ColocateGroupSchema groupSchema = new ColocateGroupSchema(groupId,
                         distributionInfo.getDistributionColumns(), distributionInfo.getBucketNum(),
                         tbl.getDefaultReplicationNum());

diff --git a/fe/fe-core/src/main/java/com/starrocks/server/OlapTableFactory.java b/fe/fe-core/src/main/java/com/starrocks/server/OlapTableFactory.java
@@ -374,6 +374,11 @@ public Table createTable(LocalMetastore metastore, Database db, CreateTableStmt
 
                 boolean addedToColocateGroup = colocateTableIndex.addTableToGroup(db, table,
                         colocateGroup, false /* expectLakeTable */);
+                if (!(table instanceof ExternalOlapTable) && addedToColocateGroup) {
+                    // Colocate table should keep the same bucket number across the partitions
+                    DistributionInfo defaultDistributionInfo = table.getDefaultDistributionInfo();
+                    table.inferDistribution(defaultDistributionInfo);
+                }
             }
 
             // get base index storage type. default is COLUMN

diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/CreateTableAutoTabletTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/CreateTableAutoTabletTest.java
@@ -14,8 +14,6 @@
 
 package com.starrocks.analysis;
 
-import com.starrocks.catalog.ColocateGroupSchema;
-import com.starrocks.catalog.ColocateTableIndex;
 import com.starrocks.catalog.Database;
 import com.starrocks.catalog.OlapTable;
 import com.starrocks.catalog.Partition;
@@ -254,12 +252,6 @@ public void test1AutoTabletWithColocate() throws Exception {
             db.readUnlock();
         }
         Assert.assertEquals(bucketNum, 10);
-
-        Long dbId = db.getId();
-        String fullGroupName = dbId + "_g1";
-        ColocateTableIndex index = GlobalStateMgr.getCurrentColocateIndex();
-        ColocateGroupSchema groupSchema = index.getGroupSchema(fullGroupName);
-        Assert.assertEquals(groupSchema.getBucketsNum(), 10);
     }