You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/06/19 20:24:25 UTC

svn commit: r956266 - in /hbase/branches/0.20: ./ src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/ src/java/org/apache/hadoop/hbase/client/ src/java/org/apache/hadoop/hbase/regionserver/

Author: stack
Date: Sat Jun 19 18:24:25 2010
New Revision: 956266

URL: http://svn.apache.org/viewvc?rev=956266&view=rev
Log:
Backing out HBASE-1537

Modified:
    hbase/branches/0.20/CHANGES.txt
    hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java
    hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Scan.java
    hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
    hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java
    hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java
    hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/MinorCompactingStoreScanner.java
    hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java

Modified: hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/CHANGES.txt?rev=956266&r1=956265&r2=956266&view=diff
==============================================================================
--- hbase/branches/0.20/CHANGES.txt (original)
+++ hbase/branches/0.20/CHANGES.txt Sat Jun 19 18:24:25 2010
@@ -40,7 +40,6 @@ Release 0.20.5 - Unreleased
    HBASE-2613  Remove the code around MSG_CALL_SERVER_STARTUP
    HBASE-2683  Make it obvious in the documentation that ZooKeeper needs 
                permanent storage
-   HBASE-1537  Intra-row scanning
 
   INCOMPATIBLE CHANGES
    HBASE-2397  Bytes.toStringBinary escapes printable chars

Modified: hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java?rev=956266&r1=956265&r2=956266&view=diff
==============================================================================
--- hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java (original)
+++ hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java Sat Jun 19 18:24:25 2010
@@ -444,16 +444,13 @@ class TransactionState {
       return next;
     }
 
