You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2009/05/04 23:51:46 UTC
svn commit: r771460 - in /hadoop/hbase/branches/0.19: ./
src/java/org/apache/hadoop/hbase/filter/
src/test/org/apache/hadoop/hbase/filter/
Author: apurtell
Date: Mon May 4 21:51:45 2009
New Revision: 771460
URL: http://svn.apache.org/viewvc?rev=771460&view=rev
Log:
HBASE-1264 Wrong return values of comparators for ColumnValueFilter
Modified:
hadoop/hbase/branches/0.19/CHANGES.txt
hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java
hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java
hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/SubstringComparator.java
hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/filter/TestColumnValueFilter.java
Modified: hadoop/hbase/branches/0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/CHANGES.txt?rev=771460&r1=771459&r2=771460&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.19/CHANGES.txt Mon May 4 21:51:45 2009
@@ -23,7 +23,8 @@
HBASE-1352 incrementColumnValue/Memcache bug
HBASE-1279 Fix the way hostnames and IPs are handled
HBASE-1368 HBASE-1279 broke the build
-
+ HBASE-1264 Wrong return values of comparators for ColumnValueFilter
+ (Thomas Schneider via Andrew Purtell)
Release 0.19.1 - 03/19/2009
BUG FIXES
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=771460&r1=771459&r2=771460&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 Mon May 4 21:51:45 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/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java?rev=771460&r1=771459&r2=771460&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java (original)
+++ hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/RegexStringComparator.java Mon May 4 21:51:45 2009
@@ -68,7 +68,7 @@
public int compareTo(byte[] value) {
// Use find() for subsequence match instead of matches() (full sequence
// match) to adhere to the principle of least surprise.
- return pattern.matcher(Bytes.toString(value)).find() ? 1 : 0;
+ return pattern.matcher(Bytes.toString(value)).find() ? 0 : 1;
}
public void readFields(DataInput in) throws IOException {
Modified: hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/SubstringComparator.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/SubstringComparator.java?rev=771460&r1=771459&r2=771460&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/SubstringComparator.java (original)
+++ hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/filter/SubstringComparator.java Mon May 4 21:51:45 2009
@@ -57,7 +57,7 @@
}
public int compareTo(byte[] value) {
- return Bytes.toString(value).toLowerCase().contains(substr) ? 1 : 0;
+ return Bytes.toString(value).toLowerCase().contains(substr) ? 0 : 1;
}
public void readFields(DataInput in) throws IOException {
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=771460&r1=771459&r2=771460&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 Mon May 4 21:51:45 2009
@@ -44,7 +44,7 @@
private static final byte[] FULLSTRING_2 =
Bytes.toBytes("The slow grey fox trips over the lazy dog.");
private static final String QUICK_SUBSTR = "quick";
- private static final String QUICK_REGEX = "[q][u][i][c][k]";
+ private static final String QUICK_REGEX = ".+quick.+";
private RowFilterInterface basicFilterNew() {
return new ColumnValueFilter(COLUMN,