Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFakeKeyInFilter.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFakeKeyInFilter.java (revision 0) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFakeKeyInFilter.java (working copy) @@ -0,0 +1,61 @@ +package org.apache.hadoop.hbase.client; + +import java.util.ArrayList; + +import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.filter.*; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.RegionScanner; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.FSUtils; +import org.junit.*; + +/** + * Make sure the fake KVs createed internally are never user visible + * (not even to filters) + */ +public class TestFakeKeyInFilter extends BinaryComparator { + protected static HBaseTestingUtility UTIL = new HBaseTestingUtility(); + + public TestFakeKeyInFilter() { + super(Bytes.toBytes("foo")); + } + + @Override + public int compareTo(byte[] value, int offset, int length) { + if (value.length == 0) { + throw new RuntimeException("Found mysterious empty row"); + } + return 0; + } + + /** + * Simple way to verify the scenario. + * There are no KVs with an empty row key in the + * table, yet such a KV is presented to the filter. + */ + @Test + public void testForEmptyRowKey() throws Exception { + byte[] table = Bytes.toBytes("testForEmptyRowKey"); + byte[] row = Bytes.toBytes("myRow"); + byte[] cf = Bytes.toBytes("myFamily"); + byte[] cq = Bytes.toBytes("myColumn"); + HTableDescriptor desc = new HTableDescriptor(table); + desc.addFamily(new HColumnDescriptor(cf)); + HRegionInfo hri = new HRegionInfo(desc.getName(), null, null); + HRegion region = HRegion.createHRegion(hri, FSUtils.getRootDir(UTIL.getConfiguration()), UTIL.getConfiguration(), desc); + Put put = new Put(row); + put.add(cf, cq, cq); + region.put(put); + region.flushcache(); + Scan scan = new Scan(); + scan.addColumn(cf, cq); + WritableByteArrayComparable comparable = new TestFakeKeyInFilter(); + Filter filter = new RowFilter(CompareFilter.CompareOp.EQUAL, comparable); + scan.setFilter(filter); + RegionScanner scanner = region.getScanner(scan); + scanner.next(new ArrayList()); + scanner.close(); + region.close(); + } +} Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (revision 1372205) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (working copy) @@ -3567,14 +3567,15 @@ rpcCall.throwExceptionIfCallerDisconnected(); } - byte [] currentRow = peekRow(); + KeyValue kv = this.storeHeap.peek(); + byte [] currentRow = kv == null ? null : kv.getRow(); if (isStopRow(currentRow)) { if (filter != null && filter.hasFilterRow()) { filter.filterRow(results); } return false; - } else if (filterRowKey(currentRow)) { + } else if (kv != null && kv.getType() != KeyValue.Type.Minimum.getCode() && filterRowKey(currentRow)) { nextRow(currentRow); } else { byte [] nextRow; @@ -3626,9 +3627,8 @@ } protected void nextRow(byte [] currentRow) throws IOException { - while (Bytes.equals(currentRow, peekRow())) { - this.storeHeap.next(MOCKED_LIST); - } + KeyValue kv = KeyValue.createFirstOnRow(currentRow); + this.storeHeap.requestSeek(kv, true, true); results.clear(); resetFilters(); }