Merge commit '1004a853225503e00f48a27949d7e09109e937db'
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/34596d35 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/34596d35 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/34596d35 Branch: refs/heads/2622-2764 Commit: 34596d3553a7694738f48b10d38384c12cb535a3 Parents: 75fbdcf 1004a85 Author: Li Yang <liy...@apache.org> Authored: Sun Sep 3 09:10:43 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Sun Sep 3 09:22:34 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/cube/model/CubeDesc.java | 1 - .../kylin/job/execution/ExecutableManager.java | 11 +++++---- .../engine/mr/common/AbstractHadoopJob.java | 4 +++ .../java/org/apache/kylin/jdbc/KylinClient.java | 2 ++ .../resources/query/sql_derived/query13.sql | 26 -------------------- 5 files changed, 12 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/34596d35/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java ---------------------------------------------------------------------- diff --cc core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java index be523ed,0e22587..3cbba50 --- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java @@@ -189,7 -189,7 +189,6 @@@ public class CubeDesc extends RootPersi @JsonInclude(JsonInclude.Include.NON_NULL) private int parentForward = 3; - // lazy init - // cuboid scheduler lazy built transient private CuboidScheduler cuboidScheduler = null; public boolean isEnableSharding() { http://git-wip-us.apache.org/repos/asf/kylin/blob/34596d35/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java ---------------------------------------------------------------------- diff --cc engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java index 9950c69,54f77c0..081ac93 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java @@@ -501,12 -501,12 +501,16 @@@ public abstract class AbstractHadoopJo // write kylin.properties File kylinPropsFile = new File(metaDir, "kylin.properties"); - kylinConfig.writeProperties(kylinPropsFile); + kylinConfig.exportToFile(kylinPropsFile); + + if (prj != null) { + dumpList.add(ProjectManager.getInstance(kylinConfig).getProject(prj).getResourcePath()); + } + if (prj != null) { + dumpList.add(ProjectManager.getInstance(kylinConfig).getProject(prj).getResourcePath()); + } + // write resources JobRelatedMetaUtil.dumpResources(kylinConfig, metaDir, dumpList); http://git-wip-us.apache.org/repos/asf/kylin/blob/34596d35/kylin-it/src/test/resources/query/sql_derived/query13.sql ---------------------------------------------------------------------- diff --cc kylin-it/src/test/resources/query/sql_derived/query13.sql index 754495f,754495f..0000000 deleted file mode 100755,100755 --- a/kylin-it/src/test/resources/query/sql_derived/query13.sql +++ /dev/null @@@ -1,26 -1,26 +1,0 @@@ ---- ---- Licensed to the Apache Software Foundation (ASF) under one ---- or more contributor license agreements. See the NOTICE file ---- distributed with this work for additional information ---- regarding copyright ownership. The ASF licenses this file ---- to you under the Apache License, Version 2.0 (the ---- "License"); you may not use this file except in compliance ---- with the License. You may obtain a copy of the License at ---- ---- http://www.apache.org/licenses/LICENSE-2.0 ---- ---- Unless required by applicable law or agreed to in writing, software ---- distributed under the License is distributed on an "AS IS" BASIS, ---- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ---- See the License for the specific language governing permissions and ---- limitations under the License. ---- -- --select test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_groupings.meta_categ_name, sum(test_kylin_fact.price) as gmv, count(*) as trans_cnt -- from test_kylin_fact -- inner JOIN edw.test_cal_dt as test_cal_dt -- ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt -- inner JOIN test_category_groupings -- ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id -- where test_cal_dt.week_beg_dt is not null -- group by test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_groupings.meta_categ_name
