You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ni...@apache.org on 2020/03/30 13:45:33 UTC
[kylin] branch master updated: KYLIN-4437: repalce deprecated
mapred.job.name & set cube in hive mr name
This is an automated email from the ASF dual-hosted git repository.
nic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 4836f25 KYLIN-4437: repalce deprecated mapred.job.name & set cube in hive mr name
4836f25 is described below
commit 4836f253504dae4f373e46c2277ebca136e88fd1
Author: Zhou Kang <zh...@xiaomi.com>
AuthorDate: Sat Mar 28 13:14:57 2020 +0800
KYLIN-4437: repalce deprecated mapred.job.name & set cube in hive mr name
---
.../src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java | 2 +-
.../src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java | 2 +-
.../main/java/org/apache/kylin/source/hive/CreateFlatHiveTableStep.java | 2 +-
.../org/apache/kylin/source/hive/RedistributeFlatHiveTableStep.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java b/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java
index 99a4006..e3e2474 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java
@@ -52,7 +52,7 @@ public class HiveCmdBuilder {
hiveConfProps = SourceConfigurationUtil.loadHiveConfiguration();
hiveConfProps.putAll(kylinConfig.getHiveConfigOverride());
if (StringUtils.isNotEmpty(jobName)) {
- addStatement("set mapred.job.name='" + jobName + "';");
+ addStatement("set mapreduce.job.name=" + jobName + ";");
}
}
diff --git a/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java b/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java
index a1b78db..8166267 100644
--- a/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java
+++ b/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java
@@ -66,7 +66,7 @@ public class HiveCmdBuilderTest {
hiveCmdBuilder.setHiveConfProps(hiveProps);
hiveCmdBuilder.overwriteHiveProps(hivePropsOverwrite);
assertEquals(
- "hive -e \"set mapred.job.name='test HiveCLI';\nUSE default;\nDROP TABLE \\`test\\`;\nSHOW\n TABLES;\n\" --hiveconf hive.execution.engine=tez",
+ "hive -e \"set mapreduce.job.name=test HiveCLI;\nUSE default;\nDROP TABLE \\`test\\`;\nSHOW\n TABLES;\n\" --hiveconf hive.execution.engine=tez",
hiveCmdBuilder.build());
}
diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/CreateFlatHiveTableStep.java b/source-hive/src/main/java/org/apache/kylin/source/hive/CreateFlatHiveTableStep.java
index 266e75d..0840356 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/CreateFlatHiveTableStep.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/CreateFlatHiveTableStep.java
@@ -47,7 +47,7 @@ public class CreateFlatHiveTableStep extends AbstractExecutable {
private static final Pattern HDFS_LOCATION = Pattern.compile("LOCATION \'(.*)\';");
protected void createFlatHiveTable(KylinConfig config) throws IOException {
- final HiveCmdBuilder hiveCmdBuilder = new HiveCmdBuilder(getName());
+ final HiveCmdBuilder hiveCmdBuilder = new HiveCmdBuilder(getName() + " " + getCubeName() + " " + getId());
hiveCmdBuilder.overwriteHiveProps(config.getHiveConfigOverride());
hiveCmdBuilder.addStatement(getInitStatement());
hiveCmdBuilder.addStatement(getCreateTableStatement());
diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/RedistributeFlatHiveTableStep.java b/source-hive/src/main/java/org/apache/kylin/source/hive/RedistributeFlatHiveTableStep.java
index 731859b..406a2a7 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/RedistributeFlatHiveTableStep.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/RedistributeFlatHiveTableStep.java
@@ -45,7 +45,7 @@ public class RedistributeFlatHiveTableStep extends AbstractExecutable {
}
private void redistributeTable(KylinConfig config, int numReducers) throws IOException {
- final HiveCmdBuilder hiveCmdBuilder = new HiveCmdBuilder(getName());
+ final HiveCmdBuilder hiveCmdBuilder = new HiveCmdBuilder(getName() + " " + getCubeName() + " " + getId());
hiveCmdBuilder.overwriteHiveProps(config.getHiveConfigOverride());
hiveCmdBuilder.addStatement(getInitStatement());
hiveCmdBuilder.addStatement("set mapreduce.job.reduces=" + numReducers + ";\n");