This is an automated email from the ASF dual-hosted git repository.
morrysnow 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 d8277526697 [chore](test) remove enable_nereids_planner=false in cases
(#40984)
d8277526697 is described below
commit d827752669772530cf6470294acec177d4770378
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Fri Sep 20 10:24:20 2024 +0800
[chore](test) remove enable_nereids_planner=false in cases (#40984)
---
.../test_partial_update_seq_map_col.out | 94 --------------
.../test_partial_update_mow_with_sync_mv.groovy | 19 +--
.../test_partial_update_seq_map_col.groovy | 144 ++++++++++-----------
3 files changed, 71 insertions(+), 186 deletions(-)
diff --git
a/regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_map_col.out
b/regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_map_col.out
index 5bdfef02182..4fab559a433 100644
---
a/regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_map_col.out
+++
b/regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_seq_map_col.out
@@ -93,97 +93,3 @@
3 3 \N \N
4 4 \N \N
--- !sql1 --
-1 1 \N
-2 2 \N
-3 3 \N
-4 4 \N
-
--- !sql1 --
-1 1 20
-2 2 20
-3 3 \N
-4 4 \N
-
--- !sql1 --
-1 1 20
-2 2 20
-3 3 \N
-4 4 \N
-
--- !sql1 --
-3 3 2099-09-10T12:00:00.977174 \N
2099-09-10T12:00:00.977174
-4 4 2099-09-10T12:00:00.977174 \N
2099-09-10T12:00:00.977174
-
--- !sql2 --
-1 1
-2 2
-3 3
-4 4
-
--- !sql3 --
-1 1 999 999
-2 2 999 999
-3 3 999 999
-4 4 999 999
-
--- !sql3 --
-1 99 8888 8888
-2 99 8888 8888
-3 3 999 999
-4 4 999 999
-5 99 8888 8888
-
--- !sql4 --
-1 1 \N \N
-2 2 \N \N
-3 3 \N \N
-4 4 \N \N
-
--- !sql1 --
-1 1 \N
-2 2 \N
-3 3 \N
-4 4 \N
-
--- !sql1 --
-1 1 20
-2 2 20
-3 3 \N
-4 4 \N
-
--- !sql1 --
-1 1 20
-2 2 20
-3 3 \N
-4 4 \N
-
--- !sql1 --
-3 3 2099-09-10T12:00:00.977174 \N
2099-09-10T12:00:00.977174
-4 4 2099-09-10T12:00:00.977174 \N
2099-09-10T12:00:00.977174
-
--- !sql2 --
-1 1
-2 2
-3 3
-4 4
-
--- !sql3 --
-1 1 999 999
-2 2 999 999
-3 3 999 999
-4 4 999 999
-
--- !sql3 --
-1 99 8888 8888
-2 99 8888 8888
-3 3 999 999
-4 4 999 999
-5 99 8888 8888
-
--- !sql4 --
-1 1 \N \N
-2 2 \N \N
-3 3 \N \N
-4 4 \N \N
-
diff --git
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_mow_with_sync_mv.groovy
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_mow_with_sync_mv.groovy
index 34405843269..972542dcd34 100644
---
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_mow_with_sync_mv.groovy
+++
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_mow_with_sync_mv.groovy
@@ -72,22 +72,13 @@ suite("test_partial_update_mow_with_sync_mv") {
from test_partial_update_mow_with_sync_mv;
""")
- for (def use_nereids : [true, false]) {
- if (use_nereids) {
- sql "set enable_nereids_planner=true"
- sql "set enable_fallback_to_original_planner=false"
- } else {
- sql "set enable_nereids_planner=false"
- }
-
- sql "set enable_unique_key_partial_update=true;"
- sql "sync;"
+ sql "set enable_unique_key_partial_update=true;"
+ sql "sync;"
- test {
- sql """insert into
test_partial_update_mow_with_sync_mv(l_orderkey, l_linenumber, l_partkey,
l_suppkey, l_shipdate, l_returnflag) values
+ test {
+ sql """insert into test_partial_update_mow_with_sync_mv(l_orderkey,
l_linenumber, l_partkey, l_suppkey, l_shipdate, l_returnflag) values
(2, 3, 2, 1, '2023-10-18', 'k'); """
- exception "Can't do partial update on merge-on-write Unique table
with sync materialized view."
- }
+ exception "Can't do partial update on merge-on-write Unique table with
sync materialized view."
}
streamLoad {
diff --git
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_map_col.groovy
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_map_col.groovy
index ced58f19c99..6ebddc4fe93 100644
---
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_map_col.groovy
+++
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_map_col.groovy
@@ -16,22 +16,15 @@
// under the License.
suite("test_partial_update_seq_map_col", "p0") {
- for (def use_nereids : [true, false]) {
- for (def use_row_store : [false, true]) {
- logger.info("current params: use_nereids: ${use_nereids},
use_row_store: ${use_row_store}")
- if (use_nereids) {
- sql """ set enable_nereids_planner=true; """
- sql """ set enable_fallback_to_original_planner=false; """
- } else {
- sql """ set enable_nereids_planner = false; """
- }
- sql "set enable_insert_strict=false;"
- sql "set enable_unique_key_partial_update=true;"
- sql "sync;"
+ for (def use_row_store : [false, true]) {
+ logger.info("current params: use_row_store: ${use_row_store}")
+ sql "set enable_insert_strict=false;"
+ sql "set enable_unique_key_partial_update=true;"
+ sql "sync;"
- def tableName = "test_partial_update_seq_map_col1"
- sql """ DROP TABLE IF EXISTS ${tableName} """
- sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
+ def tableName = "test_partial_update_seq_map_col1"
+ sql """ DROP TABLE IF EXISTS ${tableName} """
+ sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
`k` BIGINT NOT NULL,
`c1` int,
`c2` datetime(6) null default current_timestamp(6),
@@ -45,35 +38,31 @@ suite("test_partial_update_seq_map_col", "p0") {
"replication_allocation" = "tag.location.default: 1",
"enable_unique_key_merge_on_write" = "true",
"function_column.sequence_col" = "c2",
- "store_row_column" = "${use_row_store}"); """
- sql "insert into ${tableName}(k,c1) values(1,1);"
- sql "insert into ${tableName}(k,c1) values(2,2);"
- sql "insert into ${tableName}(k,c1) values(3,3);"
- sql "insert into ${tableName}(k,c1) values(4,4);"
- order_qt_sql1 "select k,c1,c3 from ${tableName} where
c2=__DORIS_SEQUENCE_COL__;"
- // update column which is not sequence map col
- if (use_nereids) {
- explain {
- sql "update ${tableName} set c3=20 where c1<=2;"
- contains "IS_PARTIAL_UPDATE: false"
- }
- }
+ "store_row_column" = "${use_row_store}"); """
+ sql "insert into ${tableName}(k,c1) values(1,1);"
+ sql "insert into ${tableName}(k,c1) values(2,2);"
+ sql "insert into ${tableName}(k,c1) values(3,3);"
+ sql "insert into ${tableName}(k,c1) values(4,4);"
+ order_qt_sql1 "select k,c1,c3 from ${tableName} where
c2=__DORIS_SEQUENCE_COL__;"
+ // update column which is not sequence map col
+ explain {
sql "update ${tableName} set c3=20 where c1<=2;"
- order_qt_sql1 "select k,c1,c3 from ${tableName} where
c2=__DORIS_SEQUENCE_COL__;"
- // update sequence map col
- if (use_nereids) {
- explain {
- sql "update ${tableName} set c2='2099-09-10
12:00:00.977174' where k>2;"
- contains "IS_PARTIAL_UPDATE: false"
- }
- }
+ contains "IS_PARTIAL_UPDATE: false"
+ }
+ sql "update ${tableName} set c3=20 where c1<=2;"
+ order_qt_sql1 "select k,c1,c3 from ${tableName} where
c2=__DORIS_SEQUENCE_COL__;"
+ // update sequence map col
+ explain {
sql "update ${tableName} set c2='2099-09-10 12:00:00.977174' where
k>2;"
- order_qt_sql1 "select k,c1,c3 from ${tableName} where
c2=__DORIS_SEQUENCE_COL__;"
- order_qt_sql1 "select k,c1,c2,c3,__DORIS_SEQUENCE_COL__ from
${tableName} where c1>2;"
+ contains "IS_PARTIAL_UPDATE: false"
+ }
+ sql "update ${tableName} set c2='2099-09-10 12:00:00.977174' where
k>2;"
+ order_qt_sql1 "select k,c1,c3 from ${tableName} where
c2=__DORIS_SEQUENCE_COL__;"
+ order_qt_sql1 "select k,c1,c2,c3,__DORIS_SEQUENCE_COL__ from
${tableName} where c1>2;"
- tableName = "test_partial_update_seq_map_col2"
- sql """ DROP TABLE IF EXISTS ${tableName} """
- sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
+ tableName = "test_partial_update_seq_map_col2"
+ sql """ DROP TABLE IF EXISTS ${tableName} """
+ sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
`k` BIGINT NOT NULL,
`c1` int,
`c2` datetime not null default current_timestamp,
@@ -83,17 +72,17 @@ suite("test_partial_update_seq_map_col", "p0") {
"replication_allocation" = "tag.location.default: 1",
"enable_unique_key_merge_on_write" = "true",
"function_column.sequence_col" = "c2",
- "store_row_column" = "${use_row_store}"); """
- sql "insert into ${tableName}(k,c1) values(1,1);"
- sql "insert into ${tableName}(k,c1) values(2,2);"
- sql "insert into ${tableName}(k,c1) values(3,3);"
- sql "insert into ${tableName}(k,c1) values(4,4);"
- order_qt_sql2 "select k,c1 from ${tableName} where
c2=__DORIS_SEQUENCE_COL__;"
+ "store_row_column" = "${use_row_store}"); """
+ sql "insert into ${tableName}(k,c1) values(1,1);"
+ sql "insert into ${tableName}(k,c1) values(2,2);"
+ sql "insert into ${tableName}(k,c1) values(3,3);"
+ sql "insert into ${tableName}(k,c1) values(4,4);"
+ order_qt_sql2 "select k,c1 from ${tableName} where
c2=__DORIS_SEQUENCE_COL__;"
- tableName = "test_partial_update_seq_map_col3"
- sql """ DROP TABLE IF EXISTS ${tableName} """
- sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
+ tableName = "test_partial_update_seq_map_col3"
+ sql """ DROP TABLE IF EXISTS ${tableName} """
+ sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
`k` BIGINT NOT NULL,
`c1` int,
`c2` int not null default "999",
@@ -103,22 +92,22 @@ suite("test_partial_update_seq_map_col", "p0") {
"replication_allocation" = "tag.location.default: 1",
"enable_unique_key_merge_on_write" = "true",
"function_column.sequence_col" = "c2",
- "store_row_column" = "${use_row_store}"); """
- sql "insert into ${tableName}(k,c1) values(1,1);"
- sql "insert into ${tableName}(k,c1) values(2,2);"
- sql "insert into ${tableName}(k,c1) values(3,3);"
- sql "insert into ${tableName}(k,c1) values(4,4);"
- order_qt_sql3 "select k,c1,c2,__DORIS_SEQUENCE_COL__ from
${tableName};"
- sql "insert into ${tableName}(k,c1,c2) values(1,99,8888);"
- sql "insert into ${tableName}(k,c1,c2) values(2,99,8888);"
- sql "insert into ${tableName}(k,c1,c2) values(4,99,77);"
- sql "insert into ${tableName}(k,c1,c2) values(5,99,8888);"
- order_qt_sql3 "select k,c1,c2,__DORIS_SEQUENCE_COL__ from
${tableName}"
+ "store_row_column" = "${use_row_store}"); """
+ sql "insert into ${tableName}(k,c1) values(1,1);"
+ sql "insert into ${tableName}(k,c1) values(2,2);"
+ sql "insert into ${tableName}(k,c1) values(3,3);"
+ sql "insert into ${tableName}(k,c1) values(4,4);"
+ order_qt_sql3 "select k,c1,c2,__DORIS_SEQUENCE_COL__ from
${tableName};"
+ sql "insert into ${tableName}(k,c1,c2) values(1,99,8888);"
+ sql "insert into ${tableName}(k,c1,c2) values(2,99,8888);"
+ sql "insert into ${tableName}(k,c1,c2) values(4,99,77);"
+ sql "insert into ${tableName}(k,c1,c2) values(5,99,8888);"
+ order_qt_sql3 "select k,c1,c2,__DORIS_SEQUENCE_COL__ from ${tableName}"
- tableName = "test_partial_update_seq_map_col4"
- sql """ DROP TABLE IF EXISTS ${tableName} """
- sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
+ tableName = "test_partial_update_seq_map_col4"
+ sql """ DROP TABLE IF EXISTS ${tableName} """
+ sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
`k` BIGINT NOT NULL,
`c1` int,
`c2` int null,
@@ -128,17 +117,17 @@ suite("test_partial_update_seq_map_col", "p0") {
"replication_allocation" = "tag.location.default: 1",
"enable_unique_key_merge_on_write" = "true",
"function_column.sequence_col" = "c2",
- "store_row_column" = "${use_row_store}"); """
- sql "insert into ${tableName}(k,c1) values(1,1);"
- sql "insert into ${tableName}(k,c1) values(2,2);"
- sql "insert into ${tableName}(k,c1) values(3,3);"
- sql "insert into ${tableName}(k,c1) values(4,4);"
- order_qt_sql4 "select k,c1,c2,__DORIS_SEQUENCE_COL__ from
${tableName};"
+ "store_row_column" = "${use_row_store}"); """
+ sql "insert into ${tableName}(k,c1) values(1,1);"
+ sql "insert into ${tableName}(k,c1) values(2,2);"
+ sql "insert into ${tableName}(k,c1) values(3,3);"
+ sql "insert into ${tableName}(k,c1) values(4,4);"
+ order_qt_sql4 "select k,c1,c2,__DORIS_SEQUENCE_COL__ from
${tableName};"
- tableName = "test_partial_update_seq_map_col5"
- sql """ DROP TABLE IF EXISTS ${tableName} """
- sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
+ tableName = "test_partial_update_seq_map_col5"
+ sql """ DROP TABLE IF EXISTS ${tableName} """
+ sql """ CREATE TABLE IF NOT EXISTS ${tableName} (
`k` BIGINT NOT NULL,
`c1` int,
`c2` int not null
@@ -148,11 +137,10 @@ suite("test_partial_update_seq_map_col", "p0") {
"replication_allocation" = "tag.location.default: 1",
"enable_unique_key_merge_on_write" = "true",
"function_column.sequence_col" = "c2",
- "store_row_column" = "${use_row_store}"); """
- test {
- sql "insert into ${tableName}(k,c1) values(1,1);"
- exception "the unmentioned column `c2` should have default
value or be nullable for newly inserted rows in non-strict mode partial update"
- }
+ "store_row_column" = "${use_row_store}"); """
+ test {
+ sql "insert into ${tableName}(k,c1) values(1,1);"
+ exception "the unmentioned column `c2` should have default value
or be nullable for newly inserted rows in non-strict mode partial update"
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
