fix

fix case
apache · Sep 19, 2024 · cec9276 · cec9276
1 parent 3a7a80b
commit cec9276
Show file tree

Hide file tree

Showing 11 changed files with 554 additions and 2 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java
@@ -171,7 +171,8 @@ public TExecPlanFragmentParams plan(TUniqueId loadId, int fragmentInstanceIdInde
                     throw new UserException("Partial update should include all key columns, missing: " + col.getName());
                 }
             }
-            if (taskInfo.getMergeType() == LoadTask.MergeType.DELETE) {
+            if (taskInfo.getMergeType() == LoadTask.MergeType.DELETE
+                    || taskInfo.getMergeType() == LoadTask.MergeType.MERGE) {
                 partialUpdateInputColumns.add(Column.DELETE_SIGN);
             }
         }
@@ -389,7 +390,8 @@ public TPipelineFragmentParams planForPipeline(TUniqueId loadId, int fragmentIns
                     throw new UserException("Partial update should include all key columns, missing: " + col.getName());
                 }
             }
-            if (taskInfo.getMergeType() == LoadTask.MergeType.DELETE) {
+            if (taskInfo.getMergeType() == LoadTask.MergeType.DELETE
+                    || taskInfo.getMergeType() == LoadTask.MergeType.MERGE) {
                 partialUpdateInputColumns.add(Column.DELETE_SIGN);
             }
         }

diff --git a/regression-test/data/unique_with_mow_p0/partial_update/merge1.csv b/regression-test/data/unique_with_mow_p0/partial_update/merge1.csv
@@ -0,0 +1,6 @@
+1,10,0
+2,20,1
+3,30,0
+4,40,1
+10,999,0
+11,888,1
diff --git a/regression-test/data/unique_with_mow_p0/partial_update/merge2.csv b/regression-test/data/unique_with_mow_p0/partial_update/merge2.csv
@@ -0,0 +1,2 @@
+1,11
+5,50
diff --git a/regression-test/data/unique_with_mow_p0/partial_update/merge3.csv b/regression-test/data/unique_with_mow_p0/partial_update/merge3.csv
@@ -0,0 +1,6 @@
+1,10,2,0
+2,20,2,1
+3,30,2,0
+4,40,2,1
+10,999,2,0
+11,888,2,1
diff --git a/regression-test/data/unique_with_mow_p0/partial_update/merge4.csv b/regression-test/data/unique_with_mow_p0/partial_update/merge4.csv
@@ -0,0 +1,2 @@
+1,11,4
+5,50,4
diff --git a/regression-test/data/unique_with_mow_p0/partial_update/merge5.csv b/regression-test/data/unique_with_mow_p0/partial_update/merge5.csv
@@ -0,0 +1,2 @@
+6,1
+11,0
diff --git a/regression-test/data/unique_with_mow_p0/partial_update/merge6.csv b/regression-test/data/unique_with_mow_p0/partial_update/merge6.csv
@@ -0,0 +1,2 @@
+7
+11
diff --git a/regression-test/data/unique_with_mow_p0/partial_update/merge7.csv b/regression-test/data/unique_with_mow_p0/partial_update/merge7.csv
@@ -0,0 +1,2 @@
+6,3,1
+11,3,0
diff --git a/regression-test/data/unique_with_mow_p0/partial_update/merge8.csv b/regression-test/data/unique_with_mow_p0/partial_update/merge8.csv
@@ -0,0 +1,2 @@
+7,5
+11,5