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

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


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new 721a5ad9502 [cherry-pick](branch-3.0) Pick "[Fix](delete) Fix some 
delete p2 case (#41678)" (#41826)
721a5ad9502 is described below

commit 721a5ad9502138729d1f2674db6c184c06c5b51d
Author: abmdocrt <[email protected]>
AuthorDate: Wed Oct 16 09:51:19 2024 +0800

    [cherry-pick](branch-3.0) Pick "[Fix](delete) Fix some delete p2 case 
(#41678)" (#41826)
    
    ## Proposed changes
    
    Pick #41678
---
 .../test_group_commit_http_stream_lineitem_schema_change.groovy         | 2 --
 .../test_group_commit_insert_into_lineitem_scheme_change.groovy         | 2 --
 .../test_group_commit_stream_load_lineitem_schema_change.groovy         | 2 --
 regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy   | 1 -
 regression-test/suites/tpch_sf100_p2/ddl/customer.sql                   | 1 -
 regression-test/suites/tpch_sf100_p2/ddl/lineitem.sql                   | 1 -
 regression-test/suites/tpch_sf100_p2/ddl/nation.sql                     | 1 -
 regression-test/suites/tpch_sf100_p2/ddl/orders.sql                     | 1 -
 regression-test/suites/tpch_sf100_p2/ddl/part.sql                       | 1 -
 regression-test/suites/tpch_sf100_p2/ddl/partsupp.sql                   | 1 -
 regression-test/suites/tpch_sf100_p2/ddl/region.sql                     | 1 -
 regression-test/suites/tpch_sf100_p2/ddl/supplier.sql                   | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/create_table.sql                 | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/customer.sql                     | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/lineitem.sql                     | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/nation.sql                       | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/orders.sql                       | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/part.sql                         | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/partsupp.sql                     | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/region.sql                       | 1 -
 regression-test/suites/tpch_sf1_p2/ddl/supplier.sql                     | 1 -
 21 files changed, 24 deletions(-)

diff --git 
a/regression-test/suites/insert_p2/test_group_commit_http_stream_lineitem_schema_change.groovy
 
b/regression-test/suites/insert_p2/test_group_commit_http_stream_lineitem_schema_change.groovy
index 2abfcd86126..2d0246774c4 100644
--- 
a/regression-test/suites/insert_p2/test_group_commit_http_stream_lineitem_schema_change.groovy
+++ 
b/regression-test/suites/insert_p2/test_group_commit_http_stream_lineitem_schema_change.groovy
@@ -113,7 +113,6 @@ DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
 COMMENT "OLAP"
 DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
 PROPERTIES (
-    "enable_mow_light_delete" = "true",
     "replication_num" = "1"
 );
         """
@@ -145,7 +144,6 @@ DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
 COMMENT "OLAP"
 DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
 PROPERTIES (
-    "enable_mow_light_delete" = "true",
     "replication_num" = "1"
 );
         """
diff --git 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy
 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy
index 7924260b72a..4043c7660ce 100644
--- 
a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy
+++ 
b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy
@@ -129,7 +129,6 @@ DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
 COMMENT "OLAP"
 DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
 PROPERTIES (
-    "enable_mow_light_delete" = "true",
     "replication_num" = "1"
 );
         """
@@ -162,7 +161,6 @@ DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
 COMMENT "OLAP"
 DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
 PROPERTIES (
-    "enable_mow_light_delete" = "true",
     "replication_num" = "1"
 );
         """
diff --git 
a/regression-test/suites/insert_p2/test_group_commit_stream_load_lineitem_schema_change.groovy
 
b/regression-test/suites/insert_p2/test_group_commit_stream_load_lineitem_schema_change.groovy
index b42f5d9038c..86c422f0d73 100644
--- 
a/regression-test/suites/insert_p2/test_group_commit_stream_load_lineitem_schema_change.groovy
+++ 
b/regression-test/suites/insert_p2/test_group_commit_stream_load_lineitem_schema_change.groovy
@@ -114,7 +114,6 @@ DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
 COMMENT "OLAP"
 DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
 PROPERTIES (
-    "enable_mow_light_delete" = "true",
     "replication_num" = "1"
 );
         """
@@ -146,7 +145,6 @@ DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
 COMMENT "OLAP"
 DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
 PROPERTIES (
-    "enable_mow_light_delete" = "true",
     "replication_num" = "1"
 );
         """
diff --git 
a/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy 
b/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy
index ac05e3a69f4..56692b68d37 100644
--- a/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy
+++ b/regression-test/suites/insert_p2/txn_insert_with_schema_change.groovy
@@ -54,7 +54,6 @@ suite("txn_insert_with_schema_change") {
             DUPLICATE KEY(L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER)
             DISTRIBUTED BY HASH(L_ORDERKEY) BUCKETS 3
             PROPERTIES (
-                "enable_mow_light_delete" = "true",
                 "replication_num" = "1"
             )
         """
diff --git a/regression-test/suites/tpch_sf100_p2/ddl/customer.sql 
b/regression-test/suites/tpch_sf100_p2/ddl/customer.sql
index 32665f2ce6a..5f41d6dbb12 100644
--- a/regression-test/suites/tpch_sf100_p2/ddl/customer.sql
+++ b/regression-test/suites/tpch_sf100_p2/ddl/customer.sql
@@ -11,7 +11,6 @@ CREATE TABLE IF NOT EXISTS customer (
 DUPLICATE KEY(C_CUSTKEY, C_NAME)
 DISTRIBUTED BY HASH(C_CUSTKEY) BUCKETS 32
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf100_p2/ddl/lineitem.sql 
b/regression-test/suites/tpch_sf100_p2/ddl/lineitem.sql
index eebd825dc8a..34fce81b607 100644
--- a/regression-test/suites/tpch_sf100_p2/ddl/lineitem.sql
+++ b/regression-test/suites/tpch_sf100_p2/ddl/lineitem.sql
@@ -19,7 +19,6 @@ CREATE TABLE IF NOT EXISTS lineitem (
 DUPLICATE KEY(L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER)
 DISTRIBUTED BY HASH(L_ORDERKEY) BUCKETS 32
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf100_p2/ddl/nation.sql 
b/regression-test/suites/tpch_sf100_p2/ddl/nation.sql
index 1e11fa86ea9..56c133ce1ea 100644
--- a/regression-test/suites/tpch_sf100_p2/ddl/nation.sql
+++ b/regression-test/suites/tpch_sf100_p2/ddl/nation.sql
@@ -7,7 +7,6 @@ CREATE TABLE IF NOT EXISTS nation  (
 DUPLICATE KEY(N_NATIONKEY, N_NAME)
 DISTRIBUTED BY HASH(N_NATIONKEY) BUCKETS 1
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf100_p2/ddl/orders.sql 
b/regression-test/suites/tpch_sf100_p2/ddl/orders.sql
index a02695d5177..1843ef0f2a5 100644
--- a/regression-test/suites/tpch_sf100_p2/ddl/orders.sql
+++ b/regression-test/suites/tpch_sf100_p2/ddl/orders.sql
@@ -12,7 +12,6 @@ CREATE TABLE IF NOT EXISTS orders  (
 DUPLICATE KEY(O_ORDERKEY, O_CUSTKEY)
 DISTRIBUTED BY HASH(O_ORDERKEY) BUCKETS 32
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf100_p2/ddl/part.sql 
b/regression-test/suites/tpch_sf100_p2/ddl/part.sql
index 91de8dfa43b..f5e75cef3f0 100644
--- a/regression-test/suites/tpch_sf100_p2/ddl/part.sql
+++ b/regression-test/suites/tpch_sf100_p2/ddl/part.sql
@@ -12,7 +12,6 @@ CREATE TABLE IF NOT EXISTS part (
 DUPLICATE KEY(P_PARTKEY, P_NAME)
 DISTRIBUTED BY HASH(P_PARTKEY) BUCKETS 32
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf100_p2/ddl/partsupp.sql 
b/regression-test/suites/tpch_sf100_p2/ddl/partsupp.sql
index ffb686f3716..72263631c58 100644
--- a/regression-test/suites/tpch_sf100_p2/ddl/partsupp.sql
+++ b/regression-test/suites/tpch_sf100_p2/ddl/partsupp.sql
@@ -8,7 +8,6 @@ CREATE TABLE IF NOT EXISTS partsupp (
 DUPLICATE KEY(PS_PARTKEY, PS_SUPPKEY)
 DISTRIBUTED BY HASH(PS_PARTKEY) BUCKETS 32
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf100_p2/ddl/region.sql 
b/regression-test/suites/tpch_sf100_p2/ddl/region.sql
index d4170a03432..fc94a17d46b 100644
--- a/regression-test/suites/tpch_sf100_p2/ddl/region.sql
+++ b/regression-test/suites/tpch_sf100_p2/ddl/region.sql
@@ -6,7 +6,6 @@ CREATE TABLE IF NOT EXISTS region (
 DUPLICATE KEY(R_REGIONKEY, R_NAME)
 DISTRIBUTED BY HASH(R_REGIONKEY) BUCKETS 1
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf100_p2/ddl/supplier.sql 
b/regression-test/suites/tpch_sf100_p2/ddl/supplier.sql
index c09e59e72f2..156d5c9f356 100644
--- a/regression-test/suites/tpch_sf100_p2/ddl/supplier.sql
+++ b/regression-test/suites/tpch_sf100_p2/ddl/supplier.sql
@@ -10,6 +10,5 @@ CREATE TABLE IF NOT EXISTS supplier (
 DUPLICATE KEY(S_SUPPKEY, S_NAME)
 DISTRIBUTED BY HASH(S_SUPPKEY) BUCKETS 32
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/create_table.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/create_table.sql
index 015058d6d89..324b167fc80 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/create_table.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/create_table.sql
@@ -6,6 +6,5 @@ CREATE TABLE IF NOT EXISTS gavin_test (
 DUPLICATE KEY(id, name)
 DISTRIBUTED BY HASH(id) BUCKETS 1
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/customer.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/customer.sql
index 0a98bb99ae2..00b1b98d489 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/customer.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/customer.sql
@@ -11,7 +11,6 @@ CREATE TABLE IF NOT EXISTS customer (
 DUPLICATE KEY(C_CUSTKEY, C_NAME)
 DISTRIBUTED BY HASH(C_CUSTKEY) BUCKETS 3
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/lineitem.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/lineitem.sql
index 30b29ee39c6..2b4cb771438 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/lineitem.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/lineitem.sql
@@ -19,7 +19,6 @@ CREATE TABLE IF NOT EXISTS lineitem (
 DUPLICATE KEY(L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER)
 DISTRIBUTED BY HASH(L_ORDERKEY) BUCKETS 3
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/nation.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/nation.sql
index b88f8c7365e..3eccc0dc976 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/nation.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/nation.sql
@@ -7,7 +7,6 @@ CREATE TABLE IF NOT EXISTS nation  (
 DUPLICATE KEY(N_NATIONKEY, N_NAME)
 DISTRIBUTED BY HASH(N_NATIONKEY) BUCKETS 3
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/orders.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/orders.sql
index 2574b829467..caeaa341508 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/orders.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/orders.sql
@@ -12,7 +12,6 @@ CREATE TABLE IF NOT EXISTS orders  (
 DUPLICATE KEY(O_ORDERKEY, O_CUSTKEY)
 DISTRIBUTED BY HASH(O_ORDERKEY) BUCKETS 3
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/part.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/part.sql
index e33cb50538c..994b6e66d55 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/part.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/part.sql
@@ -12,7 +12,6 @@ CREATE TABLE IF NOT EXISTS part (
 DUPLICATE KEY(P_PARTKEY, P_NAME)
 DISTRIBUTED BY HASH(P_PARTKEY) BUCKETS 3
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/partsupp.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/partsupp.sql
index 8ccc23a2794..be186a29db9 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/partsupp.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/partsupp.sql
@@ -8,7 +8,6 @@ CREATE TABLE IF NOT EXISTS partsupp (
 DUPLICATE KEY(PS_PARTKEY, PS_SUPPKEY)
 DISTRIBUTED BY HASH(PS_PARTKEY) BUCKETS 3
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/region.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/region.sql
index fde4c2add33..fbe34c05c6f 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/region.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/region.sql
@@ -6,7 +6,6 @@ CREATE TABLE IF NOT EXISTS region (
 DUPLICATE KEY(R_REGIONKEY, R_NAME)
 DISTRIBUTED BY HASH(R_REGIONKEY) BUCKETS 3
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )
 
diff --git a/regression-test/suites/tpch_sf1_p2/ddl/supplier.sql 
b/regression-test/suites/tpch_sf1_p2/ddl/supplier.sql
index 244db711c43..7214eaebd12 100644
--- a/regression-test/suites/tpch_sf1_p2/ddl/supplier.sql
+++ b/regression-test/suites/tpch_sf1_p2/ddl/supplier.sql
@@ -10,6 +10,5 @@ CREATE TABLE IF NOT EXISTS supplier (
 DUPLICATE KEY(S_SUPPKEY, S_NAME)
 DISTRIBUTED BY HASH(S_SUPPKEY) BUCKETS 3
 PROPERTIES (
-  "enable_mow_light_delete" = "true",
   "replication_num" = "1"
 )


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to