This is an automated email from the ASF dual-hosted git repository. morningman 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 03783ce551 [fix](Nereids) fix merge conflict caused compile error (#11064) 03783ce551 is described below commit 03783ce551395cc5d6d65f3b3a9cdfee1dc75e0a Author: 924060929 <924060...@qq.com> AuthorDate: Thu Jul 21 14:14:26 2022 +0800 [fix](Nereids) fix merge conflict caused compile error (#11064) fix merge conflict by #10882 and #10667 remove duplicate function hashCode --- .../src/main/java/org/apache/doris/nereids/analyzer/UnboundSlot.java | 5 ----- 1 file changed, 5 deletions(-) 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 1cf0a81265..630cf07c0b 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 @@ -79,11 +79,6 @@ public class UnboundSlot extends Slot implements Unbound { return nameParts.equals(other.getNameParts()); } - @Override - public int hashCode() { - return Objects.hash(nameParts); - } - @Override public int hashCode() { return Objects.hash(nameParts.toArray()); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org