hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r826793 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Date Mon, 19 Oct 2009 20:09:09 GMT
Author: stack
Date: Mon Oct 19 20:09:08 2009
New Revision: 826793

URL: http://svn.apache.org/viewvc?rev=826793&view=rev
Log:
HBASE-1917 TestScanner.testFilters failing

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=826793&r1=826792&r2=826793&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Mon Oct 19 20:09:08 2009
@@ -11,6 +11,7 @@
    HBASE-1912  When adding a secondary index to an existing table, it will
                cause NPE during re-indexing (Mingjui Ray Liao via Andrew
                Purtell)
+   HBASE-1917  TestScanner.testFilters failing
 
   IMPROVEMENTS
    HBASE-1899  Use scanner caching in shell count

Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=826793&r1=826792&r2=826793&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Mon Oct 19 20:09:08 2009
@@ -1765,7 +1765,8 @@
           if (hasResults()) return true;
         }
         // See if current row should be filtered based on row key
-        if (this.filter != null && this.filter.filterRowKey(row, 0, row.length))
{
+        if ((this.filter != null && this.filter.filterRowKey(row, 0, row.length))
||
+            (oldFilter != null && this.oldFilter.filterRowKey(row, 0, row.length)))
{
           readAndDumpCurrentResult();
           resetFilters();
           filterCurrentRow = true;



Mime
View raw message