You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/04/14 19:07:01 UTC
svn commit: r1587257 - in /hive/trunk:
hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/
shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/
shims/0.23/src/main/java/org/apache/hadoop/hive/shims/
shims/common/src/main/java/org/apache/...
Author: hashutosh
Date: Mon Apr 14 17:07:00 2014
New Revision: 1587257
URL: http://svn.apache.org/r1587257
Log:
HIVE-6745 : HCat MultiOutputFormat hardcodes DistributedCache keynames (Sushanth Sowmyan via Ashutosh Chauhan)
Modified:
hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java
hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
Modified: hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java?rev=1587257&r1=1587256&r2=1587257&view=diff
==============================================================================
--- hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java (original)
+++ hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/MultiOutputFormat.java Mon Apr 14 17:07:00 2014
@@ -163,8 +163,8 @@ public class MultiOutputFormat extends O
} 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);
}
/**
Modified: hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1587257&r1=1587256&r2=1587257&view=diff
==============================================================================
--- hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original)
+++ hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Mon Apr 14 17:07:00 2014
@@ -353,6 +353,10 @@ public class Hadoop20SShims extends Hado
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 "";
Modified: hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1587257&r1=1587256&r2=1587257&view=diff
==============================================================================
--- hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Mon Apr 14 17:07:00 2014
@@ -450,6 +450,10 @@ public class Hadoop23Shims extends Hadoo
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 "";
Modified: hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1587257&r1=1587256&r2=1587257&view=diff
==============================================================================
--- hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java (original)
+++ hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java Mon Apr 14 17:07:00 2014
@@ -484,7 +484,7 @@ public interface HadoopShims {
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();