This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 29fb340e034 branch-4.1: [fix](test) Isolate cloud mode in colocation
proc test #65515 (#67658)
29fb340e034 is described below
commit 29fb340e034a6b24ddb85d63e5291fc1d6efa1fe
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Sep 9 21:11:45 2026 +0800
branch-4.1: [fix](test) Isolate cloud mode in colocation proc test #65515
(#67658)
Cherry-picked from #65515
Co-authored-by: shuke <[email protected]>
---
.../common/proc/ColocationGroupProcDirTest.java | 30 ++++++++--------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/common/proc/ColocationGroupProcDirTest.java
b/fe/fe-core/src/test/java/org/apache/doris/common/proc/ColocationGroupProcDirTest.java
index bfb53825947..3e08cc82237 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/common/proc/ColocationGroupProcDirTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/common/proc/ColocationGroupProcDirTest.java
@@ -86,7 +86,6 @@ public class ColocationGroupProcDirTest extends
TestWithFeService {
@Test
public void testCloudColocationGroupDetailWithoutTag() throws Exception {
- String originDeployMode = Config.deploy_mode;
createTable("CREATE TABLE colocate_t1 (k INT) DISTRIBUTED BY HASH(k)
BUCKETS 2 "
+ "PROPERTIES ('replication_num' = '1', 'colocate_with' =
'g1')");
createTable("CREATE TABLE colocate_t2 (k INT) DISTRIBUTED BY HASH(k)
BUCKETS 2 "
@@ -99,22 +98,20 @@ public class ColocationGroupProcDirTest extends
TestWithFeService {
ColocateTableIndex colocateTableIndex =
Mockito.spy(Env.getCurrentColocateIndex());
Mockito.doReturn(Maps.<Tag,
List<List<Long>>>newHashMap()).when(colocateTableIndex)
.getBackendsPerBucketSeq(groupId);
- Config.deploy_mode = "cloud";
- try (MockedStatic<Env> mockedEnv = Mockito.mockStatic(Env.class,
Mockito.CALLS_REAL_METHODS)) {
+ try (MockedStatic<Config> mockedConfig =
Mockito.mockStatic(Config.class, Mockito.CALLS_REAL_METHODS);
+ MockedStatic<Env> mockedEnv = Mockito.mockStatic(Env.class,
Mockito.CALLS_REAL_METHODS)) {
+ mockedConfig.when(Config::isCloudMode).thenReturn(true);
mockedEnv.when(Env::getCurrentColocateIndex).thenReturn(colocateTableIndex);
ProcNodeInterface node = new
ColocationGroupProcDir().lookup(groupId.toString());
ProcResult result = node.fetchResult();
Assertions.assertEquals(Lists.newArrayList("BucketIndex",
"BackendIds"), result.getColumnNames());
Assertions.assertFalse(result.getRows().isEmpty());
Assertions.assertTrue(result.getRows().stream().anyMatch(row ->
row.size() == 2 && !row.get(1).isEmpty()));
- } finally {
- Config.deploy_mode = originDeployMode;
}
}
@Test
public void testCloudGlobalColocationGroupDetailFallback() throws
Exception {
- String originDeployMode = Config.deploy_mode;
createTable("CREATE TABLE global_colocate_t1 (k INT) DISTRIBUTED BY
HASH(k) BUCKETS 2 "
+ "PROPERTIES ('replication_num' = '1', 'colocate_with' =
'__global__g1')");
@@ -125,22 +122,20 @@ public class ColocationGroupProcDirTest extends
TestWithFeService {
ColocateTableIndex colocateTableIndex =
Mockito.spy(Env.getCurrentColocateIndex());
Mockito.doReturn(Maps.<Tag,
List<List<Long>>>newHashMap()).when(colocateTableIndex)
.getBackendsPerBucketSeq(groupId);
- Config.deploy_mode = "cloud";
- try (MockedStatic<Env> mockedEnv = Mockito.mockStatic(Env.class,
Mockito.CALLS_REAL_METHODS)) {
+ try (MockedStatic<Config> mockedConfig =
Mockito.mockStatic(Config.class, Mockito.CALLS_REAL_METHODS);
+ MockedStatic<Env> mockedEnv = Mockito.mockStatic(Env.class,
Mockito.CALLS_REAL_METHODS)) {
+ mockedConfig.when(Config::isCloudMode).thenReturn(true);
mockedEnv.when(Env::getCurrentColocateIndex).thenReturn(colocateTableIndex);
ProcNodeInterface node = new
ColocationGroupProcDir().lookup(groupId.toString());
ProcResult result = node.fetchResult();
Assertions.assertEquals(Lists.newArrayList("BucketIndex",
"BackendIds"), result.getColumnNames());
Assertions.assertFalse(result.getRows().isEmpty());
Assertions.assertTrue(result.getRows().stream().anyMatch(row ->
row.size() == 2 && !row.get(1).isEmpty()));
- } finally {
- Config.deploy_mode = originDeployMode;
}
}
@Test
public void
testCloudColocationGroupDetailFallbackSkipsUnusableFirstTable() throws
Exception {
- String originDeployMode = Config.deploy_mode;
createTable("CREATE TABLE colocate_t5 (k INT) DISTRIBUTED BY HASH(k)
BUCKETS 2 "
+ "PROPERTIES ('replication_num' = '1', 'colocate_with' =
'g3')");
createTable("CREATE TABLE colocate_t6 (k INT) DISTRIBUTED BY HASH(k)
BUCKETS 2 "
@@ -153,8 +148,9 @@ public class ColocationGroupProcDirTest extends
TestWithFeService {
ColocateTableIndex colocateTableIndex =
Mockito.spy(Env.getCurrentColocateIndex());
Mockito.doReturn(Maps.<Tag,
List<List<Long>>>newHashMap()).when(colocateTableIndex)
.getBackendsPerBucketSeq(groupId);
- Config.deploy_mode = "cloud";
- try (MockedStatic<Env> mockedEnv = Mockito.mockStatic(Env.class,
Mockito.CALLS_REAL_METHODS)) {
+ try (MockedStatic<Config> mockedConfig =
Mockito.mockStatic(Config.class, Mockito.CALLS_REAL_METHODS);
+ MockedStatic<Env> mockedEnv = Mockito.mockStatic(Env.class,
Mockito.CALLS_REAL_METHODS)) {
+ mockedConfig.when(Config::isCloudMode).thenReturn(true);
mockedEnv.when(Env::getCurrentColocateIndex).thenReturn(colocateTableIndex);
ProcNodeInterface node = new
ColocationGroupProcDir().lookup(groupId.toString());
ProcResult result = node.fetchResult();
@@ -163,20 +159,18 @@ public class ColocationGroupProcDirTest extends
TestWithFeService {
Assertions.assertTrue(result.getRows().stream().anyMatch(row ->
row.size() == 2 && !row.get(1).isEmpty()));
} finally {
db.registerTable(table1);
- Config.deploy_mode = originDeployMode;
}
}
@Test
public void testCloudColocationGroupReplicaAllocationIsNull() throws
Exception {
- String originDeployMode = Config.deploy_mode;
createTable("CREATE TABLE colocate_t3 (k INT) DISTRIBUTED BY HASH(k)
BUCKETS 2 "
+ "PROPERTIES ('replication_num' = '1', 'colocate_with' =
'g2')");
createTable("CREATE TABLE colocate_t4 (k INT) DISTRIBUTED BY HASH(k)
BUCKETS 2 "
+ "PROPERTIES ('replication_num' = '1', 'colocate_with' =
'g2')");
- Config.deploy_mode = "cloud";
- try {
+ try (MockedStatic<Config> mockedConfig =
Mockito.mockStatic(Config.class, Mockito.CALLS_REAL_METHODS)) {
+ mockedConfig.when(Config::isCloudMode).thenReturn(true);
ProcResult result = new ColocationGroupProcDir().fetchResult();
int groupNameIdx =
ColocationGroupProcDir.TITLE_NAMES.indexOf("GroupName");
int replicaAllocIdx =
ColocationGroupProcDir.TITLE_NAMES.indexOf("ReplicaAllocation");
@@ -185,8 +179,6 @@ public class ColocationGroupProcDirTest extends
TestWithFeService {
.findFirst()
.orElseThrow(() -> new AssertionError("can not find
colocate group test.g2"));
Assertions.assertEquals("null", groupRow.get(replicaAllocIdx));
- } finally {
- Config.deploy_mode = originDeployMode;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
