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/05/08 13:29:54 UTC
[27/50] [abbrv] kylin git commit: KYLIN-1418 don’t be so smart
KYLIN-1418 don\u2019t be so smart
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a1032bdf
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a1032bdf
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a1032bdf
Branch: refs/heads/1.5.x-HBase1.x
Commit: a1032bdf690e316900534c525a36d00031bf16c3
Parents: 2d14275
Author: shaofengshi <sh...@apache.org>
Authored: Tue May 3 19:18:30 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue May 3 19:18:30 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/engine/mr/steps/SaveStatisticsStep.java | 2 +-
.../cube_desc/test_kylin_cube_with_slr_left_join_desc.json | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a1032bdf/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SaveStatisticsStep.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SaveStatisticsStep.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SaveStatisticsStep.java
index 7d5e178..721cd35 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SaveStatisticsStep.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/SaveStatisticsStep.java
@@ -100,7 +100,7 @@ public class SaveStatisticsStep extends AbstractExecutable {
}
}
- if (memoryHungryMeasures > 4 || (kylinConf.isDevEnv() && memoryHungryMeasures > 0)) {
+ if (memoryHungryMeasures > 0) {
alg = AlgorithmEnum.LAYER;
} else if ("random".equalsIgnoreCase(algPref)) { // for testing
alg = new Random().nextBoolean() ? AlgorithmEnum.INMEM : AlgorithmEnum.LAYER;
http://git-wip-us.apache.org/repos/asf/kylin/blob/a1032bdf/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
index 608b9de..94bc406 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
@@ -262,5 +262,8 @@
"retention_range": 0,
"engine_type": 2,
"storage_type": 2,
+ "override_kylin_properties": {
+ "kylin.cube.algorithm": "INMEM"
+ },
"partition_date_start": 0
}
\ No newline at end of file