Merge commit '79c75015e49b2216f6e8ca9ec0cedbff72737821'
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/92b64043 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/92b64043 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/92b64043 Branch: refs/heads/KYLIN-2606 Commit: 92b640437ca09ba75fc7bce6407cf722f4f4dd8b Parents: 34a65ba 79c7501 Author: Hongbin Ma <mahong...@apache.org> Authored: Tue May 23 20:34:28 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Tue May 23 20:34:28 2017 +0800 ---------------------------------------------------------------------- .../kylin/dict/BuiltInFunctionTransformer.java | 2 + .../kylin/metadata/filter/CaseTupleFilter.java | 52 ++++- .../metadata/filter/CompareTupleFilter.java | 29 ++- .../filter/FilterOptimizeTransformer.java | 88 +++++--- .../filter/IOptimizeableTupleFilter.java | 22 ++ .../filter/ITupleFilterTransformer.java | 5 + .../metadata/filter/LogicalTupleFilter.java | 27 ++- .../kylin/metadata/filter/TupleFilter.java | 1 - .../apache/kylin/metadata/model/TblColRef.java | 20 +- .../kylin/metadata/realization/SQLDigest.java | 2 + .../gtrecord/GTCubeStorageQueryBase.java | 27 +-- .../resources/query/sql_subquery/query30.sql | 15 ++ .../resources/query/sql_subquery/query31.sql | 19 ++ .../resources/query/sql_subquery/query32.sql | 14 ++ .../resources/query/sql_subquery/query33.sql | 14 ++ .../resources/query/sql_subquery/query34.sql | 14 ++ .../kylin/query/relnode/OLAPFilterRel.java | 2 +- .../apache/kylin/query/relnode/OLAPJoinRel.java | 13 ++ .../kylin/query/relnode/OLAPProjectRel.java | 61 ++++- .../org/apache/kylin/query/relnode/OLAPRel.java | 31 +-- .../kylin/query/relnode/OLAPTableScan.java | 29 ++- .../relnode/OLAPToEnumerableConverter.java | 11 +- .../kylin/query/routing/ModelChooser.java | 219 ------------------ .../apache/kylin/query/routing/QueryRouter.java | 2 +- .../kylin/query/routing/RealizationChooser.java | 224 +++++++++++++++++++ .../kylin/rest/controller/UserController.java | 4 +- 26 files changed, 634 insertions(+), 313 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/92b64043/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java ---------------------------------------------------------------------- diff --cc core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java index 5faa098,b4e9d47..a8c4872 --- 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 @@@ -85,7 -86,7 +86,6 @@@ public abstract class GTCubeStorageQuer } scanner = new CubeSegmentScanner(cubeSeg, request.getCuboid(), request.getDimensions(), request.getGroups(), request.getMetrics(), request.getFilter(), request.getHavingFilter(), request.getContext()); - - if (!scanner.isSegmentSkipped()) scanners.add(scanner); } @@@ -455,7 -458,7 +457,6 @@@ } aggrOutCol.getColumnDesc().setId("" + (aggrIdxAmongMetrics + 1)); } - - return havingFilter; }
