hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r788581 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
Date Fri, 26 Jun 2009 05:26:19 GMT
Author: stack
Date: Fri Jun 26 05:26:18 2009
New Revision: 788581

URL: http://svn.apache.org/viewvc?rev=788581&view=rev
Log:
HBASE-1580 Store scanner does not consult filter.filterRow at end of scan

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=788581&r1=788580&r2=788581&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Jun 26 05:26:18 2009
@@ -230,6 +230,8 @@
    HBASE-1566  using Scan(startRow,stopRow) will cause you to iterate the
                entire table
    HBASE-1560  TIF can't seem to find one region
+   HBASE-1580  Store scanner does not consult filter.filterRow at end of scan
+               (Clint Morgan via Stack)
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=788581&r1=788580&r2=788581&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Fri
Jun 26 05:26:18 2009
@@ -152,6 +152,10 @@
           return true;
 
         case DONE_SCAN:
+          if (matcher.filterEntireRow()) {
+            // nuke all results, and then return.
+            results.clear();
+          }
           close();
 
           // copy jazz
@@ -178,7 +182,12 @@
           throw new RuntimeException("UNEXPECTED");
       }
     }
-
+ 
+    if (matcher.filterEntireRow()) {
+      // nuke all results, and then return.
+      results.clear();
+    }
+    
     if (!results.isEmpty()) {
       // copy jazz
       outResult.addAll(results);



Mime
View raw message