Make TestHRegion pass by porting the RegionScanner implementation from 0.20

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@944534 13f79535-47bb-0310-9956-ffa450edef68

core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -63,13 +63,11 @@ import org.apache.hadoop.util.StringUtils;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
- import java.util.Set;
 import java.util.NavigableSet;
+import java.util.Random;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
- import java.util.HashMap;
- import java.util.HashSet;
- import java.util.Random;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -1937,7 +1935,6 @@ public class HRegion implements HConstants, HeapSize { // , Writable{
       //DebugPrint.println("HRegionScanner.<init>");
       this.filter = scan.getFilter();
       this.batch = scan.getBatch();
-
       if (Bytes.equals(scan.getStopRow(), HConstants.EMPTY_END_ROW)) {
         this.stopRow = null;
       } else {
@@ -1969,7 +1966,6 @@ public class HRegion implements HConstants, HeapSize { // , Writable{
         new KeyValueHeap(scanners.toArray(new KeyValueScanner[0]), comparator);
     }
 
-
     private void resetFilters() {
       if (filter != null) {
         filter.reset();
@@ -2025,70 +2021,64 @@ public class HRegion implements HConstants, HeapSize { // , Writable{
       return this.filter != null && this.filter.filterAllRemaining();
     }
 
-    /*
-     * @return true if there are more rows, false if scanner is done
-     * @throws IOException
-     */
     private boolean nextInternal(int limit) throws IOException {
-      byte [] currentRow = null;
-      boolean filterCurrentRow = false;
       while (true) {
-        KeyValue kv = this.storeHeap.peek();
+        byte [] currentRow = peekRow();
-        if (kv == null) return false;
+        if (isStopRow(currentRow)) {
-        byte [] row = kv.getRow();
-        boolean samerow = Bytes.equals(currentRow, row);
-        if (samerow && filterCurrentRow) {
-          // Filter all columns until row changes
-          readAndDumpCurrentResult();
-          continue;
-        }
-        if (!samerow) {
-          // Continue on the next row:
-          currentRow = row;
-          filterCurrentRow = false;
-          // See if we passed stopRow
-          if (this.stopRow != null &&
-              comparator.compareRows(this.stopRow, 0, this.stopRow.length, 
-                currentRow, 0, currentRow.length) <= this.isScan) {
           return false;
-          }
+        } else if (filterRowKey(currentRow)) {
-          if (hasResults()) return true;
+          nextRow(currentRow);
-        }
+        } else {
-        // See if current row should be filtered based on row key
+          byte [] nextRow;
-        if (this.filter != null && this.filter.filterRowKey(row, 0, row.length)) {
+          do {
-          readAndDumpCurrentResult();
-          resetFilters();
-          filterCurrentRow = true;
-          currentRow = row;
-          continue;
-        }
             this.storeHeap.next(results, limit);
             if (limit > 0 && results.size() == limit) {
               return true;
             }
+          } while (Bytes.equals(currentRow, nextRow = peekRow()));
+
+          final boolean stopRow = isStopRow(nextRow);
+          if (!stopRow && (results.isEmpty() || filterRow())) {
+            // this seems like a redundant step - we already consumed the row
+            // there're no left overs.
+            // the reasons for calling this method are:
+            // 1. reset the filters.
+            // 2. provide a hook to fast forward the row (used by subclasses)
+            nextRow(currentRow);
+            continue;
+          }
+          return !stopRow;
+        }
       }
     }
 
-    private void readAndDumpCurrentResult() throws IOException {
+    private boolean filterRow() {
-      this.storeHeap.next(this.results);
+      return filter != null
-      this.results.clear();
+          && filter.filterRow();
+    }
+    private boolean filterRowKey(byte[] row) {
+      return filter != null
+          && filter.filterRowKey(row, 0, row.length);
     }
 
-    /*
+    protected void nextRow(byte [] currentRow) throws IOException {
-     * Do we have results to return or should we continue.  Call when we get to
+      while (Bytes.equals(currentRow, peekRow())) {
-     * the end of a row.  Does house cleaning -- clearing results and resetting
+        this.storeHeap.next(MOCKED_LIST);
-     * filters -- if we are to continue.
+      }
-     * @return True if we should return else false if need to keep going.
+      results.clear();
-     */
-    private boolean hasResults() {
-      if (this.results.isEmpty() ||
-          this.filter != null && this.filter.filterRow()) {
-        // Make sure results is empty, reset filters
-        this.results.clear();
       resetFilters();
-        return false;
     }
-      return true;
+
+    private byte[] peekRow() {
+      KeyValue kv = this.storeHeap.peek();
+      return kv == null ? null : kv.getRow();
+    }
+
+    private boolean isStopRow(byte [] currentRow) {
+      return currentRow == null ||
+          (stopRow != null &&
+          comparator.compareRows(stopRow, 0, stopRow.length,
+              currentRow, 0, currentRow.length) <= isScan);
     }
 
     public synchronized void close() {
@@ -2098,13 +2088,6 @@ public class HRegion implements HConstants, HeapSize { // , Writable{
       }
       this.filterClosed = true;
     }
-
-    /**
-     * @return the current storeHeap
-     */
-    public synchronized KeyValueHeap getStoreHeap() {
-      return this.storeHeap;
-    }
   }
 
   // Utility methods
@@ -2828,6 +2811,33 @@ public class HRegion implements HConstants, HeapSize { // , Writable{
     return false;
   }
 
+  /**
+   * A mocked list implementaion - discards all updates.
+   */
+  private static final List<KeyValue> MOCKED_LIST = new AbstractList<KeyValue>() {
+
+    @Override
+    public void add(int index, KeyValue element) {
+      // do nothing
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<? extends KeyValue> c) {
+      return false; // this list is never changed as a result of an update
+    }
+
+    @Override
+    public KeyValue get(int index) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int size() {
+      return 0;
+    }
+  };
+
+
   /**
    * Facility for dumping and compacting catalog tables.
    * Only does catalog tables since these are only tables we for sure know