Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EF9F0200AE9 for ; Tue, 3 May 2016 13:18:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EEB121609F3; Tue, 3 May 2016 13:18:30 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 237FF1609F7 for ; Tue, 3 May 2016 13:18:29 +0200 (CEST) Received: (qmail 62660 invoked by uid 500); 3 May 2016 11:18:29 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 62604 invoked by uid 99); 3 May 2016 11:18:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 11:18:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 14586E0381; Tue, 3 May 2016 11:18:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: shaofengshi@apache.org To: commits@kylin.apache.org Date: Tue, 03 May 2016 11:18:33 -0000 Message-Id: <310332df61884f7ea98bf47eb8b96d0e@git.apache.org> In-Reply-To: <1216516c8e3746218e18e2761a98d403@git.apache.org> References: <1216516c8e3746218e18e2761a98d403@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B5/5=5D_kylin_git_commit=3A_KYLIN-1418_don=E2=80=99t_b?= =?utf-8?q?e_so_smart?= archived-at: Tue, 03 May 2016 11:18:31 -0000 KYLIN-1418 don’t 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/master Commit: a1032bdf690e316900534c525a36d00031bf16c3 Parents: 2d14275 Author: shaofengshi Authored: Tue May 3 19:18:30 2016 +0800 Committer: shaofengshi 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