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 D1D77200C07 for ; Sun, 18 Dec 2016 07:14:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D0808160B34; Sun, 18 Dec 2016 06:14:06 +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 2E68E160B28 for ; Sun, 18 Dec 2016 07:14:06 +0100 (CET) Received: (qmail 88515 invoked by uid 500); 18 Dec 2016 06:14:05 -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 88465 invoked by uid 99); 18 Dec 2016 06:14:05 -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, 18 Dec 2016 06:14:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2C394DFB90; Sun, 18 Dec 2016 06:14:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: billyliu@apache.org To: commits@kylin.apache.org Date: Sun, 18 Dec 2016 06:14:06 -0000 Message-Id: <7d2294e1d30048cb8e8e86e1247f9be2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] kylin git commit: minor, sub_query/query02.sql fix CI archived-at: Sun, 18 Dec 2016 06:14:07 -0000 minor, sub_query/query02.sql fix CI Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f2377db9 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f2377db9 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f2377db9 Branch: refs/heads/KYLIN-2293 Commit: f2377db9ff2687098c0bd8a805449547b7dcd436 Parents: 911bdd0 Author: Li Yang Authored: Fri Dec 16 15:53:30 2016 +0800 Committer: Li Yang Committed: Fri Dec 16 15:53:30 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/dimension/DimensionEncodingFactory.java | 2 +- .../java/org/apache/kylin/metadata/model/DataModelDesc.java | 4 ++-- kylin-it/src/test/resources/query/sql_subquery/query02.sql | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/f2377db9/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java b/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java index 4954ead..3eddba7 100644 --- a/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java +++ b/core-metadata/src/main/java/org/apache/kylin/dimension/DimensionEncodingFactory.java @@ -71,7 +71,7 @@ public abstract class DimensionEncodingFactory { if (factoryMap == null) initFactoryMap(); - Map result = Maps.newHashMap(); + Map result = Maps.newTreeMap(); for (Pair p : factoryMap.keySet()) { if (result.containsKey(p.getFirst())) { if (result.get(p.getFirst()) > p.getSecond()) { http://git-wip-us.apache.org/repos/asf/kylin/blob/f2377db9/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java index 0b494e3..571b196 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java @@ -393,7 +393,7 @@ public class DataModelDesc extends RootPersistentEntity { col = findColumn(pks[i]); } if (col == null || col.getTableRef().equals(dimTable) == false) { - throw new IllegalStateException("Can't find column " + pks[i] + " in table " + dimTable.getTableIdentity()); + throw new IllegalStateException("Can't find PK column " + pks[i] + " in table " + dimTable); } pks[i] = col.getIdentity(); pkCols[i] = col; @@ -406,7 +406,7 @@ public class DataModelDesc extends RootPersistentEntity { for (int i = 0; i < fks.length; i++) { TblColRef col = findColumn(fks[i]); if (col == null) { - throw new IllegalStateException("Can't find column " + fks[i] + " in table " + this.getRootFactTable()); + throw new IllegalStateException("Can't find FK column " + fks[i]); } fks[i] = col.getIdentity(); fkCols[i] = col; http://git-wip-us.apache.org/repos/asf/kylin/blob/f2377db9/kylin-it/src/test/resources/query/sql_subquery/query02.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_subquery/query02.sql b/kylin-it/src/test/resources/query/sql_subquery/query02.sql index e6751b7..b0dcf73 100644 --- a/kylin-it/src/test/resources/query/sql_subquery/query02.sql +++ b/kylin-it/src/test/resources/query/sql_subquery/query02.sql @@ -25,7 +25,11 @@ FROM test_cal_dt.week_beg_dt ,test_kylin_fact.price from test_kylin_fact - inner join edw.test_cal_dt as test_cal_dt - on test_kylin_fact.cal_dt = test_cal_dt.cal_dt + inner JOIN edw.test_cal_dt as test_cal_dt + ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt + inner JOIN test_category_groupings + ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id + inner JOIN edw.test_sites as test_sites + ON test_kylin_fact.lstg_site_id = test_sites.site_id inner join edw.test_cal_dt as test_cal_dt ) t group by week_beg_dt