Repository: kylin Updated Branches: refs/heads/1.x-staging b507b44f2 -> 05df71369
Add conf/kylin_job_conf.xml for HiveColumnCardinalityJob Signed-off-by: shaofengshi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/05df7136 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/05df7136 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/05df7136 Branch: refs/heads/1.x-staging Commit: 05df71369f53673aea6134dd74138e7c11edeac0 Parents: b507b44 Author: John Zhao <[email protected]> Authored: Tue Feb 2 13:55:28 2016 +0800 Committer: shaofengshi <[email protected]> Committed: Wed Feb 3 10:23:06 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/job/engine/JobEngineConfig.java | 2 +- .../kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/05df7136/job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java ---------------------------------------------------------------------- diff --git a/job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java b/job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java index 75d897e..8edc8a0 100644 --- a/job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java +++ b/job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java @@ -53,7 +53,7 @@ public class JobEngineConfig { private String getHadoopJobConfFilePath(RealizationCapacity capaticy, boolean appendSuffix) throws IOException { String hadoopJobConfFile; - if (appendSuffix) { + if (capaticy != null && appendSuffix) { hadoopJobConfFile = (HADOOP_JOB_CONF_FILENAME + "_" + capaticy.toString().toLowerCase() + ".xml"); } else { hadoopJobConfFile = (HADOOP_JOB_CONF_FILENAME + ".xml"); http://git-wip-us.apache.org/repos/asf/kylin/blob/05df7136/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java ---------------------------------------------------------------------- diff --git a/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java b/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java index cf1871f..f27d074 100644 --- a/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java +++ b/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java @@ -30,8 +30,10 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat; import org.apache.hive.hcatalog.mapreduce.HCatInputFormat; +import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.HadoopUtil; import org.apache.kylin.job.constant.BatchConstants; +import org.apache.kylin.job.engine.JobEngineConfig; import org.apache.kylin.job.hadoop.AbstractHadoopJob; /** @@ -65,6 +67,10 @@ public class HiveColumnCardinalityJob extends AbstractHadoopJob { String jobName = JOB_TITLE + getOptionsAsString(); System.out.println("Starting: " + jobName); Configuration conf = getConf(); + + JobEngineConfig jobEngineConfig = new JobEngineConfig(KylinConfig.getInstanceFromEnv()); + conf.addResource(jobEngineConfig.getHadoopJobConfFilePath(null)); + job = Job.getInstance(conf, jobName); setJobClasspath(job);
