From 8dcedd878fdc86f5f9f9f2fa8865f15b7d530620 Mon Sep 17 00:00:00 2001 From: gaodayue Date: Tue, 5 Sep 2017 14:45:25 +0800 Subject: [PATCH] KYLIN-2844 override max-visit-scanrange and max-fuzzykey-scan at cube level --- .../org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java | 4 ++-- .../java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 cecea8587..42d11bfa6 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 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(); 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 db81646ab..188f55405 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"); } -- 2.11.0 (Apple Git-81)