You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/05/23 16:00:38 UTC
git commit: HBASE-11104 Addendum to fix compilation on hadoop-1
Repository: hbase
Updated Branches:
refs/heads/0.98 796134e9f -> ef0ee0ff6
HBASE-11104 Addendum to fix compilation on hadoop-1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ef0ee0ff
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ef0ee0ff
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ef0ee0ff
Branch: refs/heads/0.98
Commit: ef0ee0ff697192b6202ff62766370fbc9f3dfe38
Parents: 796134e
Author: Ted Yu <te...@apache.org>
Authored: Fri May 23 14:00:00 2014 +0000
Committer: Ted Yu <te...@apache.org>
Committed: Fri May 23 14:00:00 2014 +0000
----------------------------------------------------------------------
.../apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java | 3 ++-
.../main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ef0ee0ff/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
index 1be8f01..1d66268 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
@@ -51,6 +51,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobClient;
+import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.OutputCommitter;
@@ -368,7 +369,7 @@ public class IntegrationTestImportTsv implements Configurable, Tool {
TableMapReduceUtil.addDependencyJars(job);
addTestDependencyJars(job.getConfiguration());
TableMapReduceUtil.initCredentials(job);
- JobClient jc = new JobClient(job.getConfiguration());
+ JobClient jc = new JobClient(new JobConf(job.getConfiguration()));
job.getCredentials().addToken(new Text("my_mr_token"),
jc.getDelegationToken(new Text("renewer")));
http://git-wip-us.apache.org/repos/asf/hbase/blob/ef0ee0ff/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
index 4d7cd5a..b273e3b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.mapreduce;
import static java.lang.String.format;
-import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
@@ -425,7 +424,7 @@ public class ImportTsv extends Configured implements Tool {
String columns[] = conf.getStrings(COLUMNS_CONF_KEY);
if(StringUtils.isNotEmpty(conf.get(CREDENTIALS_LOCATION))) {
String fileLoc = conf.get(CREDENTIALS_LOCATION);
- Credentials cred = Credentials.readTokenStorageFile(new File(fileLoc), conf);
+ Credentials cred = Credentials.readTokenStorageFile(new Path(fileLoc), conf);
job.getCredentials().addAll(cred);
}