Repository: kylin Updated Branches: refs/heads/yang-m1 3aad1fc60 -> ae51cf5cf
KYLIN-1595 columns in metric could also be in filter/groupby Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ae51cf5c Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ae51cf5c Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ae51cf5c Branch: refs/heads/yang-m1 Commit: ae51cf5cf924e1d7c374c96b224eea8e3bd371e6 Parents: 3aad1fc Author: Hongbin Ma <[email protected]> Authored: Mon Apr 18 18:27:05 2016 +0800 Committer: Hongbin Ma <[email protected]> Committed: Mon Apr 18 18:28:35 2016 +0800 ---------------------------------------------------------------------- .../localmeta/cube_desc/test_kylin_cube_with_slr_desc.json | 2 +- .../org/apache/kylin/storage/hbase/cube/v2/CubeStorageQuery.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ae51cf5c/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json index 417eb5c..7db40ec 100644 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json +++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json @@ -158,7 +158,7 @@ "includes" : [ "cal_dt", "categ_lvl2_name", "categ_lvl3_name", "leaf_categ_id", "lstg_format_name", "lstg_site_id", "meta_categ_name", "seller_id", "slr_segment_cd" ], "select_rule" : { "hierarchy_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME" ] ], - "mandatory_dims" : [ "seller_id" ], + "mandatory_dims" : [], "joint_dims" : [ [ "lstg_format_name", "lstg_site_id", "slr_segment_cd" ] ] } } ], http://git-wip-us.apache.org/repos/asf/kylin/blob/ae51cf5c/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeStorageQuery.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeStorageQuery.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeStorageQuery.java index 863dd67..577b2e6 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeStorageQuery.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeStorageQuery.java @@ -136,7 +136,7 @@ public class CubeStorageQuery implements IStorageQuery { for (TblColRef column : sqlDigest.allColumns) { // skip measure columns - if (sqlDigest.metricColumns.contains(column)) { + if (sqlDigest.metricColumns.contains(column) && !(sqlDigest.groupbyColumns.contains(column) || sqlDigest.filterColumns.contains(column))) { continue; }
