You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/11/08 09:01:17 UTC
svn commit: r1637522 - in /hive/branches/branch-0.14:
hbase-handler/src/java/org/apache/hadoop/hive/hbase/
shims/0.20/src/main/java/org/apache/hadoop/hive/shims/
shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/
shims/0.23/src/main/java/org/apach...
Author: gunther
Date: Sat Nov 8 08:01:16 2014
New Revision: 1637522
URL: http://svn.apache.org/r1637522
Log:
HIVE-8782: HBase handler doesn't compile with hadoop-1 (Jimmy Xiang, reviewed by Xuefu and Sergey)
Modified:
hive/branches/branch-0.14/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
hive/branches/branch-0.14/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
hive/branches/branch-0.14/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
hive/branches/branch-0.14/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
hive/branches/branch-0.14/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
Modified: hive/branches/branch-0.14/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java?rev=1637522&r1=1637521&r2=1637522&view=diff
==============================================================================
--- hive/branches/branch-0.14/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java (original)
+++ hive/branches/branch-0.14/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java Sat Nov 8 08:01:16 2014
@@ -59,6 +59,7 @@ import org.apache.hadoop.hive.ql.plan.Ex
import org.apache.hadoop.hive.ql.plan.TableDesc;
import org.apache.hadoop.hive.serde2.Deserializer;
import org.apache.hadoop.hive.serde2.SerDe;
+import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.OutputFormat;
@@ -479,7 +480,7 @@ public class HBaseStorageHandler extends
// Get credentials using the configuration instance which has HBase properties
JobConf hbaseJobConf = new JobConf(getConf());
org.apache.hadoop.hbase.mapred.TableMapReduceUtil.initCredentials(hbaseJobConf);
- jobConf.getCredentials().mergeAll(hbaseJobConf.getCredentials());
+ ShimLoader.getHadoopShims().mergeCredentials(jobConf, hbaseJobConf);
} catch (Exception e) {
throw new RuntimeException(e);
}
Modified: hive/branches/branch-0.14/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java?rev=1637522&r1=1637521&r2=1637522&view=diff
==============================================================================
--- hive/branches/branch-0.14/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java (original)
+++ hive/branches/branch-0.14/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java Sat Nov 8 08:01:16 2014
@@ -899,6 +899,11 @@ public class Hadoop20Shims implements Ha
throw new IOException("Merging of credentials not supported in this version of hadoop");
}
+ @Override
+ public void mergeCredentials(JobConf dest, JobConf src) throws IOException {
+ throw new IOException("Merging of credentials not supported in this version of hadoop");
+ }
+
protected void run(FsShell shell, String[] command) throws Exception {
LOG.debug(ArrayUtils.toString(command));
shell.run(command);
Modified: hive/branches/branch-0.14/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1637522&r1=1637521&r2=1637522&view=diff
==============================================================================
--- hive/branches/branch-0.14/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original)
+++ hive/branches/branch-0.14/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Sat Nov 8 08:01:16 2014
@@ -523,6 +523,11 @@ public class Hadoop20SShims extends Hado
}
@Override
+ public void mergeCredentials(JobConf dest, JobConf src) throws IOException {
+ throw new IOException("Merging of credentials not supported in this version of hadoop");
+ }
+
+ @Override
public String getPassword(Configuration conf, String name) {
// No password API, just retrieve value from conf
return conf.get(name);
Modified: hive/branches/branch-0.14/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1637522&r1=1637521&r2=1637522&view=diff
==============================================================================
--- hive/branches/branch-0.14/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/branches/branch-0.14/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Sat Nov 8 08:01:16 2014
@@ -755,6 +755,11 @@ public class Hadoop23Shims extends Hadoo
jobConf.getCredentials().mergeAll(UserGroupInformation.getCurrentUser().getCredentials());
}
+ @Override
+ public void mergeCredentials(JobConf dest, JobConf src) throws IOException {
+ dest.getCredentials().mergeAll(src.getCredentials());
+ }
+
protected static final Method accessMethod;
protected static final Method getPasswordMethod;
Modified: hive/branches/branch-0.14/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1637522&r1=1637521&r2=1637522&view=diff
==============================================================================
--- hive/branches/branch-0.14/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java (original)
+++ hive/branches/branch-0.14/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java Sat Nov 8 08:01:16 2014
@@ -703,6 +703,8 @@ public interface HadoopShims {
public void getMergedCredentials(JobConf jobConf) throws IOException;
+ public void mergeCredentials(JobConf dest, JobConf src) throws IOException;
+
/**
* Check if the configured UGI has access to the path for the given file system action.
* Method will return successfully if action is permitted. AccessControlExceptoin will