-    public boolean next(List<KeyValue> results, int limit) throws IOException {
+    public boolean next(List<KeyValue> results) throws IOException {
         KeyValue peek = this.peek();
         if (peek == null) {
           return false;
         }
         byte [] row = peek.getRow();
         results.add(peek);
-        if (limit > 0 && (results.size() == limit)) {
-          return true;
-        }
         while (true){
           if (this.peek() == null) {
             break;
@@ -462,16 +459,10 @@ class TransactionState {
             break;
           }
           results.add(this.next());
-          if (limit > 0 && (results.size() == limit)) {
-            break;
-          }
         }
-        return true;        
+        return true;
+        
     }
-
-    public boolean next(List<KeyValue> results) throws IOException {
-      return next(results, -1);
-    }
-
+    
    }
 }

Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Scan.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Scan.java?rev=956266&r1=956265&r2=956266&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Scan.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Scan.java Sat Jun 19 18:24:25 2010
@@ -73,9 +73,6 @@ import org.apache.hadoop.io.WritableFact
  * To limit the number of versions of each column to be returned, execute
  * {@link #setMaxVersions(int) setMaxVersions}.
  * <p>
- * To limit the maximum number of values returned for each call to next(), execute 
- * {@link #setBatch(int) setBatch}.
- * <p>
  * To add a filter, execute {@link #setFilter(org.apache.hadoop.hbase.filter.Filter) setFilter}.
  * <p>
  * Expert: To explicitly disable server-side block caching for this scan, 
@@ -94,7 +91,6 @@ public class Scan implements Writable {
   private byte [] startRow = HConstants.EMPTY_START_ROW;
   private byte [] stopRow  = HConstants.EMPTY_END_ROW;
   private int maxVersions = 1;
-  private int batch = -1;
   private int caching = -1;
   private boolean cacheBlocks = true;
   private Filter filter = null;
@@ -147,7 +143,6 @@ public class Scan implements Writable {
     startRow = scan.getStartRow();
     stopRow  = scan.getStopRow();
     maxVersions = scan.getMaxVersions();
-    batch = scan.getBatch();
     caching = scan.getCaching();
     cacheBlocks = scan.getCacheBlocks();
     filter = scan.getFilter(); // clone?
@@ -376,14 +371,6 @@ public class Scan implements Writable {
   }
 
   /**
-   * Set the maximum number of values to return for each call to next()
-   * @param batch the maximum number of values
-   */
-  public void setBatch(int batch) {
-    this.batch = batch;
-  }
-
-  /**
    * Set the number of rows for caching that will be passed to scanners.
    * If not set, the default setting from {@link HTable#getScannerCaching()} will apply.
    * Higher caching values will enable faster scanners but will use more memory.
@@ -481,13 +468,6 @@ public class Scan implements Writable {
   } 
 
   /**
-   * @return maximum number of values to return for a single call to next()
-   */
-  public int getBatch() {
-    return this.batch;
-  }
-
-  /**
    * @return caching the number of rows fetched when calling next on a scanner
    */
   public int getCaching() {
@@ -633,8 +613,6 @@ public class Scan implements Writable {
     sb.append(Bytes.toString(this.stopRow));
     sb.append(", maxVersions=");
     sb.append("" + this.maxVersions);
-    sb.append(", batch=");
-    sb.append("" + this.batch);
     sb.append(", caching=");
     sb.append("" + this.caching);
     sb.append(", cacheBlocks=");
@@ -715,7 +693,6 @@ public class Scan implements Writable {
     }
     this.stopRow = Bytes.readByteArray(in);
     this.maxVersions = in.readInt();
-    this.batch = in.readInt();
     this.caching = in.readInt();
     this.cacheBlocks = in.readBoolean();
     if(in.readBoolean()) {
@@ -761,7 +738,6 @@ public class Scan implements Writable {
     Bytes.writeByteArray(out, this.startRow);
     Bytes.writeByteArray(out, this.stopRow);
     out.writeInt(this.maxVersions);
-    out.writeInt(this.batch);
     out.writeInt(this.caching);
     out.writeBoolean(this.cacheBlocks);
     if(this.filter == null) {

Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=956266&r1=956265&r2=956266&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Sat Jun 19 18:24:25 2010
@@ -1810,7 +1810,6 @@ public class HRegion implements HConstan
     private Filter filter;
     private RowFilterInterface oldFilter;
     private List<KeyValue> results = new ArrayList<KeyValue>();
-    private int batch;
     private int isScan;
     private boolean filterClosed = false;
     private long readPt;
@@ -1819,7 +1818,6 @@ public class HRegion implements HConstan
       //DebugPrint.println("HRegionScanner.<init>");
 
       this.filter = scan.getFilter();
-      this.batch = scan.getBatch();
       // Doesn't need to be volatile, always accessed under a sync'ed method
       this.oldFilter = scan.getOldFilter();
       if (Bytes.equals(scan.getStopRow(), HConstants.EMPTY_END_ROW)) {
@@ -1861,8 +1859,8 @@ public class HRegion implements HConstan
       }
     }
 
-    public synchronized boolean next(List<KeyValue> outResults, int limit)
-    throws IOException {
+    public synchronized boolean next(List<KeyValue> outResults)
+        throws IOException {
       if (this.filterClosed) {
         throw new UnknownScannerException("Scanner was closed (timed out?) " +
             "after we renewed it. Could be caused by a very slow scanner " +
@@ -1878,7 +1876,7 @@ public class HRegion implements HConstan
       ReadWriteConsistencyControl.setThreadReadPoint(this.readPt);
 
       results.clear();
-      boolean returnResult = nextInternal(limit);
+      boolean returnResult = nextInternal();
       if (!returnResult && filterRow()) {
         results.clear();
       }
@@ -1890,11 +1888,6 @@ public class HRegion implements HConstan
       return returnResult;
     }
 
-    public boolean next(List<KeyValue> outResults) throws IOException {
-      // apply the batching limit by default
-      return next(outResults, batch);
-    }
-
     /*
      * @return True if a filter rules the scanner is over, done.
      */
@@ -1909,7 +1902,7 @@ public class HRegion implements HConstan
     * @return true if there are more rows, false if scanner is done
     * @throws IOException
     */
-    private boolean nextInternal(int limit) throws IOException {
+    private boolean nextInternal() throws IOException {
       while (true) {
         byte[] currentRow = peekRow();
         if (isStopRow(currentRow)) {
@@ -1919,10 +1912,7 @@ public class HRegion implements HConstan
         } else {
           byte[] nextRow;
           do {
-            this.storeHeap.next(results, limit);
-            if (limit > 0 && results.size() == limit) {
-              return true;
-            }
+            this.storeHeap.next(results);
           } while (Bytes.equals(currentRow, nextRow = peekRow()));
 
           final boolean stopRow = isStopRow(nextRow);

Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java?rev=956266&r1=956265&r2=956266&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/InternalScanner.java Sat Jun 19 18:24:25 2010
@@ -46,21 +46,12 @@ public interface InternalScanner extends
    * @return true if more rows exist after this one, false if scanner is done
    * @throws IOException
    */
-  public boolean next(List<KeyValue> results) throws IOException;
-
-  /**
-   * Grab the next row's worth of values with a limit on the number of values
-   * to return. 
-   * @param results
-   * @param limit
-   * @return true if more rows exist after this one, false if scanner is done
-   * @throws IOException
-   */
-  public boolean next(List<KeyValue> result, int limit) throws IOException;
-
+  public boolean next(List<KeyValue> results)
+  throws IOException;
+  
   /**
    * Closes the scanner and releases any resources it has allocated
    * @throws IOException
    */
   public void close() throws IOException;
-}
+}
\ No newline at end of file

Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java?rev=956266&r1=956265&r2=956266&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java Sat Jun 19 18:24:25 2010
@@ -99,13 +99,11 @@ public class KeyValueHeap implements Key
    * <p>
    * This can ONLY be called when you are using Scanners that implement
    * InternalScanner as well as KeyValueScanner (a {@link StoreScanner}).
-   * @param result
-   * @param limit
    * @return true if there are more keys, false if all scanners are done 
    */
-  public boolean next(List<KeyValue> result, int limit) throws IOException {
+  public boolean next(List<KeyValue> result) throws IOException {
     InternalScanner currentAsInternal = (InternalScanner)this.current;
-    currentAsInternal.next(result, limit);
+    currentAsInternal.next(result);
     KeyValue pee = this.current.peek();
     if (pee == null) {
       this.current.close();
@@ -115,21 +113,7 @@ public class KeyValueHeap implements Key
     this.current = this.heap.poll();
     return (this.current != null);
   }
-
-  /**
-   * Gets the next row of keys from the top-most scanner.
-   * <p>
-   * This method takes care of updating the heap.
-   * <p>
-   * This can ONLY be called when you are using Scanners that implement
-   * InternalScanner as well as KeyValueScanner (a {@link StoreScanner}).
-   * @param result
-   * @return true if there are more keys, false if all scanners are done 
-   */
-  public boolean next(List<KeyValue> result) throws IOException {
-    return next(result, -1);
-  }
-
+  
   private class KVScannerComparator implements Comparator<KeyValueScanner> {
     private KVComparator kvComparator;
     /**

Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/MinorCompactingStoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/MinorCompactingStoreScanner.java?rev=956266&r1=956265&r2=956266&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/MinorCompactingStoreScanner.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/MinorCompactingStoreScanner.java Sat Jun 19 18:24:25 2010
@@ -119,12 +119,6 @@ public class MinorCompactingStoreScanner
     return false;
   }
 
-  @Override
-  public boolean next(List<KeyValue> results, int limit) throws IOException {
-    // should not use limits with minor compacting store scanner
-    return next(results);
-  }
-
   public void close() {
     heap.close();
   }

Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=956266&r1=956265&r2=956266&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Sat Jun 19 18:24:25 2010
@@ -180,10 +180,9 @@ class StoreScanner implements KeyValueSc
   /**
    * Get the next row of values from this Store.
    * @param outResult
-   * @param limit
    * @return true if there are more rows, false if scanner is done
    */
-  public synchronized boolean next(List<KeyValue> outResult, int limit) throws IOException {
+  public synchronized boolean next(List<KeyValue> outResult) throws IOException {
     //DebugPrint.println("SS.next");
 
     checkReseek();
@@ -204,16 +203,13 @@ class StoreScanner implements KeyValueSc
     matcher.setRow(peeked.getRow());
     KeyValue kv;
     List<KeyValue> results = new ArrayList<KeyValue>();
-    LOOP: while((kv = this.heap.peek()) != null) {
+    while((kv = this.heap.peek()) != null) {
       QueryMatcher.MatchCode qcode = matcher.match(kv);
       //DebugPrint.println("SS peek kv = " + kv + " with qcode = " + qcode);
       switch(qcode) {
         case INCLUDE:
           KeyValue next = this.heap.next();
           results.add(next);
-          if (limit > 0 && (results.size() == limit)) {
-            break LOOP;
-          }
           continue;
 
         case DONE:
@@ -260,10 +256,6 @@ class StoreScanner implements KeyValueSc
     return false;
   }
 
-  public synchronized boolean next(List<KeyValue> outResult) throws IOException {
-    return next(outResult, -1);
-  }
-
   private List<KeyValueScanner> getStoreFileScanners() {
     List<HFileScanner> s =
       new ArrayList<HFileScanner>(this.store.getStorefilesCount());