Skip to content

Commit 0e80fec

Browse files
committed
[test](regression) Stabilize state type compatibility suites
### What problem does this PR solve? Issue Number: close apache#65865 Related PR: apache#66664 Problem Summary: State type compatibility suites temporarily change a global FE configuration. Marking those suites as nonConcurrent serialized them, but also selected external and P0-only suites in the dedicated NonConcurrent pipeline. The remote Doris suite then left long-running queries that made the final check_before_quit case fail. Serialize only the configuration-changing sections with the regression framework global lock and restore the suites to their original groups. Also align the AGG_STATE negative case with the pre-existing Duplicate Key aggregate-type validation and keep the compatibility case focused on definitions that the temporary configuration can restore. ### Release note None ### Check List (For Author) - Test: Unit Test / Manual test - `./run-regression-test.sh --compile` - Parsed all 12 modified Groovy suites with the regression framework SuiteScript compiler configuration - SQL regression tests were not run because no Doris cluster was deployed in this worktree - Behavior changed: No. This only corrects regression scheduling and expectations - Does this need documentation: No
1 parent 5e47ca8 commit 0e80fec

12 files changed

Lines changed: 48 additions & 25 deletions

File tree

‎regression-test/suites/correctness_p0/test_default_hll.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_default_hll", "nonConcurrent") {
18+
suite("test_default_hll") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021
def tableName = "test_default_hll"
2122

@@ -98,4 +99,5 @@ suite("test_default_hll", "nonConcurrent") {
9899
qt_stream_load_csv1 """ select HLL_CARDINALITY(h1) from ${tableName} order by k; """
99100

100101
}
102+
}
101103
}

‎regression-test/suites/data_model_p0/duplicate/storage/test_duplicate_hll.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_duplicate_table_hll", "nonConcurrent") {
18+
suite("test_duplicate_table_hll") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021

2122
sql "sync;"
@@ -70,4 +71,5 @@ suite("test_duplicate_table_hll", "nonConcurrent") {
7071
exception "Key column can not set complex type:k"
7172
}
7273
}
74+
}
7375
}

‎regression-test/suites/data_model_p0/duplicate/storage/test_duplicate_quantile_state.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_duplicate_table_quantile_state", "nonConcurrent") {
18+
suite("test_duplicate_table_quantile_state") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021

2122
sql "sync;"
@@ -66,4 +67,5 @@ suite("test_duplicate_table_quantile_state", "nonConcurrent") {
6667
exception "Key column can not set complex type:k"
6768
}
6869
}
70+
}
6971
}

‎regression-test/suites/data_model_p0/test_state_types_only_in_aggregate_table.groovy‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_state_types_only_in_aggregate_table", "nonConcurrent") {
18+
suite("test_state_types_only_in_aggregate_table") {
1919
sql "set enable_agg_state=true"
2020

2121
sql "drop table if exists state_type_dup_hll"
@@ -54,7 +54,7 @@ suite("test_state_types_only_in_aggregate_table", "nonConcurrent") {
5454
distributed by hash(k) buckets 1
5555
properties("replication_num" = "1")
5656
"""
57-
exception "type is only supported in aggregate key tables"
57+
exception "DUP_KEYS table should not specify aggregate type"
5858
}
5959

6060
sql "drop table if exists state_type_alter_dup"
@@ -91,17 +91,18 @@ suite("test_state_types_only_in_aggregate_table", "nonConcurrent") {
9191
properties("replication_num" = "1")
9292
"""
9393

94-
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
95-
sql "drop table if exists state_type_compatibility_dup"
96-
sql """
97-
create table state_type_compatibility_dup (
98-
k int,
99-
h hll not null,
100-
q quantile_state not null,
101-
a agg_state<sum(int not null)> generic
102-
) duplicate key(k)
103-
distributed by hash(k) buckets 1
104-
properties("replication_num" = "1")
105-
"""
94+
withGlobalLock("allow_non_aggregate_table_state_types") {
95+
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
96+
sql "drop table if exists state_type_compatibility_dup"
97+
sql """
98+
create table state_type_compatibility_dup (
99+
k int,
100+
h hll not null,
101+
q quantile_state not null
102+
) duplicate key(k)
103+
distributed by hash(k) buckets 1
104+
properties("replication_num" = "1")
105+
"""
106+
}
106107
}
107108
}

‎regression-test/suites/data_model_p0/unique/test_unique_hll.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_unique_table_hll", "nonConcurrent") {
18+
suite("test_unique_table_hll") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021

2122
for (def enable_mow : [true, false]) {
@@ -72,4 +73,5 @@ suite("test_unique_table_hll", "nonConcurrent") {
7273
}
7374
}
7475
}
76+
}
7577
}

‎regression-test/suites/data_model_p0/unique/test_unique_quantile_state.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_unique_table_quantile_state", "nonConcurrent") {
18+
suite("test_unique_table_quantile_state") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021

2122
for (def enable_mow : [true, false]) {
@@ -68,4 +69,5 @@ suite("test_unique_table_quantile_state", "nonConcurrent") {
6869
}
6970
}
7071
}
72+
}
7173
}

‎regression-test/suites/external_table_p0/remote_doris/test_remote_doris_unique_table_select.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("test_remote_doris_unique_table_select", "p0,external,nonConcurrent") {
18+
suite("test_remote_doris_unique_table_select", "p0,external") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021
String remote_doris_host = context.config.otherConfigs.get("extArrowFlightSqlHost")
2122
String remote_doris_arrow_port = context.config.otherConfigs.get("extArrowFlightSqlPort")
@@ -237,4 +238,5 @@ suite("test_remote_doris_unique_table_select", "p0,external,nonConcurrent") {
237238
sql """ DROP DATABASE IF EXISTS `${db_name}` """
238239
sql """ DROP CATALOG IF EXISTS `${catalog_name}` """
239240
}
241+
}
240242
}

‎regression-test/suites/mv_p0/mv_negative/dup_negative_test.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("dup_negative_mv_test", "mv_negative,nonConcurrent") {
18+
suite("dup_negative_mv_test", "mv_negative") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021

2122
// this mv rewrite would not be rewritten in RBO phase, so set TRY_IN_RBO explicitly to make case stable
@@ -154,5 +155,6 @@ suite("dup_negative_mv_test", "mv_negative,nonConcurrent") {
154155
}
155156

156157

158+
}
157159
}
158160
}

‎regression-test/suites/mv_p0/mv_negative/mor_negative_test.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("mor_negative_mv_test", "mv_negative,nonConcurrent") {
18+
suite("mor_negative_mv_test", "mv_negative") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021

2122
String db = context.config.getDbNameByFile(context.file)
@@ -158,5 +159,6 @@ suite("mor_negative_mv_test", "mv_negative,nonConcurrent") {
158159
}
159160

160161

162+
}
161163
}
162164
}

‎regression-test/suites/mv_p0/mv_negative/mow_negative_test.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
suite("mow_negative_mv_test", "mv_negative,nonConcurrent") {
18+
suite("mow_negative_mv_test", "mv_negative") {
19+
withGlobalLock("allow_non_aggregate_table_state_types") {
1920
setFeConfigTemporary([allow_non_aggregate_table_state_types: true]) {
2021

2122
String db = context.config.getDbNameByFile(context.file)
@@ -159,5 +160,6 @@ suite("mow_negative_mv_test", "mv_negative,nonConcurrent") {
159160
}
160161

161162

163+
}
162164
}
163165
}

0 commit comments

Comments
 (0)