Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BCC48200AE2 for ; Fri, 13 May 2016 02:21:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BB2B9160A1B; Fri, 13 May 2016 00:21:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 109C7160A15 for ; Fri, 13 May 2016 02:21:41 +0200 (CEST) Received: (qmail 96927 invoked by uid 500); 13 May 2016 00:21:41 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 96805 invoked by uid 99); 13 May 2016 00:21:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 May 2016 00:21:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1DFB5DFDD0; Fri, 13 May 2016 00:21:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamestaylor@apache.org To: commits@phoenix.apache.org Date: Fri, 13 May 2016 00:21:43 -0000 Message-Id: <4d9fb7535f814559ae87b2943e1b8842@git.apache.org> In-Reply-To: <404e3ea05d7a4403a012cb66099cb764@git.apache.org> References: <404e3ea05d7a4403a012cb66099cb764@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] phoenix git commit: PHOENIX-2888 Aggregations for similar IN list expressions doesn't work correctly (Sergey Soldatov) archived-at: Fri, 13 May 2016 00:21:42 -0000 PHOENIX-2888 Aggregations for similar IN list expressions doesn't work correctly (Sergey Soldatov) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b9a85747 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b9a85747 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b9a85747 Branch: refs/heads/4.x-HBase-0.98 Commit: b9a857472b6e99203cf3424b76c921f218af7456 Parents: bddc75f Author: James Taylor Authored: Thu May 12 14:34:47 2016 -0700 Committer: James Taylor Committed: Thu May 12 17:21:42 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/expression/InListExpression.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b9a85747/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java index a4a9353..a977f1f 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java @@ -175,7 +175,7 @@ public class InListExpression extends BaseSingleExpression { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + values.hashCode(); + result = prime * result + children.hashCode() + values.hashCode(); return result; } @@ -185,7 +185,7 @@ public class InListExpression extends BaseSingleExpression { if (obj == null) return false; if (getClass() != obj.getClass()) return false; InListExpression other = (InListExpression)obj; - if (!values.equals(other.values)) return false; + if (!children.equals(other.children) || !values.equals(other.values)) return false; return true; }