KYLIN-2165 use cube specific configs for hive job and use lowercase tablename
Signed-off-by: gaodayue <gaoda...@meituan.com> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7129ea65 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7129ea65 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7129ea65 Branch: refs/heads/master-hbase0.98 Commit: 7129ea650e757d6c50a81823760c45734688cfd2 Parents: 4ae40bd Author: gaodayue <gaoda...@meituan.com> Authored: Thu Apr 6 13:55:27 2017 +0800 Committer: gaodayue <gaoda...@meituan.com> Committed: Thu Apr 6 20:38:03 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java | 4 ++-- .../src/main/java/org/apache/kylin/source/hive/HiveMRInput.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/7129ea65/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java index 2a68116..f607466 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java @@ -63,9 +63,9 @@ public class CubeJoinedFlatTableDesc implements IJoinedFlatTableDesc, java.io.Se protected String makeTableName(CubeDesc cubeDesc, CubeSegment cubeSegment) { if (cubeSegment == null) { - return "kylin_intermediate_" + cubeDesc.getName(); + return "kylin_intermediate_" + cubeDesc.getName().toLowerCase(); } else { - return "kylin_intermediate_" + cubeDesc.getName() + "_" + cubeSegment.getUuid().replaceAll("-", "_"); + return "kylin_intermediate_" + cubeDesc.getName().toLowerCase() + "_" + cubeSegment.getUuid().replaceAll("-", "_"); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/7129ea65/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java ---------------------------------------------------------------------- diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java index a5d1353..0a03461 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java @@ -127,12 +127,11 @@ public class HiveMRInput implements IMRInput { public static class BatchCubingInputSide implements IMRBatchCubingInputSide { - final JobEngineConfig conf; + JobEngineConfig conf; final IJoinedFlatTableDesc flatDesc; String hiveViewIntermediateTables = ""; public BatchCubingInputSide(IJoinedFlatTableDesc flatDesc) { - this.conf = new JobEngineConfig(KylinConfig.getInstanceFromEnv()); this.flatDesc = flatDesc; } @@ -140,6 +139,7 @@ public class HiveMRInput implements IMRInput { public void addStepPhase1_CreateFlatTable(DefaultChainedExecutable jobFlow) { final String cubeName = CubingExecutableUtil.getCubeName(jobFlow.getParams()); final KylinConfig kylinConfig = CubeManager.getInstance(conf.getConfig()).getCube(cubeName).getConfig(); + this.conf = new JobEngineConfig(kylinConfig); // create flat table first, then count and redistribute jobFlow.addTask(createFlatHiveTableStep(conf, flatDesc, jobFlow.getId(), cubeName));
