Repository: kylin Updated Branches: refs/heads/master-hbase0.98 de4ddd143 -> ab000ea67 (forced update)
minor, refine GTCubeStorageQueryRequest Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d216e223 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d216e223 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d216e223 Branch: refs/heads/master-hbase0.98 Commit: d216e223b0d1ef67aaa93aa820a11f04ac69cb2e Parents: 9250d9b Author: lidongsjtu <lid...@apache.org> Authored: Fri Mar 31 22:57:52 2017 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Fri Mar 31 22:57:52 2017 +0800 ---------------------------------------------------------------------- .../kylin/storage/gtrecord/GTCubeStorageQueryBase.java | 2 +- .../storage/gtrecord/GTCubeStorageQueryRequest.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/d216e223/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 065fd6e..083080c 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 @@ -150,7 +150,7 @@ public abstract class GTCubeStorageQueryBase implements IStorageQuery { logger.info("Cuboid identified: cube={}, cuboidId={}, groupsD={}, filterD={}, limitPushdown={}, storageAggr={}", cubeInstance.getName(), cuboid.getId(), groupsD, filterColumnD, context.getFinalPushDownLimit(), context.isNeedStorageAggregation()); - return new GTCubeStorageQueryRequest(cuboid, dimensionsD, groupsD, metrics, filterD, context); + return new GTCubeStorageQueryRequest(cuboid, dimensionsD, groupsD, filterColumnD, metrics, filterD, context); } protected abstract String getGTStorage(); http://git-wip-us.apache.org/repos/asf/kylin/blob/d216e223/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryRequest.java ---------------------------------------------------------------------- diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryRequest.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryRequest.java index c4d81d2..68f755c 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryRequest.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryRequest.java @@ -31,14 +31,16 @@ public class GTCubeStorageQueryRequest implements Serializable { private Cuboid cuboid; private Set<TblColRef> dimensions; private Set<TblColRef> groups; + private Set<TblColRef> filterCols; private Set<FunctionDesc> metrics; private TupleFilter filter; private StorageContext context; - public GTCubeStorageQueryRequest(Cuboid cuboid, Set<TblColRef> dimensions, Set<TblColRef> groups, Set<FunctionDesc> metrics, TupleFilter filter, StorageContext context) { + public GTCubeStorageQueryRequest(Cuboid cuboid, Set<TblColRef> dimensions, Set<TblColRef> groups, Set<TblColRef> filterCols, Set<FunctionDesc> metrics, TupleFilter filter, StorageContext context) { this.cuboid = cuboid; this.dimensions = dimensions; this.groups = groups; + this.filterCols = filterCols; this.metrics = metrics; this.filter = filter; this.context = context; @@ -91,4 +93,12 @@ public class GTCubeStorageQueryRequest implements Serializable { public void setContext(StorageContext context) { this.context = context; } + + public Set<TblColRef> getFilterCols() { + return filterCols; + } + + public void setFilterCols(Set<TblColRef> filterCols) { + this.filterCols = filterCols; + } }