minor, fix bug "is not null" filter not working on derived dim
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8307ff4d Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8307ff4d Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8307ff4d Branch: refs/heads/2.1.x Commit: 8307ff4d398584a616b81271438ecdc78d1f2779 Parents: e58951f Author: Roger Shi <rogershijich...@hotmail.com> Authored: Thu Jul 13 14:18:55 2017 +0800 Committer: Roger Shi <rogershijich...@hotmail.com> Committed: Thu Jul 13 15:40:10 2017 +0800 ---------------------------------------------------------------------- .../gtrecord/GTCubeStorageQueryBase.java | 2 +- .../resources/query/sql_derived/query13.sql | 26 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8307ff4d/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java ---------------------------------------------------------------------- diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java index f89fc47..10f735e 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java @@ -305,7 +305,7 @@ public abstract class GTCubeStorageQueryBase implements IStorageQuery { } private TupleFilter translateDerivedInCompare(CompareTupleFilter compf, Set<TblColRef> collector) { - if (compf.getColumn() == null || compf.getValues().isEmpty()) + if (compf.getColumn() == null) return compf; TblColRef derived = compf.getColumn(); http://git-wip-us.apache.org/repos/asf/kylin/blob/8307ff4d/kylin-it/src/test/resources/query/sql_derived/query13.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_derived/query13.sql b/kylin-it/src/test/resources/query/sql_derived/query13.sql new file mode 100755 index 0000000..754495f --- /dev/null +++ b/kylin-it/src/test/resources/query/sql_derived/query13.sql @@ -0,0 +1,26 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +select test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_groupings.meta_categ_name, sum(test_kylin_fact.price) as gmv, count(*) as trans_cnt + 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 + where test_cal_dt.week_beg_dt is not null + group by test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_groupings.meta_categ_name \ No newline at end of file