This is an automated email from the ASF dual-hosted git repository.
hello-stephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 081aced387c [fix](regression) Address colocate stability review
comments (#64397)
081aced387c is described below
commit 081aced387c5923398dc7d058b2c411521acb7f5
Author: morrySnow <[email protected]>
AuthorDate: Thu Jun 11 14:45:46 2026 +0800
[fix](regression) Address colocate stability review comments (#64397)
Related PR: #64361
Problem Summary:
This follow-up addresses review comments left on #64361 after it had
already been merged.
The shared colocate stability helper always prefixed the group name with
the database name. Global colocate groups start with `__global__` and
are reported by `SHOW PROC '/colocation_group'` without a database
prefix, so waiting for a global group would time out.
Additionally, the column-order suite waited for group stability only
before its positive `COLOCATE` assertions. Its negative assertions could
therefore pass because an unstable group disables colocate join, rather
than because the tested join columns are incompatible.
This PR preserves bare global group names and moves the stability wait
before the first column-order EXPLAIN.
---
.../src/main/groovy/org/apache/doris/regression/suite/Suite.groovy | 2 +-
.../suites/correctness_p0/test_colocate_join_of_column_order.groovy | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
index d1f6dd2c4fd..3fc37eb7da3 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -997,7 +997,7 @@ class Suite implements GroovyInterceptable {
}
void waitForColocateGroupStable(String dbName, String groupName, int
timeoutSeconds = 60) {
- String fullGroupName = "${dbName}.${groupName}"
+ String fullGroupName = groupName.startsWith("__global__") ? groupName
: "${dbName}.${groupName}"
logger.info("wait colocate group ${fullGroupName} stable")
awaitUntil(timeoutSeconds) {
def groups = sql_return_maparray("SHOW PROC '/colocation_group'")
diff --git
a/regression-test/suites/correctness_p0/test_colocate_join_of_column_order.groovy
b/regression-test/suites/correctness_p0/test_colocate_join_of_column_order.groovy
index 68f34db07df..5d4f3664c92 100644
---
a/regression-test/suites/correctness_p0/test_colocate_join_of_column_order.groovy
+++
b/regression-test/suites/correctness_p0/test_colocate_join_of_column_order.groovy
@@ -52,6 +52,7 @@ suite("test_colocate_join_of_column_order") {
sql """insert into test_colocate_join_of_column_order_t2
values('k1','k2',11);"""
sql """set enable_nereids_planner=true; """
+ waitForColocateGroupStable("group_column_order")
explain {
sql("select * from test_colocate_join_of_column_order_t1 a join
test_colocate_join_of_column_order_t2 b on a.k1=b.k1 and a.k2=b.k2;")
notContains "COLOCATE"
@@ -68,7 +69,6 @@ suite("test_colocate_join_of_column_order") {
sql("select * from test_colocate_join_of_column_order_t1 a join
test_colocate_join_of_column_order_t2 b on a.k1=b.k2 and a.v=b.v;")
notContains "COLOCATE"
}
- waitForColocateGroupStable("group_column_order")
explain {
sql("select * from test_colocate_join_of_column_order_t1 a join
test_colocate_join_of_column_order_t2 b on a.k1=b.k2 and a.k2=b.k1;")
contains "COLOCATE"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
