From c0158f43decb39ba93e040948268ca28379b1972 Mon Sep 17 00:00:00 2001 From: Ashish Singhi Date: Sun, 5 Jul 2015 00:24:39 +0530 Subject: [PATCH 1/1] HBASE-14024 ImportTsv is not loading hbase-default.xml --- .../apache/hadoop/hbase/mapreduce/IndexBuilder.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/ImportTsv.java | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) 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); } } 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); } } -- 1.9.1