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 B1E12200C74 for ; Sun, 14 May 2017 10:43:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B0823160BA9; Sun, 14 May 2017 08:43:01 +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 F34D0160BA6 for ; Sun, 14 May 2017 10:43:00 +0200 (CEST) Received: (qmail 50170 invoked by uid 500); 14 May 2017 08:43:00 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 50161 invoked by uid 99); 14 May 2017 08:42:59 -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; Sun, 14 May 2017 08:42:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4864DFDD5; Sun, 14 May 2017 08:42:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liyang@apache.org To: commits@kylin.apache.org Message-Id: <6654095c11e64bdd96d2ed6d155e864b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: kylin git commit: KYLIN-2613 fix DimensionDesc.hashCode() Date: Sun, 14 May 2017 08:42:59 +0000 (UTC) archived-at: Sun, 14 May 2017 08:43:01 -0000 Repository: kylin Updated Branches: refs/heads/master fd671d165 -> c8524efe7 KYLIN-2613 fix DimensionDesc.hashCode() Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c8524efe Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c8524efe Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c8524efe Branch: refs/heads/master Commit: c8524efe7c49db6a3225ef0caa7bf900f55c2ae3 Parents: fd671d1 Author: Yang Li Authored: Sun May 14 16:42:34 2017 +0800 Committer: Yang Li Committed: Sun May 14 16:42:34 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/cube/model/DimensionDesc.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/c8524efe/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java index 344b7c8..578831f 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/model/DimensionDesc.java @@ -33,6 +33,7 @@ import com.google.common.base.Objects; /** */ +@SuppressWarnings("serial") @JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE) public class DimensionDesc implements java.io.Serializable { @@ -178,7 +179,7 @@ public class DimensionDesc implements java.io.Serializable { final int prime = 31; int result = 1; result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((column == null) ? 0 : name.hashCode()); + result = prime * result + ((column == null) ? 0 : column.hashCode()); result = prime * result + ((table == null) ? 0 : table.hashCode()); result = prime * result + ((derived == null) ? 0 : derived.hashCode()); return result;