You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/10/28 08:16:45 UTC
[2/3] incubator-kylin git commit: KYLIN-942 make sure only trimmed
gtinfo is pushed
KYLIN-942 make sure only trimmed gtinfo is pushed
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/4731f583
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/4731f583
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/4731f583
Branch: refs/heads/2.x-staging
Commit: 4731f583d054aedea7ff58e8cbe99d2538fb06be
Parents: ef2cc71
Author: honma <ho...@ebay.com>
Authored: Wed Oct 28 15:20:23 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Wed Oct 28 15:20:23 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/gridtable/GTScanRange.java | 15 +++++----------
.../storage/hbase/cube/v2/CubeSegmentScanner.java | 2 +-
2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4731f583/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRange.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRange.java b/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRange.java
index d5fa6c0..87f51df 100644
--- a/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRange.java
+++ b/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRange.java
@@ -3,9 +3,6 @@ package org.apache.kylin.gridtable;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Nullable;
-
-import com.google.common.base.Function;
import com.google.common.collect.Lists;
public class GTScanRange {
@@ -28,15 +25,13 @@ public class GTScanRange {
}
public GTScanRange replaceGTInfo(final GTInfo gtInfo) {
+ List<GTRecord> newFuzzyKeys = Lists.newArrayList();
+ for (GTRecord input : fuzzyKeys) {
+ newFuzzyKeys.add(new GTRecord(gtInfo, input.maskForEqualHashComp(), input.cols));
+ }
return new GTScanRange(new GTRecord(gtInfo, pkStart.maskForEqualHashComp(), pkStart.cols), //
new GTRecord(gtInfo, pkEnd.maskForEqualHashComp(), pkEnd.cols), //
- Lists.transform(fuzzyKeys, new Function<GTRecord, GTRecord>() {
- @Nullable
- @Override
- public GTRecord apply(GTRecord input) {
- return new GTRecord(gtInfo, input.maskForEqualHashComp(), input.cols);
- }
- }));
+ newFuzzyKeys);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4731f583/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
index 18ba6fb..1eed318 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
@@ -83,7 +83,7 @@ public class CubeSegmentScanner implements IGTScanner {
GTInfo trimmedInfo = GTInfo.deserialize(trimmedInfoBytes);
for (GTScanRange range : scanRanges) {
- scanRequests.add(new GTScanRequest(trimmedInfo, range,//range.replaceGTInfo(trimmedInfo),
+ scanRequests.add(new GTScanRequest(trimmedInfo, range.replaceGTInfo(trimmedInfo),
gtDimensions, gtAggrGroups, gtAggrMetrics, gtAggrFuncs, gtFilter, allowPreAggregate));
}