hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerry...@apache.org
Subject hbase git commit: HBASE-14024 ImportTsv is not loading hbase-default.xml (Ashish Singhi)
Date Tue, 28 Jul 2015 18:51:35 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 1d4c2452e -> d2fbaf267


HBASE-14024 ImportTsv is not loading hbase-default.xml (Ashish Singhi)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d2fbaf26
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d2fbaf26
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d2fbaf26

Branch: refs/heads/master
Commit: d2fbaf267e9388ea7ad51f0b9548dab75c9e6945
Parents: 1d4c245
Author: Jerry He <jerryjch@apache.org>
Authored: Tue Jul 28 11:51:25 2015 -0700
Committer: Jerry He <jerryjch@apache.org>
Committed: Tue Jul 28 11:51:25 2015 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/mapreduce/IndexBuilder.java     |  2 +-
 .../apache/hadoop/hbase/mapreduce/ImportTsv.java | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d2fbaf26/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
b/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
index 758ecb8..07c1755 100644
--- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
+++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java
@@ -149,7 +149,7 @@ public class IndexBuilder extends Configured implements Tool {
   }
 
   public static void main(String[] args) throws Exception {
-    int result = ToolRunner.run(new Configuration(), new IndexBuilder(), args);
+    int result = ToolRunner.run(HBaseConfiguration.create(), new IndexBuilder(), args);
     System.exit(result);
   }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/d2fbaf26/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 d700121..c098631 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,9 +20,11 @@ package org.apache.hadoop.hbase.mapreduce;
 
 import static java.lang.String.format;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
@@ -30,6 +32,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HTableDescriptor;
@@ -58,11 +61,9 @@ import org.apache.hadoop.security.Credentials;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
 
 /**
  * Tool to import data from a TSV file.
@@ -769,7 +770,7 @@ public class ImportTsv extends Configured implements Tool {
   }
 
   public static void main(String[] args) throws Exception {
-    int status = ToolRunner.run(new Configuration(), new ImportTsv(), args);
+    int status = ToolRunner.run(HBaseConfiguration.create(), new ImportTsv(), args);
     System.exit(status);
   }
 }


Mime
View raw message