You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/09/18 05:44:17 UTC

[24/29] kylin git commit: KYLIN-2844 override max-visit-scanrange and max-fuzzykey-scan at cube level

KYLIN-2844 override max-visit-scanrange and max-fuzzykey-scan at cube level

Signed-off-by: Li Yang <li...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/19101456
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/19101456
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/19101456

Branch: refs/heads/security_update
Commit: 191014568967d9517549ecc76f1d5ecc2f5ff011
Parents: 876811f
Author: gaodayue <ga...@meituan.com>
Authored: Tue Sep 5 14:45:25 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Sun Sep 17 21:34:38 2017 +0800

----------------------------------------------------------------------
 .../apache/kylin/storage/gtrecord/CubeScanRangePlanner.java    | 4 ++--
 .../org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/19101456/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java
----------------------------------------------------------------------
diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java
index 14af5ac..7e6f7c4 100644
--- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java
+++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java
@@ -76,8 +76,8 @@ public class CubeScanRangePlanner extends ScanRangePlannerBase {
             Collection<FunctionDesc> metrics, TupleFilter havingFilter, StorageContext context) {
         this.context = context;
 
-        this.maxScanRanges = KylinConfig.getInstanceFromEnv().getQueryStorageVisitScanRangeMax();
-        this.maxFuzzyKeys = KylinConfig.getInstanceFromEnv().getQueryScanFuzzyKeyMax();
+        this.maxScanRanges = cubeSegment.getConfig().getQueryStorageVisitScanRangeMax();
+        this.maxFuzzyKeys = cubeSegment.getConfig().getQueryScanFuzzyKeyMax();
 
         this.cubeSegment = cubeSegment;
         this.cubeDesc = cubeSegment.getCubeDesc();

http://git-wip-us.apache.org/repos/asf/kylin/blob/19101456/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java
index db81646..188f554 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java
@@ -277,8 +277,10 @@ public abstract class CubeHBaseRPC implements IGTStorage {
         info.append(Bytes.toStringBinary(rawScan.endKey) + ")");
         if (rawScan.fuzzyKeys != null && rawScan.fuzzyKeys.size() != 0) {
             info.append(" Fuzzy key counts: " + rawScan.fuzzyKeys.size());
-            info.append(". Fuzzy keys : ");
-            info.append(rawScan.getFuzzyKeyAsString());
+            if (rawScan.fuzzyKeys.size() <= 20) { // avoid logging too many fuzzy keys
+                info.append(". Fuzzy keys : ");
+                info.append(rawScan.getFuzzyKeyAsString());
+            }
         } else {
             info.append(", No Fuzzy Key");
         }