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

[fix](Nereids): AssertNumRowsElement shouldn't be expression (#31581)

Browse Source
This commit is contained in:
jakevin
2024-02-29 16:55:50 +08:00
committed by yiguolei
parent 720b6e3d86
commit de28d7cd2d
5 changed files with 7 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/AssertNumRowsElement.java
View File

@ -17,22 +17,14 @@
package org.apache.doris.nereids.trees.expressions;
import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.util.Utils;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
/**
* Number of rows returned by inspection in subquery.
*/
public class AssertNumRowsElement extends Expression implements LeafExpression, AlwaysNotNullable {
public class AssertNumRowsElement {
/**
* Assertion type.
*/
@ -51,7 +43,6 @@ public class AssertNumRowsElement extends Expression implements LeafExpression,
public AssertNumRowsElement(long desiredNumOfRows, String subqueryString,
Assertion assertion) {
super(ImmutableList.of());
this.desiredNumOfRows = desiredNumOfRows;
this.subqueryString = subqueryString;
this.assertion = assertion;
@ -69,12 +60,6 @@ public class AssertNumRowsElement extends Expression implements LeafExpression,
return assertion;
}
@Override
public AssertNumRowsElement withChildren(List<Expression> children) {
Preconditions.checkArgument(children.isEmpty());
return this;
}
@Override
public String toString() {
return Utils.toSqlString("AssertNumRowsElement",
@ -83,19 +68,6 @@ public class AssertNumRowsElement extends Expression implements LeafExpression,
"assertion", assertion);
}
@Override
public String toSql() {
return toString();
}
@Override
public String getExpressionName() {
if (!this.exprName.isPresent()) {
this.exprName = Optional.of(Utils.normalizeName(assertion.name().toLowerCase(), DEFAULT_EXPRESSION_NAME));
}
return this.exprName.get();
}
@Override
public boolean equals(Object o) {
if (this == o) {
@ -105,18 +77,13 @@ public class AssertNumRowsElement extends Expression implements LeafExpression,
return false;
}
AssertNumRowsElement that = (AssertNumRowsElement) o;
return Objects.equals(this.desiredNumOfRows, that.getDesiredNumOfRows())
&& Objects.equals(this.subqueryString, that.getSubqueryString())
&& Objects.equals(this.assertion, that.getAssertion());
return this.desiredNumOfRows == that.getDesiredNumOfRows()
&& this.subqueryString.equals(that.getSubqueryString())
&& this.assertion.equals(that.getAssertion());
}
@Override
public int hashCode() {
return Objects.hash(desiredNumOfRows, subqueryString, assertion);
}
@Override
public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
return visitor.visitAssertNumRowsElement(this, context);
}
}

3
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Expression.java
View File

@ -252,8 +252,7 @@ public abstract class Expression extends AbstractTreeNode<Expression> implements
* Whether the expression is a constant.
*/
public boolean isConstant() {
if (this instanceof AssertNumRowsElement
|| this instanceof AggregateFunction
if (this instanceof AggregateFunction
|| this instanceof Lambda
|| this instanceof MaxValue
|| this instanceof OrderExpression

5
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ExpressionVisitor.java
View File

@ -29,7 +29,6 @@ import org.apache.doris.nereids.trees.expressions.Alias;
import org.apache.doris.nereids.trees.expressions.And;
import org.apache.doris.nereids.trees.expressions.Any;
import org.apache.doris.nereids.trees.expressions.ArrayItemReference;
import org.apache.doris.nereids.trees.expressions.AssertNumRowsElement;
import org.apache.doris.nereids.trees.expressions.BinaryArithmetic;
import org.apache.doris.nereids.trees.expressions.BinaryOperator;
import org.apache.doris.nereids.trees.expressions.BitAnd;
@ -433,10 +432,6 @@ public abstract class ExpressionVisitor<R, C>
return visitSubqueryExpr(listQuery, context);
}
public R visitAssertNumRowsElement(AssertNumRowsElement assertNumRowsElement, C context) {
return visit(assertNumRowsElement, context);
}
public R visitGroupingScalarFunction(GroupingScalarFunction groupingScalarFunction, C context) {
return visit(groupingScalarFunction, context);
}

2
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalAssertNumRows.java
View File

@ -91,7 +91,7 @@ public class LogicalAssertNumRows<CHILD_TYPE extends Plan> extends LogicalUnary<
@Override
public List<? extends Expression> getExpressions() {
return ImmutableList.of(assertNumRowsElement);
return ImmutableList.of();
}
@Override

2
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalAssertNumRows.java
View File

@ -94,7 +94,7 @@ public class PhysicalAssertNumRows<CHILD_TYPE extends Plan> extends PhysicalUnar
@Override
public List<? extends Expression> getExpressions() {
return ImmutableList.of(assertNumRowsElement);
return ImmutableList.of();
}
@Override