hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject git commit: HBASE-11845 addendum
Date Fri, 12 Sep 2014 00:17:00 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 42bc104d0 -> ba87dcc04


HBASE-11845 addendum


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

Branch: refs/heads/branch-1
Commit: ba87dcc0415b659e7d55089268003723204b29d0
Parents: 42bc104
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Thu Sep 11 15:45:44 2014 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Thu Sep 11 17:14:50 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java | 3 +++
 .../apache/hadoop/hbase/regionserver/TestScanWithBloomError.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/ba87dcc0/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
index 569059c..ab3ac63 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
@@ -196,6 +196,9 @@ public class HFilePrettyPrinter extends Configured implements Tool {
    * exit code (zero for success, non-zero for failure).
    */
   public int run(String[] args) {
+    if (getConf() == null) {
+      throw new RuntimeException("A Configuration instance must be provided.");
+    }
     try {
       FSUtils.setFsDefault(getConf(), FSUtils.getRootDir(getConf()));
       if (!parseOptions(args))

http://git-wip-us.apache.org/repos/asf/hbase/blob/ba87dcc0/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
index 54e8517..6aae6b6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
@@ -150,7 +150,7 @@ public class TestScanWithBloomError {
     for (StoreFileScanner sfScanner : scanners)
       lastStoreFileReader = sfScanner.getReader();
 
-    new HFilePrettyPrinter().run(new String[]{ "-m", "-p", "-f",
+    new HFilePrettyPrinter(conf).run(new String[]{ "-m", "-p", "-f",
         lastStoreFileReader.getHFileReader().getPath().toString()});
 
     // Disable Bloom filter for the last store file. The disabled Bloom filter


Mime
View raw message