This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new d9172bed649 [cherry-pick](branch-2.1) Pick "[Enhancement](delete) 
Modify some delete cases to ajust enable_mow_light_delete config (#40387)" 
(#40389)
d9172bed649 is described below

commit d9172bed649a91e032c0ac57aa597786f5bec5d3
Author: abmdocrt <yukang.lian2...@gmail.com>
AuthorDate: Thu Sep 5 14:56:44 2024 +0800

    [cherry-pick](branch-2.1) Pick "[Enhancement](delete) Modify some delete 
cases to ajust enable_mow_light_delete config (#40387)" (#40389)
    
    ## Proposed changes
    
    pick #40387
    
    <!--Describe your changes.-->
---
 regression-test/suites/compaction/test_full_compaction.groovy          | 1 +
 .../suites/compaction/test_full_compaction_by_table_id.groovy          | 1 +
 .../suites/nereids_p0/delete/delete_mow_partial_update.groovy          | 3 +++
 regression-test/suites/nereids_p0/explain/test_pushdown_explain.groovy | 3 +++
 .../partial_update/test_new_partial_update_delete.groovy               | 3 +++
 .../partial_update/test_partial_update_after_delete.groovy             | 2 ++
 .../partial_update/test_partial_update_delete.groovy                   | 3 +++
 7 files changed, 16 insertions(+)

diff --git a/regression-test/suites/compaction/test_full_compaction.groovy 
b/regression-test/suites/compaction/test_full_compaction.groovy
index 10d5fc14571..0aaeff085b9 100644
--- a/regression-test/suites/compaction/test_full_compaction.groovy
+++ b/regression-test/suites/compaction/test_full_compaction.groovy
@@ -51,6 +51,7 @@ suite("test_full_compaction") {
             BUCKETS 1 
             PROPERTIES ("replication_allocation" = "tag.location.default: 1",
             "disable_auto_compaction" = "true",
+            "enable_mow_light_delete" = "false",
             "enable_unique_key_merge_on_write" = "true");"""
 
         // version1 (1,1)(2,2)
diff --git 
a/regression-test/suites/compaction/test_full_compaction_by_table_id.groovy 
b/regression-test/suites/compaction/test_full_compaction_by_table_id.groovy
index 66c9e4bbbcb..438a08be515 100644
--- a/regression-test/suites/compaction/test_full_compaction_by_table_id.groovy
+++ b/regression-test/suites/compaction/test_full_compaction_by_table_id.groovy
@@ -53,6 +53,7 @@ suite("test_full_compaction_by_table_id") {
             BUCKETS 8 
             PROPERTIES ("replication_allocation" = "tag.location.default: 1",
             "disable_auto_compaction" = "true",
+            "enable_mow_light_delete" = "false",
             "enable_unique_key_merge_on_write" = "true");"""
 
         // version1 (1,1)(2,2)
diff --git 
a/regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy 
b/regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy
index 8dd5d01243f..256881c7b31 100644
--- a/regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy
+++ b/regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy
@@ -43,6 +43,7 @@ suite('delete_mow_partial_update') {
                 PROPERTIES (
                     "enable_unique_key_merge_on_write" = "true",
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
 
@@ -55,6 +56,7 @@ suite('delete_mow_partial_update') {
                 PROPERTIES (
                     "enable_unique_key_merge_on_write" = "true",
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
 
@@ -116,6 +118,7 @@ suite('delete_mow_partial_update') {
                 PROPERTIES (
                     "enable_unique_key_merge_on_write" = "true",
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
 
diff --git 
a/regression-test/suites/nereids_p0/explain/test_pushdown_explain.groovy 
b/regression-test/suites/nereids_p0/explain/test_pushdown_explain.groovy
index f7360963e55..2dd751c9510 100644
--- a/regression-test/suites/nereids_p0/explain/test_pushdown_explain.groovy
+++ b/regression-test/suites/nereids_p0/explain/test_pushdown_explain.groovy
@@ -76,6 +76,7 @@ suite("test_pushdown_explain") {
         COMMENT 'OLAP'
         DISTRIBUTED BY HASH(`user_id`) BUCKETS 1
         PROPERTIES (
+        "enable_mow_light_delete" = "false",
         "replication_allocation" = "tag.location.default: 1",
         "disable_auto_compaction" = "true"
         );
@@ -117,6 +118,7 @@ suite("test_pushdown_explain") {
         COMMENT 'OLAP'
         DISTRIBUTED BY HASH(`user_id`) BUCKETS 1
         PROPERTIES (
+        "enable_mow_light_delete" = "false",
         "replication_allocation" = "tag.location.default: 1",
         "disable_auto_compaction" = "true"
         );
@@ -204,6 +206,7 @@ suite("test_pushdown_explain") {
         PROPERTIES (
         "replication_allocation" = "tag.location.default: 1",
         "disable_auto_compaction" = "true",
+        "enable_mow_light_delete" = "false",
         "enable_unique_key_merge_on_write" = "false"
         );
     """
diff --git 
a/regression-test/suites/unique_with_mow_p0/partial_update/test_new_partial_update_delete.groovy
 
b/regression-test/suites/unique_with_mow_p0/partial_update/test_new_partial_update_delete.groovy
index f82510914b5..2157388c0f7 100644
--- 
a/regression-test/suites/unique_with_mow_p0/partial_update/test_new_partial_update_delete.groovy
+++ 
b/regression-test/suites/unique_with_mow_p0/partial_update/test_new_partial_update_delete.groovy
@@ -65,6 +65,7 @@ suite('test_new_partial_update_delete') {
                     PROPERTIES (
                         "disable_auto_compaction" = "true",
                         "enable_unique_key_merge_on_write" = "false",
+                        "enable_mow_light_delete" = "false",
                         "replication_num" = "1",
                         "store_row_column" = "${use_row_store}"); """
                 sql """alter table ${tableMorName2} set 
("enable_mow_light_delete"="true")"""
@@ -85,6 +86,7 @@ suite('test_new_partial_update_delete') {
                 DISTRIBUTED BY HASH(k1) BUCKETS 1
                 PROPERTIES (
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
 
@@ -198,6 +200,7 @@ suite('test_new_partial_update_delete') {
                 DISTRIBUTED BY HASH(k1) BUCKETS 1
                 PROPERTIES (
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
 
diff --git 
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_after_delete.groovy
 
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_after_delete.groovy
index 41cebac66bd..97a76567688 100644
--- 
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_after_delete.groovy
+++ 
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_after_delete.groovy
@@ -40,6 +40,7 @@ suite("test_partial_update_after_delete", "p0") {
                 PROPERTIES (
                     "enable_unique_key_merge_on_write" = "true",
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
             
@@ -65,6 +66,7 @@ suite("test_partial_update_after_delete", "p0") {
                 PROPERTIES (
                     "enable_unique_key_merge_on_write" = "true",
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
             
diff --git 
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete.groovy
 
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete.groovy
index 0d83d94f91c..7db618798bb 100644
--- 
a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete.groovy
+++ 
b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete.groovy
@@ -39,6 +39,7 @@ suite('test_partial_update_delete') {
                 PROPERTIES (
                     "enable_unique_key_merge_on_write" = "true",
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
 
@@ -51,6 +52,7 @@ suite('test_partial_update_delete') {
                 PROPERTIES (
                     "enable_unique_key_merge_on_write" = "true",
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
 
@@ -86,6 +88,7 @@ suite('test_partial_update_delete') {
                 PROPERTIES (
                     "enable_unique_key_merge_on_write" = "true",
                     "disable_auto_compaction" = "true",
+                    "enable_mow_light_delete" = "false",
                     "replication_num" = "1",
                     "store_row_column" = "${use_row_store}"); """
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to