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 9E6E4200B90 for ; Sun, 11 Sep 2016 08:06:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9D517160AD3; Sun, 11 Sep 2016 06:06: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 755A3160ADD for ; Sun, 11 Sep 2016 08:06:00 +0200 (CEST) Received: (qmail 10452 invoked by uid 500); 11 Sep 2016 06:05:59 -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 9546 invoked by uid 99); 11 Sep 2016 06:05:58 -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, 11 Sep 2016 06:05:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F6CBE02DA; Sun, 11 Sep 2016 06:05:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shaofengshi@apache.org To: commits@kylin.apache.org Date: Sun, 11 Sep 2016 06:06:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [21/43] kylin git commit: minor, add one more test case archived-at: Sun, 11 Sep 2016 06:06:01 -0000 minor, add one more test case Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/01d033f7 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/01d033f7 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/01d033f7 Branch: refs/heads/v1.5.4-release2 Commit: 01d033f76a058ca0cf7ef81728b7de6204115167 Parents: ddeb745 Author: Hongbin Ma Authored: Thu Sep 8 11:18:52 2016 +0800 Committer: Hongbin Ma Committed: Thu Sep 8 11:18:52 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/cube/CubeCapabilityChecker.java | 7 ++++++- kylin-it/src/test/resources/query/sql_like/query18.sql | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/01d033f7/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java index 79d1e3b..e8c96b4 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeCapabilityChecker.java @@ -31,6 +31,7 @@ import org.apache.kylin.metadata.filter.UDF.MassInTupleFilter; import org.apache.kylin.metadata.model.FunctionDesc; import org.apache.kylin.metadata.model.IStorageAware; import org.apache.kylin.metadata.model.MeasureDesc; +import org.apache.kylin.metadata.model.ParameterDesc; import org.apache.kylin.metadata.model.TblColRef; import org.apache.kylin.metadata.realization.CapabilityResult; import org.apache.kylin.metadata.realization.SQLDigest; @@ -146,7 +147,11 @@ public class CubeCapabilityChecker { } // calcite can do aggregation from columns on-the-fly - List neededCols = functionDesc.getParameter().getColRefs(); + ParameterDesc parameterDesc = functionDesc.getParameter(); + if (parameterDesc == null) { + continue; + } + List neededCols = parameterDesc.getColRefs(); if (neededCols.size() > 0 && cubeDesc.listDimensionColumnsIncludingDerived().containsAll(neededCols) && FunctionDesc.BUILT_IN_AGGREGATIONS.contains(functionDesc.getExpression())) { result.influences.add(new CapabilityResult.DimensionAsMeasure(functionDesc)); it.remove(); http://git-wip-us.apache.org/repos/asf/kylin/blob/01d033f7/kylin-it/src/test/resources/query/sql_like/query18.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_like/query18.sql b/kylin-it/src/test/resources/query/sql_like/query18.sql new file mode 100644 index 0000000..8ef6ad4 --- /dev/null +++ b/kylin-it/src/test/resources/query/sql_like/query18.sql @@ -0,0 +1,13 @@ + +select USER_DEFINED_FIELD3 as abc + + 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 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 + + +where upper(USER_DEFINED_FIELD3) like '%VID%'