This is an automated email from the ASF dual-hosted git repository.
zhangchen 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 7e36ab838f1 [regression](partial update) Add cases when the deleted
rows have non nullable columns without default value (#26776)
7e36ab838f1 is described below
commit 7e36ab838f176fb1cfb6b7aa70630314f8f57746
Author: bobhan1 <bh2444151...@outlook.com>
AuthorDate: Mon Nov 13 10:36:59 2023 +0800
[regression](partial update) Add cases when the deleted rows have non
nullable columns without default value (#26776)
---
fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java | 2 +-
.../apache/doris/nereids/trees/plans/commands/DeleteCommand.java | 2 +-
.../data/nereids_p0/delete/delete_mow_partial_update.out | 6 +++---
.../partial_update/test_partial_update_delete.out | 6 +++---
.../suites/nereids_p0/delete/delete_mow_partial_update.groovy | 2 +-
.../partial_update/test_partial_update_delete.groovy | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java
index ff6be0f1d69..24c54ae8bcf 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java
@@ -157,7 +157,7 @@ public class DeleteStmt extends DdlStmt {
expr = new BoolLiteral(true);
} else if (column.isKey()) {
expr = new SlotRef(targetTableRef.getAliasAsName(),
column.getName());
- } else if (!isMow && !column.isVisible() || (!column.isAllowNull()
&& !column.hasDefaultValue())) {
+ } else if (!isMow && !column.isVisible()) {
expr = new SlotRef(targetTableRef.getAliasAsName(),
column.getName());
} else {
continue;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DeleteCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DeleteCommand.java
index a124a9fb5aa..84adddb81ee 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DeleteCommand.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DeleteCommand.java
@@ -103,7 +103,7 @@ public class DeleteCommand extends Command implements
ForwardWithSync, Explainab
selectLists.add(new UnboundSlot(tableName,
targetTable.getSequenceMapCol()));
} else if (column.isKey()) {
selectLists.add(new UnboundSlot(tableName, column.getName()));
- } else if ((!isMow && !column.isVisible()) ||
(!column.isAllowNull() && !column.hasDefaultValue())) {
+ } else if (!isMow && !column.isVisible()) {
selectLists.add(new UnboundSlot(tableName, column.getName()));
} else {
continue;
diff --git
a/regression-test/data/nereids_p0/delete/delete_mow_partial_update.out
b/regression-test/data/nereids_p0/delete/delete_mow_partial_update.out
index 2f8e157a944..488ad711f4e 100644
--- a/regression-test/data/nereids_p0/delete/delete_mow_partial_update.out
+++ b/regression-test/data/nereids_p0/delete/delete_mow_partial_update.out
@@ -36,11 +36,11 @@
5 5 5 5 5
-- !sql --
-1 \N \N \N \N 1
+1 \N \N 0 \N 1
1 1 1 1 1 0
-2 \N \N \N \N 1
+2 \N \N 0 \N 1
2 2 2 2 2 0
-3 \N \N \N \N 1
+3 \N \N 0 \N 1
3 3 3 3 3 0
4 4 4 4 4 0
5 5 5 5 5 0
diff --git
a/regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_delete.out
b/regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_delete.out
index 89faa7fed05..3477da40685 100644
---
a/regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_delete.out
+++
b/regression-test/data/unique_with_mow_p0/partial_update/test_partial_update_delete.out
@@ -11,11 +11,11 @@
5 5 5 5 5
-- !with_delete_sign --
-1 \N \N \N \N 1
+1 \N \N 0 \N 1
1 1 1 1 1 0
-2 \N \N \N \N 1
+2 \N \N 0 \N 1
2 2 2 2 2 0
-3 \N \N \N \N 1
+3 \N \N 0 \N 1
3 3 3 3 3 0
4 4 4 4 4 0
5 5 5 5 5 0
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 460d0bd4347..b8f44f97cb2 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
@@ -77,7 +77,7 @@ suite('nereids_delete_mow_partial_update') {
`k1` int NOT NULL,
`c1` int,
`c2` int,
- `c3` int,
+ `c3` int NOT NULL,
`c4` int
)UNIQUE KEY(k1)
DISTRIBUTED BY HASH(k1) BUCKETS 1
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 e582414f4fc..be4033199ce 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
@@ -26,7 +26,7 @@ suite('test_partial_update_delete') {
`k1` int NOT NULL,
`c1` int,
`c2` int,
- `c3` int,
+ `c3` int NOT NULL,
`c4` int
)UNIQUE KEY(k1)
DISTRIBUTED BY HASH(k1) BUCKETS 1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
