svn commit: r1376803 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[la...@apache.org]

Author: larsh
Date: Fri Aug 24 01:19:30 2012
New Revision: 1376803

URL: http://svn.apache.org/viewvc?rev=1376803&view=rev
Log:
HBASE-6577 REVERT

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1376803&r1=1376802&r2=1376803&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Fri Aug 24 01:19:30 2012
@@ -3604,7 +3604,7 @@ public class HRegion implements HeapSize
             // there're no left overs.
             // the reasons for calling this method are:
             // 1. reset the filters.
-            // 2. fast forward the row
+            // 2. provide a hook to fast forward the row (used by subclasses)
             nextRow(currentRow);
 
             // This row was totally filtered out, if this is NOT the last row,
@@ -3617,15 +3617,16 @@ public class HRegion implements HeapSize
       }
     }
 
+    private boolean filterRow() {
+      return filter != null
+          && filter.filterRow();
+    }
     private boolean filterRowKey(byte[] row) {
       return filter != null
           && filter.filterRowKey(row, 0, row.length);
     }
 
     protected void nextRow(byte [] currentRow) throws IOException {
-      KeyValue kv = KeyValue.createLastOnRow(currentRow);
-      this.storeHeap.requestSeek(kv, true, true);
-
       while (Bytes.equals(currentRow, peekRow())) {
         this.storeHeap.next(MOCKED_LIST);
       }