diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java index ab0e1ab..69a7345 100644 --- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java +++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java @@ -163,8 +163,8 @@ } else { fileSep = System.getProperty("path.separator"); } - configsToMerge.put("mapred.job.classpath.archives", fileSep); - configsToMerge.put("mapred.job.classpath.files", fileSep); + configsToMerge.put(ShimLoader.getHadoopShims().getHCatShim().getPropertyName(HadoopShims.HCatHadoopShims.PropertyName.CLASSPATH_ARCHIVES), fileSep); + configsToMerge.put(ShimLoader.getHadoopShims().getHCatShim().getPropertyName(HadoopShims.HCatHadoopShims.PropertyName.CLASSPATH_FILES), fileSep); } /** diff --git a/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java b/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java index 756d463..cb7fe4c 100644 --- a/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java +++ b/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java @@ -350,6 +350,10 @@ public String getPropertyName(PropertyName name) { return DistributedCache.CACHE_FILES; case CACHE_SYMLINK: return DistributedCache.CACHE_SYMLINK; + case CLASSPATH_ARCHIVES: + return "mapred.job.classpath.archives"; + case CLASSPATH_FILES: + return "mapred.job.classpath.files"; } return ""; diff --git a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java index 4cf3beb..c185daf 100644 --- a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java +++ b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java @@ -447,6 +447,10 @@ public String getPropertyName(PropertyName name) { return MRJobConfig.CACHE_FILES; case CACHE_SYMLINK: return MRJobConfig.CACHE_SYMLINK; + case CLASSPATH_ARCHIVES: + return MRJobConfig.CLASSPATH_ARCHIVES; + case CLASSPATH_FILES: + return MRJobConfig.CLASSPATH_FILES; } return ""; diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java b/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java index ed951f1..24e0fd5 100644 --- a/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java +++ b/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java @@ -468,7 +468,7 @@ RecordReader getRecordReader(JobConf job, InputSplitShim split, Reporter reporte public HCatHadoopShims getHCatShim(); public interface HCatHadoopShims { - enum PropertyName {CACHE_ARCHIVES, CACHE_FILES, CACHE_SYMLINK} + enum PropertyName {CACHE_ARCHIVES, CACHE_FILES, CACHE_SYMLINK, CLASSPATH_ARCHIVES, CLASSPATH_FILES} public TaskID createTaskID();