revert KYLIN-2483
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ac35cd39 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ac35cd39 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ac35cd39 Branch: refs/heads/master-hbase0.98 Commit: ac35cd39a59cca817d9890181d9a3fb8aca23124 Parents: 3fc6843 Author: Hongbin Ma <[email protected]> Authored: Mon Mar 6 09:35:11 2017 +0800 Committer: Hongbin Ma <[email protected]> Committed: Mon Mar 6 09:35:11 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ---- .../src/main/java/org/apache/kylin/storage/StorageContext.java | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ac35cd39/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 3a87d3d..5d665df 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -816,10 +816,6 @@ abstract public class KylinConfigBase implements Serializable { return Integer.parseInt(getOptional("kylin.query.scan-threshold", "10000000")); } - public int getMergeSortPartitionResultsMinLimit() { - return Integer.parseInt(getOptional("kylin.query.merge-sort-partition-results.min-limit", "100")); - } - public long getQueryMaxScanBytes() { long value = Long.parseLong(getOptional("kylin.query.max-scan-bytes", "0")); return value > 0 ? value : Long.MAX_VALUE; http://git-wip-us.apache.org/repos/asf/kylin/blob/ac35cd39/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java ---------------------------------------------------------------------- diff --git a/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java b/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java index f4211ff..998f1db 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java @@ -20,7 +20,6 @@ package org.apache.kylin.storage; import java.util.concurrent.atomic.AtomicLong; -import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.debug.BackdoorToggles; import org.apache.kylin.cube.cuboid.Cuboid; import org.apache.kylin.metadata.realization.IRealization; @@ -135,8 +134,7 @@ public class StorageContext { } public static boolean mergeSortPartitionResults(int finalPushDownLimit) { - return isValidPushDownLimit(finalPushDownLimit) && // - (finalPushDownLimit > KylinConfig.getInstanceFromEnv().getMergeSortPartitionResultsMinLimit()); + return isValidPushDownLimit(finalPushDownLimit); } public long getDeadline() {
