From 96a5c023c20209b0875a997228d4c1ea5492b837 Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Thu, 28 Mar 2013 17:49:11 +0000 Subject: [PATCH] HBASE-8063 Addendum adds HalfStoreFileReader#passesKeyRangeFilter() git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1462235 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/io/HalfStoreFileReader.java | 8 +++++++- .../org/apache/hadoop/hbase/regionserver/StoreFile.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java index 1aaea08aaca..2c1354a3689 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java @@ -28,6 +28,7 @@ import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.io.hfile.HFileScanner; @@ -285,7 +286,12 @@ public class HalfStoreFileReader extends StoreFile.Reader { } }; } - + + @Override + public boolean passesKeyRangeFilter(Scan scan) { + return true; + } + @Override public byte[] getLastKey() { if (top) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java index e10987476a8..053d411c960 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java @@ -1357,7 +1357,7 @@ public class StoreFile { * @param scan the scan specification. Used to determine the rowkey range. * @return true if there is overlap, false otherwise */ - boolean passesKeyRangeFilter(Scan scan) { + public boolean passesKeyRangeFilter(Scan scan) { if (this.getFirstKey() == null || this.getLastKey() == null) { // the file is empty return false;