You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/04/22 06:11:48 UTC

[19/50] [abbrv] kylin git commit: REVERT KYLIN-1545

REVERT KYLIN-1545


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

Branch: refs/heads/1.5.x-HBase1.1.3
Commit: c86de1a8e8e55b5dbd37bee55b3627ff959f9e91
Parents: 9aeb765
Author: Hongbin Ma <ma...@apache.org>
Authored: Fri Apr 1 14:48:53 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Fri Apr 1 14:48:53 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/common/KylinConfigBase.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/c86de1a8/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 e911dd9..2fe13a0 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
@@ -502,9 +502,10 @@ abstract public class KylinConfigBase implements Serializable {
         return Boolean.parseBoolean(this.getOptional("kylin.dict.growing.enabled", "false"));
     }
 
-    //don't change this per https://issues.apache.org/jira/browse/KYLIN-1545
     public int getHBaseScanMaxResultSize() {
-        return Integer.parseInt(this.getOptional("kylin.hbase.scan.max_result_size", "-1"));
+
+        return Integer.parseInt(this.getOptional("kylin.hbase.scan.max_result_size", "" + (5 * 1024 * 1024))); // 5 MB
+
     }
 
     public int getCubingInMemSamplingPercent() {