database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](Nereids) delete partition failed (#28717)

Browse Source 
1. parser's partitionSpec changed unexpectly by PR #26492
2. delete without using should support un-equals expression
This commit is contained in:
morrySnow
2023-12-20 19:31:53 +08:00
committed by GitHub
parent e8d0569d8b
commit 40afee0097
2 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DeleteFromCommand.java
View File

@ -127,9 +127,13 @@ public class DeleteFromCommand extends Command implements ForwardWithSync {
checkPredicate(conjunct);
}
} catch (Exception e) {
new DeleteFromUsingCommand(nameParts, tableAlias, isTempPart, partitions,
logicalQuery, Optional.empty()).run(ctx, executor);
return;
try {
new DeleteFromUsingCommand(nameParts, tableAlias, isTempPart, partitions,
logicalQuery, Optional.empty()).run(ctx, executor);
return;
} catch (Exception e2) {
throw e;
}
}
// call delete handler to process
@ -226,56 +230,65 @@ public class DeleteFromCommand extends Command implements ForwardWithSync {
}
}
private void checkComparisonPredicate(ComparisonPredicate cp) {
if (!(cp.left() instanceof SlotReference)) {
throw new AnalysisException(
"Left expr of binary predicate should be column name, predicate: " + cp.toSql()
+ ", left expr type:" + cp.left().getDataType());
}
if (!(cp.right() instanceof Literal)) {
throw new AnalysisException(
"Right expr of binary predicate should be value, predicate: " + cp.toSql()
+ ", right expr type:" + cp.right().getDataType());
}
}
private void checkIsNull(IsNull isNull) {
if (!(isNull.child() instanceof SlotReference)) {
throw new AnalysisException(
"Child expr of is_null predicate should be column name, predicate: " + isNull.toSql());
}
}
private void checkInPredicate(InPredicate in) {
if (!(in.getCompareExpr() instanceof SlotReference)) {
throw new AnalysisException(
"Left expr of in predicate should be column name, predicate: " + in.toSql()
+ ", left expr type:" + in.getCompareExpr().getDataType());
}
int maxAllowedInElementNumOfDelete = Config.max_allowed_in_element_num_of_delete;
if (in.getOptions().size() > maxAllowedInElementNumOfDelete) {
throw new AnalysisException("Element num of in predicate should not be more than "
+ maxAllowedInElementNumOfDelete);
}
for (Expression option : in.getOptions()) {
if (!(option instanceof Literal)) {
throw new AnalysisException("Child of in predicate should be value, but get " + option);
}
}
}
private void checkPredicate(Expression predicate) {
if (predicate instanceof And) {
checkPredicate(((And) predicate).left());
checkPredicate(((And) predicate).right());
} else if (predicate instanceof ComparisonPredicate) {
ComparisonPredicate cp = (ComparisonPredicate) predicate;
if (!(cp.left() instanceof SlotReference)) {
throw new AnalysisException(
"Left expr of binary predicate should be column name, predicate: " + predicate.toSql()
+ ", left expr type:" + cp.left().getDataType());
}
if (!(cp.right() instanceof Literal)) {
throw new AnalysisException(
"Right expr of binary predicate should be value, predicate: " + predicate.toSql()
+ ", right expr type:" + cp.right().getDataType());
}
checkComparisonPredicate((ComparisonPredicate) predicate);
} else if (predicate instanceof IsNull) {
if (!(((IsNull) predicate).child() instanceof SlotReference)) {
throw new AnalysisException(
"Child expr of is_null predicate should be column name, predicate: " + predicate.toSql());
}
checkIsNull((IsNull) predicate);
} else if (predicate instanceof Not) {
Expression child = ((Not) predicate).child();
if (child instanceof IsNull) {
if (!(((IsNull) child).child() instanceof SlotReference)) {
throw new AnalysisException(
"Child expr of is_null predicate should be column name, predicate: " + predicate.toSql());
}
checkIsNull((IsNull) child);
} else if (child instanceof ComparisonPredicate) {
checkComparisonPredicate((ComparisonPredicate) child);
} else {
throw new AnalysisException("Where clause only supports compound predicate,"
+ " binary predicate, is_null predicate or in predicate. But we meet "
+ child.toSql());
}
} else if (predicate instanceof InPredicate) {
InPredicate in = (InPredicate) predicate;
if (!(in.getCompareExpr() instanceof SlotReference)) {
throw new AnalysisException(
"Left expr of in predicate should be column name, predicate: " + predicate.toSql()
+ ", left expr type:" + in.getCompareExpr().getDataType());
}
int maxAllowedInElementNumOfDelete = Config.max_allowed_in_element_num_of_delete;
if (in.getOptions().size() > maxAllowedInElementNumOfDelete) {
throw new AnalysisException("Element num of in predicate should not be more than "
+ maxAllowedInElementNumOfDelete);
}
for (Expression option : in.getOptions()) {
if (!(option instanceof Literal)) {
throw new AnalysisException("Child of in predicate should be value, but get " + option);
}
}
checkInPredicate((InPredicate) predicate);
} else {
throw new AnalysisException("Where clause only supports compound predicate,"
+ " binary predicate, is_null predicate or in predicate. But we meet "