This is an automated email from the ASF dual-hosted git repository.
eldenmoon 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 a98edde5763 [fix](case) fix unstable case (#58499)
a98edde5763 is described below
commit a98edde576399412bd4d3e261ee3d7ea2d401c05
Author: Sun Chenyang <[email protected]>
AuthorDate: Tue Dec 2 18:05:18 2025 +0800
[fix](case) fix unstable case (#58499)
---
.../compaction/compaction_sparse_column.out | 32 +++++++++++-----------
.../compaction/test_compaction_extract_root.out | 6 ++--
.../compaction/compaction_sparse_column.groovy | 14 +++++-----
.../compaction/test_compaction_extract_root.groovy | 14 +++++-----
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git
a/regression-test/data/variant_p1/compaction/compaction_sparse_column.out
b/regression-test/data/variant_p1/compaction/compaction_sparse_column.out
index 014f134741a..b060cb9f57c 100644
--- a/regression-test/data/variant_p1/compaction/compaction_sparse_column.out
+++ b/regression-test/data/variant_p1/compaction/compaction_sparse_column.out
@@ -1,21 +1,21 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !select_b_bfcompact --
-12286
+12292
-- !select_xxxx_bfcompact --
-12285
+12291
-- !select_point_bfcompact --
3
-- !select_1_bfcompact --
-4094
+4096
-- !select_2_bfcompact --
-4094
+4096
-- !select_3_bfcompact --
-4094
+4096
-- !select_4_bfcompact --
1
@@ -36,34 +36,34 @@
1
-- !select_4_1_bfcompact --
-4094
+4096
-- !select_5_1_bfcompact --
-4094
+4096
-- !select_6_1_bfcompact --
-4094
+4096
-- !select_all_bfcompact --
3 1234 \N ddddd 1 \N
-- !select_b --
-12286
+12292
-- !select_xxxx --
-12285
+12291
-- !select_point --
3
-- !select_1 --
-4094
+4096
-- !select_2 --
-4094
+4096
-- !select_3 --
-4094
+4096
-- !select_4 --
1
@@ -84,13 +84,13 @@
1
-- !select_4_1 --
-4094
+4096
-- !select_5_1 --
-4094
+4096
-- !select_6_1 --
-4094
+4096
-- !select_all --
3 1234 \N ddddd 1 \N
diff --git
a/regression-test/data/variant_p1/compaction/test_compaction_extract_root.out
b/regression-test/data/variant_p1/compaction/test_compaction_extract_root.out
index 9ad5a7a3be7..7b881949167 100644
---
a/regression-test/data/variant_p1/compaction/test_compaction_extract_root.out
+++
b/regression-test/data/variant_p1/compaction/test_compaction_extract_root.out
@@ -1,15 +1,15 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !select_b_2 --
-12282
+12288
-- !select_1_bfcompact --
{"code":2,"state":"open"}
-- !select_b_3 --
-24569
+12291
-- !select_b_4 --
-12282
+12288
-- !select_1 --
{"code":2,"state":"open"}
diff --git
a/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
b/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
index e6fffa25b41..0e59421aaa1 100644
---
a/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
+++
b/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
@@ -112,34 +112,34 @@ suite("test_compaction_sparse_column", "p1") {
// b is sparse
// a is dense
- sql """insert into ${tableName} select 0, '{"a": 11245, "b" : 42000}'
as json_str
- union all select 0, '{"a": 1123}' as json_str union all select 0,
'{"a" : 1234, "xxxx" : "aaaaa"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
+ sql """insert into test_compaction select 0, '{"a": 11245, "b" :
42000}' as json_str
+ union all select 0, '{"a": 1123}' as json_str union all (select
0, '{"a" : 1234, "xxxx" : "aaaaa"}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
// b is sparse
// a, xxxx is dense
sql """insert into ${tableName} select 1, '{"a": 11245, "b" : 42001}'
as json_str
- union all select 1, '{"a": 1123}' as json_str union all select 1,
'{"a" : 1234, "xxxx" : "bbbbb"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
+ union all select 1, '{"a": 1123}' as json_str union all (select
1, '{"a" : 1234, "xxxx" : "bbbbb"}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
// b is sparse
// xxxx is dense
sql """insert into ${tableName} select 2, '{"a": 11245, "b" : 42002}'
as json_str
- union all select 2, '{"a": 1123}' as json_str union all select 2,
'{"a" : 1234, "xxxx" : "ccccc"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
+ union all select 2, '{"a": 1123}' as json_str union all (select
2, '{"a" : 1234, "xxxx" : "ccccc"}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
// point, xxxx is sparse
// a, b is dense
sql """insert into ${tableName} select 3, '{"a" : 1234, "point" : 1,
"xxxx" : "ddddd"}' as json_str
- union all select 3, '{"a": 1123}' as json_str union all select 3,
'{"a": 11245, "b" : 42003}' as json_str from numbers("number" = "4096") limit
4096 ;"""
+ union all select 3, '{"a": 1123}' as json_str union all (select
3, '{"a": 11245, "b" : 42003}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
// xxxx, eeeee is sparse
// a, b is dense
sql """insert into ${tableName} select 4, '{"a" : 1234, "xxxx" :
"eeeee", "point" : 5}' as json_str
- union all select 4, '{"a": 1123}' as json_str union all select 4,
'{"a": 11245, "b" : 42004}' as json_str from numbers("number" = "4096") limit
4096 ;"""
+ union all select 4, '{"a": 1123}' as json_str union all (select
4, '{"a": 11245, "b" : 42004}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
// xxxx, point is sparse
// a, b is dense
sql """insert into ${tableName} select 5, '{"a" : 1234, "xxxx" :
"fffff", "point" : 42000}' as json_str
- union all select 5, '{"a": 1123}' as json_str union all select 5,
'{"a": 11245, "b" : 42005}' as json_str from numbers("number" = "4096") limit
4096 ;"""
+ union all select 5, '{"a": 1123}' as json_str union all (select
5, '{"a": 11245, "b" : 42005}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
sql """insert into ${tableName} values (6, '{"b" : "789"}')"""
diff --git
a/regression-test/suites/variant_p1/compaction/test_compaction_extract_root.groovy
b/regression-test/suites/variant_p1/compaction/test_compaction_extract_root.groovy
index ab042122a90..6b71dc6abdb 100644
---
a/regression-test/suites/variant_p1/compaction/test_compaction_extract_root.groovy
+++
b/regression-test/suites/variant_p1/compaction/test_compaction_extract_root.groovy
@@ -34,27 +34,27 @@ suite("test_compaction_extract_root", "p1") {
"""
sql """insert into ${tableName} select 0, '{"a": 11245, "b" : {"state" :
"open", "code" : 2}}' as json_str
- union all select 8, '{"a": 1123}' as json_str union all select 0,
'{"a" : 1234, "xxxx" : "aaaaa"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
+ union all select 8, '{"a": 1123}' as json_str union all (select 0,
'{"a" : 1234, "xxxx" : "aaaaa"}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
sql """insert into ${tableName} select 1, '{"a": 11245, "b" : {"state" :
"colse", "code" : 2}}' as json_str
- union all select 1, '{"a": 1123}' as json_str union all select 1,
'{"a" : 1234, "xxxx" : "bbbbb"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
+ union all select 1, '{"a": 1123}' as json_str union all (select 1,
'{"a" : 1234, "xxxx" : "bbbbb"}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
sql """insert into ${tableName} select 2, '{"a": 11245, "b" : {"state" :
"flat", "code" : 3}}' as json_str
- union all select 2, '{"a": 1123}' as json_str union all select 2,
'{"a" : 1234, "xxxx" : "ccccc"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
+ union all select 2, '{"a": 1123}' as json_str union all (select 2,
'{"a" : 1234, "xxxx" : "ccccc"}' as json_str from numbers("number" = "4096")
limit 4096) ;"""
sql """insert into ${tableName} select 3, '{"a" : 1234, "xxxx" : 4,
"point" : 5}' as json_str
- union all select 3, '{"a": 1123}' as json_str union all select 3,
'{"a": 11245, "b" : 42003}' as json_str from numbers("number" = "4096") limit
4096 ;"""
+ union all select 3, '{"a": 1123}' as json_str union all (select 3,
'{"a": 11245, "b" : 42003}' as json_str from numbers("number" = "4096") limit
4096) ;"""
sql """insert into ${tableName} select 4, '{"a" : 1234, "xxxx" : "eeeee",
"point" : 5}' as json_str
- union all select 4, '{"a": 1123}' as json_str union all select 4,
'{"a": 11245, "b" : 42004}' as json_str from numbers("number" = "4096") limit
4096 ;"""
+ union all select 4, '{"a": 1123}' as json_str union all (select 4,
'{"a": 11245, "b" : 42004}' as json_str from numbers("number" = "4096") limit
4096) ;"""
sql """insert into ${tableName} select 5, '{"a" : 1234, "xxxx" : "fffff",
"point" : 42000}' as json_str
- union all select 5, '{"a": 1123}' as json_str union all select 5,
'{"a": 11245, "b" : 42005}' as json_str from numbers("number" = "4096") limit
4096 ;"""
+ union all select 5, '{"a": 1123}' as json_str union all (select 5,
'{"a": 11245, "b" : 42005}' as json_str from numbers("number" = "4096") limit
4096) ;"""
// // fix cast to string tobe {}
// qt_select_b_1 """ SELECT count(cast(v['b'] as string)) FROM test_t
where cast(v['b'] as string) != '{}' """
@@ -71,7 +71,7 @@ suite("test_compaction_extract_root", "p1") {
trigger_and_wait_compaction(tableName, "cumulative")
// fix cast to string tobe {}
- qt_select_b_3 """ SELECT count(cast(v['b'] as string)) FROM test_t"""
+ qt_select_b_3 """ SELECT count(cast(v['b'] as string)) FROM test_t where
cast(v['b'] as string) != '{}' """
qt_select_b_4 """ SELECT count(cast(v['b'] as int)) FROM test_t"""
// TODO, sparse columns with v['b'] will not be merged in
hierachical_data_reader with sparse columns
// qt_select_b_5 """ select v['b'] from test_t where cast(v['b'] as
string) != '42005' and cast(v['b'] as string) != '42004' and cast(v['b'] as
string) != '42003' order by cast(v['b'] as string); """
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
