You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/05/01 01:11:45 UTC

[3/4] hbase git commit: HBASE-13377 Canary may generate false alarm on the first region when there are many delete markers (He Liangliang)

HBASE-13377 Canary may generate false alarm on the first region when there are many delete markers (He Liangliang)

Amending-Author: Andrew Purtell <ap...@apache.org>

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java


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

Branch: refs/heads/branch-1.0
Commit: 722aebd65bbcbac253e8e56f19ad772a1a994fd7
Parents: 25bc958
Author: stack <st...@apache.org>
Authored: Tue Apr 7 17:07:39 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Apr 30 16:01:07 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/tool/Canary.java     | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/722aebd6/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
index 18ec779..002be42 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
@@ -54,6 +54,7 @@ import org.apache.hadoop.hbase.client.RegionLocator;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 
@@ -539,10 +540,15 @@ public final class Canary implements Tool {
       // Can't do a get on empty start row so do a Scan of first element if any instead.
       if (startKey.length > 0) {
         get = new Get(startKey);
+        get.setCacheBlocks(false);
+        get.setFilter(new FirstKeyOnlyFilter());
         get.addFamily(column.getName());
       } else {
         scan = new Scan();
+        scan.setRaw(true);
         scan.setCaching(1);
+        scan.setCacheBlocks(false);
+        scan.setFilter(new FirstKeyOnlyFilter());
         scan.addFamily(column.getName());
         scan.setMaxResultSize(1L);
       }