HBASE-13123 - Minor bug in ROW bloom filter (Ram) Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/309e124a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/309e124a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/309e124a Branch: refs/heads/0.98 Commit: 309e124a57843c3d97349a1658d91b3660d3d285 Parents: b57dbba Author: Ramkrishna <ramkrishna.s.vasude...@intel.com> Authored: Mon Mar 2 11:49:32 2015 +0530 Committer: Andrew Purtell <apurt...@apache.org> Committed: Mon Mar 2 17:01:42 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/StoreFile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/309e124a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java ---------------------------------------------------------------------- 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 bea75b4..a90210a 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 @@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -41,6 +40,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HDFSBlocksDistribution; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.KVComparator; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.FSDataInputStreamWrapper; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; @@ -1298,7 +1298,7 @@ public class StoreFile { // columns, a file might be skipped if using row+col Bloom filter. // In order to ensure this file is included an additional check is // required looking only for a row bloom. - byte[] rowBloomKey = bloomFilter.createBloomKey(row, 0, row.length, + byte[] rowBloomKey = bloomFilter.createBloomKey(row, rowOffset, rowLen, null, 0, 0); if (keyIsAfterLast