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 2009/05/13 19:04:29 UTC

svn commit: r774435 - in /hadoop/hbase/branches/0.19/src: java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java test/org/apache/hadoop/hbase/filter/TestColumnValueFilter.java

Author: stack
Date: Wed May 13 17:04:29 2009
New Revision: 774435

URL: http://svn.apache.org/viewvc?rev=774435&view=rev
Log:
HBASE-1264 Wrong return values of comparators for ColumnValueFilter -- reopened and then fixed by Clint Morgan

Modified:
    hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java
    hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/filter/TestColumnValueFilter.java

Modified: hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java?rev=774435&r1=774434&r2=774435&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java (original)
+++ hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java Wed May 13 17:04:29 2009
@@ -152,9 +152,9 @@
     case LESS_OR_EQUAL:
       return compareResult < 0;
     case EQUAL:
-      return compareResult == 0;
-    case NOT_EQUAL:
       return compareResult != 0;
+    case NOT_EQUAL:
+      return compareResult == 0;
     case GREATER_OR_EQUAL:
       return compareResult > 0;
     case GREATER:

Modified: hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/filter/TestColumnValueFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/filter/TestColumnValueFilter.java?rev=774435&r1=774434&r2=774435&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/filter/TestColumnValueFilter.java (original)
+++ hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/filter/TestColumnValueFilter.java Wed May 13 17:04:29 2009
@@ -73,16 +73,16 @@
 
   private void substrFilterTests(RowFilterInterface filter) 
       throws Exception {
-    assertTrue("substrTrue", filter.filterColumn(ROW, COLUMN, FULLSTRING_1));
-    assertFalse("substrFalse", filter.filterColumn(ROW, COLUMN, FULLSTRING_2));
+    assertFalse("substrTrue", filter.filterColumn(ROW, COLUMN, FULLSTRING_1));
+    assertTrue("substrFalse", filter.filterColumn(ROW, COLUMN, FULLSTRING_2));
     assertFalse("substrFilterAllRemaining", filter.filterAllRemaining());
     assertFalse("substrFilterNotNull", filter.filterRow(null));
   }
 
   private void regexFilterTests(RowFilterInterface filter) 
       throws Exception {
-    assertTrue("regexTrue", filter.filterColumn(ROW, COLUMN, FULLSTRING_1));
-    assertFalse("regexFalse", filter.filterColumn(ROW, COLUMN, FULLSTRING_2));
+    assertFalse("regexTrue", filter.filterColumn(ROW, COLUMN, FULLSTRING_1));
+    assertTrue("regexFalse", filter.filterColumn(ROW, COLUMN, FULLSTRING_2));
     assertFalse("regexFilterAllRemaining", filter.filterAllRemaining());
     assertFalse("regexFilterNotNull", filter.filterRow(null));
   }