This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch variant-sparse
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/variant-sparse by this push:
new a2795327ccf fix some cases (#46202)
a2795327ccf is described below
commit a2795327ccf5334b1630474c61ad8a3b2fcc244d
Author: lihangyu <lihan...@selectdb.com>
AuthorDate: Tue Dec 31 16:25:03 2024 +0800
fix some cases (#46202)
---
be/src/vec/columns/column_object.cpp | 7 +------
.../data/variant_github_events_p2/load.out | 16 +++-------------
.../data/variant_p0/schema_change/schema_change.out | 7 +++++++
.../test_double_write_when_schema_change.out | 20 ++++++++++----------
.../data/variant_p0/test_sub_path_pruning.out | 10 +++++-----
.../compaction/test_compaction_extract_root.out | 3 ---
.../suites/variant_github_events_p2/load.groovy | 4 ++--
.../variant_p0/compaction/test_compaction.groovy | 2 +-
.../variant_p0/schema_change/schema_change.groovy | 2 +-
.../schema_change/test_alter_add_drop_column.groovy | 2 +-
.../test_double_write_when_schema_change.groovy | 2 +-
.../compaction/compaction_sparse_column.groovy | 6 +++---
.../compaction/test_compaction_extract_root.groovy | 2 +-
regression-test/suites/variant_p2/load.groovy | 18 ++++++++++--------
14 files changed, 46 insertions(+), 55 deletions(-)
diff --git a/be/src/vec/columns/column_object.cpp
b/be/src/vec/columns/column_object.cpp
index 427515d1b6e..d6d5b5c44cc 100644
--- a/be/src/vec/columns/column_object.cpp
+++ b/be/src/vec/columns/column_object.cpp
@@ -352,7 +352,7 @@ void get_field_info(const Field& field, FieldInfo* info) {
}
#ifdef NDEBUG
-#define ENABLE_CHECK_CONSISTENCY (void)/* Nothing */
+#define ENABLE_CHECK_CONSISTENCY (void) /* Nothing */
#else
#define ENABLE_CHECK_CONSISTENCY(this) (this)->check_consistency()
#endif
@@ -1912,11 +1912,6 @@ Status ColumnObject::finalize(FinalizeMode mode) {
// finalize all subcolumns
for (auto&& entry : subcolumns) {
const auto& least_common_type = entry->data.get_least_common_type();
- /// Do not add subcolumns, which consists only from NULLs
- if
(is_nothing(remove_nullable(get_base_type_of_array(least_common_type)))) {
- continue;
- }
-
// unnest all nested columns, add them to new_subcolumns
if (mode == FinalizeMode::WRITE_MODE &&
least_common_type->equals(*ColumnObject::NESTED_TYPE)) {
diff --git a/regression-test/data/variant_github_events_p2/load.out
b/regression-test/data/variant_github_events_p2/load.out
index 4bee99a71a9..d3ea4ea4159 100644
--- a/regression-test/data/variant_github_events_p2/load.out
+++ b/regression-test/data/variant_github_events_p2/load.out
@@ -6,18 +6,8 @@
4748
-- !sql --
-864
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/4381756?","gravatar_id":"","id":4381756,"login":"qw5414","url":"https://api.github.com/users/qw5414"},"created_at":"2015-01-01T02:06:41Z","id":"2489420466","org":{"avatar_url":"https://avatars.githubusercontent.com/u/1429259?","gravatar_id":"","id":1429259,"login":"xpressengine","url":"https://api.github.com/orgs/xpressengine"},"payload":{"action":"created","comment":{"body":"乃\\r\\n","created_at":"2015-01-01T02:06:40Z";,
[...]
-4842
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/53764?","gravatar_id":"","id":53764,"login":"bnu","url":"https://api.github.com/users/bnu"},"created_at":"2015-01-01T03:47:41Z","id":"2489448854","org":{"avatar_url":"https://avatars.githubusercontent.com/u/1429259?","gravatar_id":"","id":1429259,"login":"xpressengine","url":"https://api.github.com/orgs/xpressengine"},"payload":{"action":"created","comment":{"body":"@misol
고르기가 어렵네요.\\r\\nplup가 좋은데 GPL이네요^^;","created_a [...]
+864
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/4381756?","gravatar_id":"","id":4381756,"login":"qw5414","url":"https://api.github.com/users/qw5414"},"created_at":"2015-01-01T02:06:41Z","id":"2489420466","org":{"avatar_url":"https://avatars.githubusercontent.com/u/1429259?","gravatar_id":"","id":1429259,"login":"xpressengine","url":"https://api.github.com/orgs/xpressengine"},"payload":{"action":"created","comment":{"body":"乃\r\n","created_at":"2015-01-01T02:06:40Z","h
[...]
+4842
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/53764?","gravatar_id":"","id":53764,"login":"bnu","url":"https://api.github.com/users/bnu"},"created_at":"2015-01-01T03:47:41Z","id":"2489448854","org":{"avatar_url":"https://avatars.githubusercontent.com/u/1429259?","gravatar_id":"","id":1429259,"login":"xpressengine","url":"https://api.github.com/orgs/xpressengine"},"payload":{"action":"created","comment":{"body":"@misol
고르기가 어렵네요.\r\nplup가 좋은데 GPL이네요^^;","created_at" [...]
5451
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/3437916?","gravatar_id":"","id":3437916,"login":"misol","url":"https://api.github.com/users/misol"},"created_at":"2015-01-01T02:48:28Z","id":"2489433218","org":{"avatar_url":"https://avatars.githubusercontent.com/u/1429259?","gravatar_id":"","id":1429259,"login":"xpressengine","url":"https://api.github.com/orgs/xpressengine"},"payload":{"action":"created","comment":{"body":"Html5
도 같이 지원하는 업로더였으면 좋겠어요! 구글링 해보면 꽤 나와요 :)" [...]
-5995
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/3437916?","gravatar_id":"","id":3437916,"login":"misol","url":"https://api.github.com/users/misol"},"created_at":"2015-01-01T01:47:44Z","id":"2489414108","org":{"avatar_url":"https://avatars.githubusercontent.com/u/1429259?","gravatar_id":"","id":1429259,"login":"xpressengine","url":"https://api.github.com/orgs/xpressengine"},"payload":{"action":"opened","number":1120,"pull_request":{"_links":{"comments":{"href":"https:
[...]
-
--- !sql --
-\N
-\N
-\N
-\N
-4748
-
--- !sql --
-135
+5995
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/3437916?","gravatar_id":"","id":3437916,"login":"misol","url":"https://api.github.com/users/misol"},"created_at":"2015-01-01T01:47:44Z","id":"2489414108","org":{"avatar_url":"https://avatars.githubusercontent.com/u/1429259?","gravatar_id":"","id":1429259,"login":"xpressengine","url":"https://api.github.com/orgs/xpressengine"},"payload":{"action":"opened","number":1120,"pull_request":{"_links":{"comments":{"href":"https:
[...]
diff --git a/regression-test/data/variant_p0/schema_change/schema_change.out
b/regression-test/data/variant_p0/schema_change/schema_change.out
index 4956e8311b0..bc091936de9 100644
--- a/regression-test/data/variant_p0/schema_change/schema_change.out
+++ b/regression-test/data/variant_p0/schema_change/schema_change.out
@@ -71,3 +71,10 @@
1 hello world
1 hello world
+-- !sql --
+4095 {"k1":1,"k2":"hello world","k3":[1234],"k4":1.1,"k5":[[123]]}
+4095 {"k1":1,"k2":"hello world","k3":[1234],"k4":1.1,"k5":[[123]]}
+4095 {"k1":1,"k2":"hello world","k3":[1234],"k4":1.1,"k5":[[123]]}
+4095 {"k1":1,"k2":"hello world","k3":[1234],"k4":1.1,"k5":[[123]]}
+4095 {"k1":1,"k2":"hello world","k3":[1234],"k4":1.1,"k5":[[123]]}
+
diff --git
a/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
b/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
index 2d8418a555a..f646f83bb03 100644
---
a/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
+++
b/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
@@ -24,14 +24,14 @@ CreateEvent 2489368089 2015-01-01T00:00:01Z
PullRequestEvent 2489395770 2015-01-01T01:00:02Z
-- !sql --
-2
[{"author":{"email":"5f33e8ddd36b0c849687df732835b9abbe9b3...@twistedmatrix.com","name":"Christopher
Armstrong"},"distinct":1,"message":"put the auto-generated API docs in the
repository so readthedocs will
work.\\nsigh.","sha":"defdbe78db98ad69d72f42b09194309f47616592","url":"https://api.github.com/repos/radix/effect/commits/defdbe78db98ad69d72f42b09194309f47616592"}]
-2
[{"author":{"email":"61dcbbf08c9f7aaa2b1d0a9ce0b90608a8398...@ucr.edu","name":"Jamal
Moon"},"distinct":1,"message":"Can be run from outside of bin. Fixed
multi-line
issue","sha":"56688cc528224d40679b7e83c105b27367443a8c","url":"https://api.github.com/repos/jmoon018/rshell-unit-tester/commits/56688cc528224d40679b7e83c105b27367443a8c"}]
-2
[{"author":{"email":"f9bad8375b9564f6e0f50984c0171ad9df9a0...@gmail.com","name":"Earnestly"},"distinct":1,"message":"Change
the PFM family to monospace from
serif.","sha":"f38a055078e5e19a19f9e58ac975c7e815d09a24","url":"https://api.github.com/repos/Earnestly/fncp6/commits/f38a055078e5e19a19f9e58ac975c7e815d09a24"}]
-3
[{"author":{"email":"efaae62f337a1f70859f6f43996fca5b241e0...@jiubao.org","name":"Kubo
Takehiro"},"distinct":1,"message":"Use SSE4.2 to calculate
crc32c.","sha":"a9df8f52df7bea62a9ddbd2779a22755aa7d2258","url":"https://api.github.com/repos/kubo/snzip/commits/a9df8f52df7bea62a9ddbd2779a22755aa7d2258"}]
-4
[{"author":{"email":"291c18f3fb7528c712d9098b0e50a515ea0b9...@cloudera.com","name":"Sean
Owen"},"distinct":1,"message":"SPARK-2757 [BUILD] [STREAMING] Add Mima test
for Spark Sink after 1.10 is released\\n\\nRe-enable MiMa for Streaming Flume
Sink module, now that 1.1.0 is released, per the JIRA TO-DO. That's pretty much
all there is to this.\\n\\nAuthor: Sean Owen <so...@cloudera.com>\\n\\nCloses
#3842 from srowen/SPARK-2757 and squashes the following commits:\\n\\n50ff80e
[Sean Owen] [...]
-4
[{"author":{"email":"9ec2b9d5f2203d75c2b0f7885bd663d9d57a2...@squareup.com","name":"Jake
Wharton"},"distinct":0,"message":"Remove unused
method.","sha":"ec572201658b566373845657a8aca7bc6d6214a4","url":"https://api.github.com/repos/square/okhttp/commits/ec572201658b566373845657a8aca7bc6d6214a4"},
{"author":{"email":"a5c95b3d7cb4d0ae05a15c79c79ab458dc2c8...@swank.ca","name":"Jesse
Wilson"},"distinct":0,"message":"Merge pull request #1262 from
square/jw/unused\\n\\nRemove unused method.", [...]
-4
[{"author":{"email":"bd02fa4a4ee63436bd157864cccdf8b3a0265...@appnexus.com","name":"Oliver
Gupte"},"distinct":1,"message":"updated
manifests","sha":"216d05c696eac3fa606289c7f1934f965ffa8f5b","url":"https://api.github.com/repos/ogupte/trope/commits/216d05c696eac3fa606289c7f1934f965ffa8f5b"}]
-5
[{"author":{"email":"0b727f1f5f209fb32b7d5f0f03dfd6734cdab...@gmail.com","name":"Mohit"},"distinct":1,"message":"init","sha":"97a402b54bfd562b8cefd11f1361cd5af41b0535","url":"https://api.github.com/repos/git4ruby/movie_review1/commits/97a402b54bfd562b8cefd11f1361cd5af41b0535"}]
-6
[{"author":{"email":"50f3f01caa053693ce619d596e14b0ff3901a...@twistedlogik.net","name":"Cole
Campbell"},"distinct":0,"message":"Update
README.md","sha":"fe5a3431a486388f6011fa8db52fba8a53f9aa70","url":"https://api.github.com/repos/tlgkccampbell/ultraviolet/commits/fe5a3431a486388f6011fa8db52fba8a53f9aa70"},
{"author":{"email":"50f3f01caa053693ce619d596e14b0ff3901a...@twistedlogik.net","name":"Cole
Campbell"},"distinct":0,"message":"Added missing update scripts for sample
dependencies", [...]
-6
[{"author":{"email":"821f468726cd384db724fde38ddabae6642cf...@gmail.com","name":"Uygun
BODUR"},"distinct":1,"message":".","sha":"0fb2391e7aabeb57f358d5d51c70c766e6fa00d1","url":"https://api.github.com/repos/uygunuks/AsalSayiKalibi/commits/0fb2391e7aabeb57f358d5d51c70c766e6fa00d1"}]
+2
[{"sha":"56688cc528224d40679b7e83c105b27367443a8c","author":{"email":"61dcbbf08c9f7aaa2b1d0a9ce0b90608a8398...@ucr.edu","name":"Jamal
Moon"},"message":"Can be run from outside of bin. Fixed multi-line
issue","distinct":true,"url":"https://api.github.com/repos/jmoon018/rshell-unit-tester/commits/56688cc528224d40679b7e83c105b27367443a8c"}]
+2
[{"sha":"defdbe78db98ad69d72f42b09194309f47616592","author":{"email":"5f33e8ddd36b0c849687df732835b9abbe9b3...@twistedmatrix.com","name":"Christopher
Armstrong"},"message":"put the auto-generated API docs in the repository so
readthedocs will
work.\\nsigh.","distinct":true,"url":"https://api.github.com/repos/radix/effect/commits/defdbe78db98ad69d72f42b09194309f47616592"}]
+2
[{"sha":"f38a055078e5e19a19f9e58ac975c7e815d09a24","author":{"email":"f9bad8375b9564f6e0f50984c0171ad9df9a0...@gmail.com","name":"Earnestly"},"message":"Change
the PFM family to monospace from
serif.","distinct":true,"url":"https://api.github.com/repos/Earnestly/fncp6/commits/f38a055078e5e19a19f9e58ac975c7e815d09a24"}]
+3
[{"sha":"a9df8f52df7bea62a9ddbd2779a22755aa7d2258","author":{"email":"efaae62f337a1f70859f6f43996fca5b241e0...@jiubao.org","name":"Kubo
Takehiro"},"message":"Use SSE4.2 to calculate
crc32c.","distinct":true,"url":"https://api.github.com/repos/kubo/snzip/commits/a9df8f52df7bea62a9ddbd2779a22755aa7d2258"}]
+4
[{"sha":"216d05c696eac3fa606289c7f1934f965ffa8f5b","author":{"email":"bd02fa4a4ee63436bd157864cccdf8b3a0265...@appnexus.com","name":"Oliver
Gupte"},"message":"updated
manifests","distinct":true,"url":"https://api.github.com/repos/ogupte/trope/commits/216d05c696eac3fa606289c7f1934f965ffa8f5b"}]
+4
[{"sha":"4bb12488d56ea651c56d9688996b464b99095582","author":{"email":"291c18f3fb7528c712d9098b0e50a515ea0b9...@cloudera.com","name":"Sean
Owen"},"message":"SPARK-2757 [BUILD] [STREAMING] Add Mima test for Spark Sink
after 1.10 is released\\n\\nRe-enable MiMa for Streaming Flume Sink module, now
that 1.1.0 is released, per the JIRA TO-DO. That's pretty much all there is to
this.\\n\\nAuthor: Sean Owen <so...@cloudera.com>\\n\\nCloses #3842 from
srowen/SPARK-2757 and squashes the followi [...]
+4
[{"sha":"ec572201658b566373845657a8aca7bc6d6214a4","author":{"email":"9ec2b9d5f2203d75c2b0f7885bd663d9d57a2...@squareup.com","name":"Jake
Wharton"},"message":"Remove unused
method.","distinct":false,"url":"https://api.github.com/repos/square/okhttp/commits/ec572201658b566373845657a8aca7bc6d6214a4"},{"sha":"bfa25f05bd5786c990fccb513f56375a4f98d95b","author":{"email":"a5c95b3d7cb4d0ae05a15c79c79ab458dc2c8...@swank.ca","name":"Jesse
Wilson"},"message":"Merge pull request #1262 from square [...]
+5
[{"sha":"97a402b54bfd562b8cefd11f1361cd5af41b0535","author":{"email":"0b727f1f5f209fb32b7d5f0f03dfd6734cdab...@gmail.com","name":"Mohit"},"message":"init","distinct":true,"url":"https://api.github.com/repos/git4ruby/movie_review1/commits/97a402b54bfd562b8cefd11f1361cd5af41b0535"}]
+6
[{"sha":"0fb2391e7aabeb57f358d5d51c70c766e6fa00d1","author":{"email":"821f468726cd384db724fde38ddabae6642cf...@gmail.com","name":"Uygun
BODUR"},"message":".","distinct":true,"url":"https://api.github.com/repos/uygunuks/AsalSayiKalibi/commits/0fb2391e7aabeb57f358d5d51c70c766e6fa00d1"}]
+6
[{"sha":"fe5a3431a486388f6011fa8db52fba8a53f9aa70","author":{"email":"50f3f01caa053693ce619d596e14b0ff3901a...@twistedlogik.net","name":"Cole
Campbell"},"message":"Update
README.md","distinct":false,"url":"https://api.github.com/repos/tlgkccampbell/ultraviolet/commits/fe5a3431a486388f6011fa8db52fba8a53f9aa70"},{"sha":"c71669b93924abc498af58855f8fe86564146673","author":{"email":"50f3f01caa053693ce619d596e14b0ff3901a...@twistedlogik.net","name":"Cole
Campbell"},"message":"Added missing u [...]
diff --git a/regression-test/data/variant_p0/test_sub_path_pruning.out
b/regression-test/data/variant_p0/test_sub_path_pruning.out
index d749c103e2a..d1089d6f4cd 100644
--- a/regression-test/data/variant_p0/test_sub_path_pruning.out
+++ b/regression-test/data/variant_p0/test_sub_path_pruning.out
@@ -51,10 +51,10 @@
1 {"c":{"d":{"e":11}}} {"c":{"d":{"e":21}},"d":{"e":22},"e":23}
-- !sql --
-1 {"c":{"d":{"e":11}}} {}
+1 {"c":{"d":{"e":11}}} \N
-- !sql --
-1 {"c":{"d":{"e":11}}} {}
+1 {"c":{"d":{"e":11}}} \N
-- !sql --
1 {"c":{"d":{"e":11}}}
@@ -114,10 +114,10 @@
1 {"c":{"d":{"e":11}}}
-- !sql --
-1 {"c":{"d":{"e":11}}} {}
+1 {"c":{"d":{"e":11}}} \N
-- !sql --
-1 {"c":{"d":{"e":11}}} {}
+1 {"c":{"d":{"e":11}}} \N
-- !sql --
1 {"b":{"c":{"d":{"e":11}}},"c":{"d":{"e":12}},"d":{"e":13},"e":14}
1 {"b":{"c":{"d":{"e":11}}},"c":{"d":{"e":12}},"d":{"e":13},"e":14}
@@ -153,7 +153,7 @@
1 {"d":{"e":11}}
-- !sql --
-1 {"d":{"e":11}} {}
+1 {"d":{"e":11}} \N
-- !sql --
1 {"d":{"e":11}} {"c":{"d":{"e":11}}}
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 c8a0cf24017..0adc70c83aa 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,7 +1,4 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
--- !select_b_1 --
-12291
-
-- !select_b_2 --
12288
diff --git a/regression-test/suites/variant_github_events_p2/load.groovy
b/regression-test/suites/variant_github_events_p2/load.groovy
index abcdfb689c1..48a3507f303 100644
--- a/regression-test/suites/variant_github_events_p2/load.groovy
+++ b/regression-test/suites/variant_github_events_p2/load.groovy
@@ -158,7 +158,7 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
)
DUPLICATE KEY(`k`)
DISTRIBUTED BY HASH(k) BUCKETS 4
- properties("replication_num" = "1", "disable_auto_compaction" =
"true", "bloom_filter_columns" = "v", "variant_enable_flatten_nested" =
"false");
+ properties("replication_num" = "1", "disable_auto_compaction" =
"true", "variant_enable_flatten_nested" = "false");
"""
// 2015
@@ -227,7 +227,7 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
)
UNIQUE KEY(`k`)
DISTRIBUTED BY HASH(k) BUCKETS 4
- properties("replication_num" = "1", "disable_auto_compaction" =
"false", "bloom_filter_columns" = "v", "variant_enable_flatten_nested" =
"true");
+ properties("replication_num" = "1", "disable_auto_compaction" =
"false", "variant_enable_flatten_nested" = "false");
"""
sql """insert into github_events2 select * from github_events order by k"""
sql """select v['payload']['commits'] from github_events order by k ;"""
diff --git
a/regression-test/suites/variant_p0/compaction/test_compaction.groovy
b/regression-test/suites/variant_p0/compaction/test_compaction.groovy
index 2499de5712d..e302f907b04 100644
--- a/regression-test/suites/variant_p0/compaction/test_compaction.groovy
+++ b/regression-test/suites/variant_p0/compaction/test_compaction.groovy
@@ -53,7 +53,7 @@ suite("test_compaction_variant") {
)
${key_type} KEY(`k`)
DISTRIBUTED BY HASH(k) BUCKETS ${buckets}
- properties("replication_num" = "1", "disable_auto_compaction"
= "false");
+ properties("replication_num" = "1", "disable_auto_compaction"
= "true");
"""
}
diff --git
a/regression-test/suites/variant_p0/schema_change/schema_change.groovy
b/regression-test/suites/variant_p0/schema_change/schema_change.groovy
index 3c35ff28100..a2dd61200f9 100644
--- a/regression-test/suites/variant_p0/schema_change/schema_change.groovy
+++ b/regression-test/suites/variant_p0/schema_change/schema_change.groovy
@@ -79,5 +79,5 @@ suite("regression_test_variant_schema_change",
"variant_type"){
sql """INSERT INTO ${table_name} SELECT k, v,v from ${table_name} limit
1111"""
// select from mv
qt_sql """select v['k1'], cast(v['k2'] as string) from ${table_name} order
by k desc limit 10"""
- qt_sql """select * from ${table_name} order by k desc limit 10"""
+ qt_sql """select k, v from ${table_name} order by k desc limit 5"""
}
\ No newline at end of file
diff --git
a/regression-test/suites/variant_p0/schema_change/test_alter_add_drop_column.groovy
b/regression-test/suites/variant_p0/schema_change/test_alter_add_drop_column.groovy
index 6a38ec2804e..ce55a62af65 100644
---
a/regression-test/suites/variant_p0/schema_change/test_alter_add_drop_column.groovy
+++
b/regression-test/suites/variant_p0/schema_change/test_alter_add_drop_column.groovy
@@ -25,7 +25,7 @@ suite("regression_test_variant_add_drop_column",
"variant_type"){
)
DUPLICATE KEY(`k`)
DISTRIBUTED BY HASH(k) BUCKETS 1
- properties("replication_num" = "1", "bloom_filter_columns" = "v");
+ properties("replication_num" = "1");
"""
sql """insert into variant_add_drop_column values (1, '{"a" : 12345,"b" :
2}')"""
diff --git
a/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
b/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
index 5c9d85fb8ed..151c6c67227 100644
---
a/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
+++
b/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
@@ -66,7 +66,7 @@ suite("double_write_schema_change_with_variant",
"nonConcurrent") {
)
DUPLICATE KEY(`k`)
DISTRIBUTED BY HASH(k) BUCKETS 2
- properties("replication_num" = "1", "disable_auto_compaction" =
"false", "variant_enable_flatten_nested" = "true");
+ properties("replication_num" = "1", "disable_auto_compaction" =
"false", "variant_enable_flatten_nested" = "false");
"""
set_be_config.call("memory_limitation_per_thread_for_schema_change_bytes",
"6294967296")
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 b3cca5910e8..82f60e594cf 100644
---
a/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
+++
b/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
@@ -146,7 +146,7 @@ suite("test_compaction_sparse_column", "p1,nonConcurrent") {
sql """insert into ${tableName} values (6, '{"b" : "789"}')"""
- qt_select_b_bfcompact """ SELECT count(cast(v['b'] as int)) FROM
${tableName};"""
+ qt_select_b_bfcompact """ SELECT count(cast(v['b'] as string)) FROM
${tableName};"""
qt_select_xxxx_bfcompact """ SELECT count(cast(v['xxxx'] as string))
FROM ${tableName};"""
qt_select_point_bfcompact """ SELECT count(cast(v['point'] as bigint))
FROM ${tableName};"""
qt_select_1_bfcompact """ SELECT count(cast(v['xxxx'] as string)) FROM
${tableName} where cast(v['xxxx'] as string) = 'aaaaa';"""
@@ -185,7 +185,7 @@ suite("test_compaction_sparse_column", "p1,nonConcurrent") {
}
*/
- qt_select_b """ SELECT count(cast(v['b'] as int)) FROM ${tableName};"""
+ qt_select_b """ SELECT count(cast(v['b'] as string)) FROM
${tableName};"""
qt_select_xxxx """ SELECT count(cast(v['xxxx'] as string)) FROM
${tableName};"""
qt_select_point """ SELECT count(cast(v['point'] as bigint)) FROM
${tableName};"""
qt_select_1 """ SELECT count(cast(v['xxxx'] as string)) FROM
${tableName} where cast(v['xxxx'] as string) = 'aaaaa';"""
@@ -215,6 +215,6 @@ suite("test_compaction_sparse_column", "p1,nonConcurrent") {
// try_sql("DROP TABLE IF EXISTS ${tableName}")
GetDebugPoint().disableDebugPointForAllBEs("variant_column_writer_impl._get_subcolumn_paths_from_stats")
set_be_config.call("write_buffer_size", "209715200")
- set_be_config.call("variant_max_subcolumns_count", "5")
+ // set_be_config.call("variant_max_subcolumns_count", "5")
}
}
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 ba6c8147060..37a2b702c3f 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
@@ -85,7 +85,7 @@ suite("test_compaction_extract_root", "p1,nonConcurrent") {
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"""
+ // qt_select_b_1 """ SELECT count(cast(v['b'] as string)) FROM test_t
where cast(v['b'] as string) != '{}' """
qt_select_b_2 """ 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_2 """ 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); """
diff --git a/regression-test/suites/variant_p2/load.groovy
b/regression-test/suites/variant_p2/load.groovy
index 91e540087ad..a737ef943bb 100644
--- a/regression-test/suites/variant_p2/load.groovy
+++ b/regression-test/suites/variant_p2/load.groovy
@@ -69,16 +69,18 @@ suite("load_p2", "variant_type,p2"){
"""
}
+ def backendId_to_backendIP = [:]
+ def backendId_to_backendHttpPort = [:]
+ getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
+
def set_be_config = { key, value ->
- String backend_id;
- def backendId_to_backendIP = [:]
- def backendId_to_backendHttpPort = [:]
- getBackendIpHttpPort(backendId_to_backendIP,
backendId_to_backendHttpPort);
-
- backend_id = backendId_to_backendIP.keySet()[0]
- def (code, out, err) =
update_be_config(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), key, value)
- logger.info("update config: code=" + code + ", out=" + out + ", err="
+ err)
+ for (String backend_id: backendId_to_backendIP.keySet()) {
+ def (code, out, err) =
update_be_config(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), key, value)
+ logger.info("update config: code=" + code + ", out=" + out + ",
err=" + err)
+ }
}
+ set_be_config.call("string_type_length_soft_limit_bytes", "104857600")
+
// Configuration for the number of threads
def numberOfThreads = 10 // Set this to your desired number of threads
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
