You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by hu...@apache.org on 2022/07/21 04:20:59 UTC
[doris] branch master updated: [enhancement](Nereids)expression equals and hashCode function (#10882)
This is an automated email from the ASF dual-hosted git repository.
huajianlan 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 072479fa21 [enhancement](Nereids)expression equals and hashCode function (#10882)
072479fa21 is described below
commit 072479fa218fd2d7d3ba749e519892d0a9a30551
Author: morrySnow <10...@users.noreply.github.com>
AuthorDate: Thu Jul 21 12:20:53 2022 +0800
[enhancement](Nereids)expression equals and hashCode function (#10882)
review and add all missing equals and hashCode function to Expression and its sub class.
Alias
Arithmetic
BoundFunction
CompoundPredicate
Not
UnboundFunction
UnboundSlot
UnboundStar
---
.../doris/nereids/analyzer/UnboundFunction.java | 20 +++
.../apache/doris/nereids/analyzer/UnboundSlot.java | 10 +-
.../apache/doris/nereids/analyzer/UnboundStar.java | 23 ++-
.../nereids/rules/analysis/BindSlotReference.java | 2 +-
.../doris/nereids/trees/expressions/Alias.java | 26 ++-
.../nereids/trees/expressions/Arithmetic.java | 6 +-
.../trees/expressions/CompoundPredicate.java | 5 +
.../doris/nereids/trees/expressions/Not.java | 5 +
.../trees/expressions/functions/BoundFunction.java | 2 +-
.../trees/expressions/ExpressionEqualsTest.java | 189 +++++++++++++++++++++
10 files changed, 279 insertions(+), 9 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java
index f45fc639b2..083f758e42 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java
@@ -77,4 +77,24 @@ public class UnboundFunction extends Expression implements Unbound {
public Expression withChildren(List<Expression> children) {
return new UnboundFunction(name, isDistinct, children);
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ UnboundFunction that = (UnboundFunction) o;
+ return isDistinct == that.isDistinct && name.equals(that.name);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(name, isDistinct);
+ }
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundSlot.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundSlot.java
index 52baded855..2fc8b1fc97 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundSlot.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundSlot.java
@@ -25,6 +25,7 @@ import org.apache.doris.nereids.util.Utils;
import com.google.common.collect.Lists;
import java.util.List;
+import java.util.Objects;
/**
* Slot has not been bound.
@@ -34,7 +35,7 @@ public class UnboundSlot extends Slot implements Unbound {
public UnboundSlot(List<String> nameParts) {
super(ExpressionType.UNBOUND_SLOT);
- this.nameParts = nameParts;
+ this.nameParts = Objects.requireNonNull(nameParts, "nameParts can not be null");
}
public List<String> getNameParts() {
@@ -75,7 +76,12 @@ public class UnboundSlot extends Slot implements Unbound {
return false;
}
UnboundSlot other = (UnboundSlot) o;
- return nameParts.containsAll(other.getNameParts());
+ return nameParts.equals(other.getNameParts());
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(nameParts);
}
@Override
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundStar.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundStar.java
index 2059cd696f..0fad6feada 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundStar.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundStar.java
@@ -25,6 +25,7 @@ import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.util.Utils;
import java.util.List;
+import java.util.Objects;
/**
* Star expression.
@@ -34,7 +35,7 @@ public class UnboundStar extends NamedExpression implements LeafExpression, Unbo
public UnboundStar(List<String> qualifier) {
super(ExpressionType.UNBOUND_STAR);
- this.qualifier = qualifier;
+ this.qualifier = Objects.requireNonNull(qualifier, "qualifier can not be null");
}
@Override
@@ -52,6 +53,26 @@ public class UnboundStar extends NamedExpression implements LeafExpression, Unbo
return toSql();
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ UnboundStar that = (UnboundStar) o;
+ return qualifier.equals(that.qualifier);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(super.hashCode(), qualifier);
+ }
+
@Override
public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
return visitor.visitUnboundStar(this, context);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindSlotReference.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindSlotReference.java
index ce24b3000d..c0c6b3f95a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindSlotReference.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindSlotReference.java
@@ -258,7 +258,7 @@ public class BindSlotReference implements AnalysisRuleFactory {
private class BoundStar extends NamedExpression {
public BoundStar(List<Slot> children) {
super(ExpressionType.BOUND_STAR, children.toArray(new Slot[0]));
- Preconditions.checkArgument(children.stream().allMatch(slot -> !(slot instanceof UnboundSlot)),
+ Preconditions.checkArgument(children.stream().noneMatch(slot -> slot instanceof UnboundSlot),
"BoundStar can not wrap UnboundSlot"
);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Alias.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Alias.java
index 7ea8a52a55..e0f5116fda 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Alias.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Alias.java
@@ -21,10 +21,12 @@ import org.apache.doris.nereids.exceptions.UnboundException;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.DataType;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import java.util.List;
+import java.util.Objects;
/**
* Expression for alias, such as col1 as c1.
@@ -45,7 +47,8 @@ public class Alias extends NamedExpression implements UnaryExpression {
this(NamedExpressionUtil.newExprId(), child, name);
}
- private Alias(ExprId exprId, Expression child, String name) {
+ @VisibleForTesting
+ Alias(ExprId exprId, Expression child, String name) {
super(ExpressionType.ALIAS, child);
this.exprId = exprId;
this.name = name;
@@ -87,6 +90,27 @@ public class Alias extends NamedExpression implements UnaryExpression {
return child().nullable();
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ Alias alias = (Alias) o;
+ return exprId.equals(alias.exprId) && name.equals(alias.name)
+ && qualifier.equals(alias.qualifier) && children.equals(alias.children);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(exprId, name, qualifier, children());
+ }
+
@Override
public String toString() {
return child().toString() + " AS `" + name + "`#" + exprId;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Arithmetic.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Arithmetic.java
index bd87c7540e..b2a1698f7d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Arithmetic.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Arithmetic.java
@@ -136,7 +136,7 @@ public abstract class Arithmetic extends Expression {
case BITNOT:
return ExpressionType.NOT;
default:
- return null;
+ throw new RuntimeException("Not support arithmetic type: " + op.getName());
}
}
@@ -179,12 +179,12 @@ public abstract class Arithmetic extends Expression {
return false;
}
Arithmetic that = (Arithmetic) o;
- return op == that.op;
+ return op == that.op && Objects.equals(this.children(), that.children());
}
@Override
public int hashCode() {
- return Objects.hash(op);
+ return Objects.hash(op, children());
}
@Override
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/CompoundPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/CompoundPredicate.java
index 3bfe654ff4..22e47f1d3d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/CompoundPredicate.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/CompoundPredicate.java
@@ -74,6 +74,11 @@ public class CompoundPredicate extends Expression implements BinaryExpression {
&& Objects.equals(right(), other.right());
}
+ @Override
+ public int hashCode() {
+ return Objects.hash(getType(), left(), right());
+ }
+
@Override
public String toString() {
return "(" + left().toString() + " " + getType().toString() + " " + right().toString() + ")";
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Not.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Not.java
index 8ca44bc9b2..57c68c6b34 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Not.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Not.java
@@ -56,6 +56,11 @@ public class Not extends Expression implements UnaryExpression {
return Objects.equals(child(), other.child());
}
+ @Override
+ public int hashCode() {
+ return child().hashCode();
+ }
+
@Override
public String toString() {
return "( not " + child() + ")";
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/BoundFunction.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/BoundFunction.java
index ea9f9f1325..af227632e3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/BoundFunction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/BoundFunction.java
@@ -62,7 +62,7 @@ public abstract class BoundFunction extends Expression {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), name);
+ return Objects.hash(name, children);
}
@Override
diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/ExpressionEqualsTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/ExpressionEqualsTest.java
new file mode 100644
index 0000000000..23f672cf39
--- /dev/null
+++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/ExpressionEqualsTest.java
@@ -0,0 +1,189 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.trees.expressions;
+
+import org.apache.doris.nereids.analyzer.UnboundAlias;
+import org.apache.doris.nereids.analyzer.UnboundFunction;
+import org.apache.doris.nereids.analyzer.UnboundStar;
+import org.apache.doris.nereids.trees.expressions.functions.Sum;
+import org.apache.doris.nereids.types.IntegerType;
+
+import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ExpressionEqualsTest {
+ private final ExprId exprId = new ExprId(1);
+ private final Expression child1 = new SlotReference(exprId, "child",
+ IntegerType.INSTANCE, false, Lists.newArrayList());
+ private final Expression left1 = new SlotReference(exprId, "left",
+ IntegerType.INSTANCE, false, Lists.newArrayList());
+ private final Expression right1 = new SlotReference(exprId, "right",
+ IntegerType.INSTANCE, false, Lists.newArrayList());
+
+ private final Expression child2 = new SlotReference(exprId, "child",
+ IntegerType.INSTANCE, false, Lists.newArrayList());
+ private final Expression left2 = new SlotReference(exprId, "left",
+ IntegerType.INSTANCE, false, Lists.newArrayList());
+ private final Expression right2 = new SlotReference(exprId, "right",
+ IntegerType.INSTANCE, false, Lists.newArrayList());
+
+ @Test
+ public void testComparisonPredicate() {
+ // less than
+ LessThan lessThan1 = new LessThan(left1, right1);
+ LessThan lessThan2 = new LessThan(left2, right2);
+ Assertions.assertEquals(lessThan1, lessThan2);
+ Assertions.assertEquals(lessThan1.hashCode(), lessThan2.hashCode());
+
+ // greater than
+ GreaterThan greaterThan1 = new GreaterThan(left1, right1);
+ GreaterThan greaterThan2 = new GreaterThan(left2, right2);
+ Assertions.assertEquals(greaterThan1, greaterThan2);
+ Assertions.assertEquals(greaterThan1.hashCode(), greaterThan2.hashCode());
+
+ // null safe equal
+ NullSafeEqual nullSafeEqual1 = new NullSafeEqual(left1, right1);
+ NullSafeEqual nullSafeEqual2 = new NullSafeEqual(left2, right2);
+ Assertions.assertEquals(nullSafeEqual1, nullSafeEqual2);
+ Assertions.assertEquals(nullSafeEqual1.hashCode(), nullSafeEqual2.hashCode());
+
+ // equal to
+ EqualTo equalTo1 = new EqualTo(left1, right1);
+ EqualTo equalTo2 = new EqualTo(left2, right2);
+ Assertions.assertEquals(equalTo1, equalTo2);
+ Assertions.assertEquals(equalTo1.hashCode(), equalTo2.hashCode());
+
+ // less than equal
+ LessThanEqual lessThanEqual1 = new LessThanEqual(left1, right1);
+ LessThanEqual lessThanEqual2 = new LessThanEqual(left2, right2);
+ Assertions.assertEquals(lessThanEqual1, lessThanEqual2);
+ Assertions.assertEquals(lessThanEqual1.hashCode(), lessThanEqual2.hashCode());
+
+ // greater than equal
+ GreaterThanEqual greaterThanEqual1 = new GreaterThanEqual(left1, right1);
+ GreaterThanEqual greaterThanEqual2 = new GreaterThanEqual(left2, right2);
+ Assertions.assertEquals(greaterThanEqual1, greaterThanEqual2);
+ Assertions.assertEquals(greaterThanEqual1.hashCode(), greaterThanEqual2.hashCode());
+ }
+
+ @Test
+ public void testBetween() {
+ Between between1 = new Between(child1, left1, right1);
+ Between between2 = new Between(child2, left2, right2);
+ Assertions.assertEquals(between1, between2);
+ Assertions.assertEquals(between1.hashCode(), between2.hashCode());
+ }
+
+ @Test
+ public void testNot() {
+ Not not1 = new Not(child1);
+ Not not2 = new Not(child2);
+ Assertions.assertEquals(not1, not2);
+ Assertions.assertEquals(not1.hashCode(), not2.hashCode());
+ }
+
+ @Test
+ public void testStringRegexPredicate() {
+ Like like1 = new Like(left1, right1);
+ Like like2 = new Like(left2, right2);
+ Assertions.assertEquals(like1, like2);
+ Assertions.assertEquals(like1.hashCode(), like2.hashCode());
+
+ Regexp regexp1 = new Regexp(left1, right1);
+ Regexp regexp2 = new Regexp(left2, right2);
+ Assertions.assertEquals(regexp1, regexp2);
+ Assertions.assertEquals(regexp1.hashCode(), regexp2.hashCode());
+ }
+
+ @Test
+ public void testCompoundPredicate() {
+ And and1 = new And(left1, right1);
+ And and2 = new And(left2, right2);
+ Assertions.assertEquals(and1, and2);
+ Assertions.assertEquals(and1.hashCode(), and2.hashCode());
+
+ Or or1 = new Or(left1, right1);
+ Or or2 = new Or(left2, right2);
+ Assertions.assertEquals(or1, or2);
+ Assertions.assertEquals(or1.hashCode(), or2.hashCode());
+ }
+
+ @Test
+ public void testArithmetic() {
+ Divide divide1 = new Divide(left1, right1);
+ Divide divide2 = new Divide(left2, right2);
+ Assertions.assertEquals(divide1, divide2);
+ Assertions.assertEquals(divide1.hashCode(), divide2.hashCode());
+
+ Multiply multiply1 = new Multiply(left1, right1);
+ Multiply multiply2 = new Multiply(left2, right2);
+ Assertions.assertEquals(multiply1, multiply2);
+ Assertions.assertEquals(multiply1.hashCode(), multiply2.hashCode());
+
+ Subtract subtract1 = new Subtract(left1, right1);
+ Subtract subtract2 = new Subtract(left2, right2);
+ Assertions.assertEquals(subtract1, subtract2);
+ Assertions.assertEquals(subtract1.hashCode(), subtract2.hashCode());
+
+ Mod mod1 = new Mod(left1, right1);
+ Mod mod2 = new Mod(left2, right2);
+ Assertions.assertEquals(mod1, mod2);
+ Assertions.assertEquals(mod1.hashCode(), mod2.hashCode());
+
+ Add add1 = new Add(left1, right1);
+ Add add2 = new Add(left2, right2);
+ Assertions.assertEquals(add1, add2);
+ Assertions.assertEquals(add1.hashCode(), add2.hashCode());
+ }
+
+ @Test
+ public void testUnboundFunction() {
+ UnboundFunction unboundFunction1 = new UnboundFunction("name", false, Lists.newArrayList(child1));
+ UnboundFunction unboundFunction2 = new UnboundFunction("name", false, Lists.newArrayList(child2));
+ Assertions.assertEquals(unboundFunction1, unboundFunction2);
+ Assertions.assertEquals(unboundFunction1.hashCode(), unboundFunction2.hashCode());
+ }
+
+ @Test
+ public void testBoundFunction() {
+ Sum sum1 = new Sum(child1);
+ Sum sum2 = new Sum(child2);
+ Assertions.assertEquals(sum1, sum2);
+ Assertions.assertEquals(sum1.hashCode(), sum2.hashCode());
+ }
+
+ @Test
+ public void testNamedExpression() {
+ ExprId aliasId = new ExprId(2);
+ Alias alias1 = new Alias(aliasId, child1, "alias");
+ Alias alias2 = new Alias(aliasId, child2, "alias");
+ Assertions.assertEquals(alias1, alias2);
+ Assertions.assertEquals(alias1.hashCode(), alias2.hashCode());
+
+ UnboundAlias unboundAlias1 = new UnboundAlias(child1);
+ UnboundAlias unboundAlias2 = new UnboundAlias(child2);
+ Assertions.assertEquals(unboundAlias1, unboundAlias2);
+ Assertions.assertEquals(unboundAlias1.hashCode(), unboundAlias2.hashCode());
+
+ UnboundStar unboundStar1 = new UnboundStar(Lists.newArrayList("a"));
+ UnboundStar unboundStar2 = new UnboundStar(Lists.newArrayList("a"));
+ Assertions.assertEquals(unboundStar1, unboundStar2);
+ Assertions.assertEquals(unboundStar1.hashCode(), unboundStar2.hashCode());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org