Index: src/test/org/apache/hadoop/hbase/filter/TestStopRowFilter.java =================================================================== --- src/test/org/apache/hadoop/hbase/filter/TestStopRowFilter.java (revision 650327) +++ src/test/org/apache/hadoop/hbase/filter/TestStopRowFilter.java (working copy) @@ -75,19 +75,19 @@ } private void stopRowTests(RowFilterInterface filter) throws Exception { - assertFalse("Filtering on " + GOOD_ROW, filter.filter(GOOD_ROW)); - assertTrue("Filtering on " + STOP_ROW, filter.filter(STOP_ROW)); - assertTrue("Filtering on " + PAST_STOP_ROW, filter.filter(PAST_STOP_ROW)); + assertFalse("Filtering on " + GOOD_ROW, filter.filterRowKey(GOOD_ROW)); + assertTrue("Filtering on " + STOP_ROW, filter.filterRowKey(STOP_ROW)); + assertTrue("Filtering on " + PAST_STOP_ROW, filter.filterRowKey(PAST_STOP_ROW)); - assertFalse("Filtering on " + GOOD_ROW, filter.filter(GOOD_ROW, null, + assertFalse("Filtering on " + GOOD_ROW, filter.filterColumn(GOOD_ROW, null, null)); - assertTrue("Filtering on " + STOP_ROW, filter.filter(STOP_ROW, null, null)); - assertTrue("Filtering on " + PAST_STOP_ROW, filter.filter(PAST_STOP_ROW, + assertTrue("Filtering on " + STOP_ROW, filter.filterColumn(STOP_ROW, null, null)); + assertTrue("Filtering on " + PAST_STOP_ROW, filter.filterColumn(PAST_STOP_ROW, null, null)); assertFalse("FilterAllRemaining", filter.filterAllRemaining()); - assertFalse("FilterNotNull", filter.filterNotNull(null)); + assertFalse("FilterNotNull", filter.filterRow(null)); - assertFalse("Filter a null", filter.filter(null)); + assertFalse("Filter a null", filter.filterRowKey(null)); } } Index: src/test/org/apache/hadoop/hbase/filter/TestWhileMatchRowFilter.java =================================================================== --- src/test/org/apache/hadoop/hbase/filter/TestWhileMatchRowFilter.java (revision 650327) +++ src/test/org/apache/hadoop/hbase/filter/TestWhileMatchRowFilter.java (working copy) @@ -90,14 +90,14 @@ // Test cases that should pass the row toTest = "apples"; - assertFalse("filter: '" + toTest + "'", filter.filter(new Text(toTest))); - assertFalse("innerFilter: '" + toTest + "'", innerFilter.filter(new Text( + assertFalse("filter: '" + toTest + "'", filter.filterRowKey(new Text(toTest))); + assertFalse("innerFilter: '" + toTest + "'", innerFilter.filterRowKey(new Text( toTest))); // Test cases that should fail the row toTest = "tuna"; - assertTrue("filter: '" + toTest + "'", filter.filter(new Text(toTest))); - assertTrue("innerFilter: '" + toTest + "'", innerFilter.filter(new Text( + assertTrue("filter: '" + toTest + "'", filter.filterRowKey(new Text(toTest))); + assertTrue("innerFilter: '" + toTest + "'", innerFilter.filterRowKey(new Text( toTest))); // The difference in switch @@ -111,7 +111,7 @@ filter.filterAllRemaining()); // Test filterNotNull for functionality only (no switch-cases) - assertFalse("filter: filterNotNull", filter.filterNotNull(null)); + assertFalse("filter: filterNotNull", filter.filterRow(null)); } private void whileMatchRegExpTests(WhileMatchRowFilter filter) throws @@ -121,14 +121,14 @@ // Test cases that should pass the row toTest = "regex_match"; - assertFalse("filter: '" + toTest + "'", filter.filter(new Text(toTest))); - assertFalse("innerFilter: '" + toTest + "'", innerFilter.filter(new Text( + assertFalse("filter: '" + toTest + "'", filter.filterRowKey(new Text(toTest))); + assertFalse("innerFilter: '" + toTest + "'", innerFilter.filterRowKey(new Text( toTest))); // Test cases that should fail the row toTest = "not_a_match"; - assertTrue("filter: '" + toTest + "'", filter.filter(new Text(toTest))); - assertTrue("innerFilter: '" + toTest + "'", innerFilter.filter(new Text( + assertTrue("filter: '" + toTest + "'", filter.filterRowKey(new Text(toTest))); + assertTrue("innerFilter: '" + toTest + "'", innerFilter.filterRowKey(new Text( toTest))); // The difference in switch @@ -143,7 +143,7 @@ // Test filter(Text, Text, byte[]) for functionality only (no switch-cases) toTest = "asdf_regex_hjkl"; - assertFalse("filter: '" + toTest + "'", filter.filter(new Text(toTest), + assertFalse("filter: '" + toTest + "'", filter.filterColumn(new Text(toTest), null, null)); } } Index: src/test/org/apache/hadoop/hbase/filter/TestInclusiveStopRowFilter.java =================================================================== --- src/test/org/apache/hadoop/hbase/filter/TestInclusiveStopRowFilter.java (revision 650327) +++ src/test/org/apache/hadoop/hbase/filter/TestInclusiveStopRowFilter.java (working copy) @@ -75,19 +75,19 @@ } private void stopRowTests(RowFilterInterface filter) throws Exception { - assertFalse("Filtering on " + GOOD_ROW, filter.filter(GOOD_ROW)); - assertFalse("Filtering on " + STOP_ROW, filter.filter(STOP_ROW)); - assertTrue("Filtering on " + PAST_STOP_ROW, filter.filter(PAST_STOP_ROW)); + assertFalse("Filtering on " + GOOD_ROW, filter.filterRowKey(GOOD_ROW)); + assertFalse("Filtering on " + STOP_ROW, filter.filterRowKey(STOP_ROW)); + assertTrue("Filtering on " + PAST_STOP_ROW, filter.filterRowKey(PAST_STOP_ROW)); - assertFalse("Filtering on " + GOOD_ROW, filter.filter(GOOD_ROW, null, + assertFalse("Filtering on " + GOOD_ROW, filter.filterColumn(GOOD_ROW, null, null)); - assertFalse("Filtering on " + STOP_ROW, filter.filter(STOP_ROW, null, null)); - assertTrue("Filtering on " + PAST_STOP_ROW, filter.filter(PAST_STOP_ROW, + assertFalse("Filtering on " + STOP_ROW, filter.filterColumn(STOP_ROW, null, null)); + assertTrue("Filtering on " + PAST_STOP_ROW, filter.filterColumn(PAST_STOP_ROW, null, null)); assertFalse("FilterAllRemaining", filter.filterAllRemaining()); - assertFalse("FilterNotNull", filter.filterNotNull(null)); + assertFalse("FilterNotNull", filter.filterRow(null)); - assertFalse("Filter a null", filter.filter(null)); + assertFalse("Filter a null", filter.filterRowKey(null)); } } Index: src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java =================================================================== --- src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java (revision 650327) +++ src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java (working copy) @@ -114,11 +114,11 @@ private void regexRowTests(RowFilterInterface filter) throws Exception { for (char c = FIRST_CHAR; c <= LAST_CHAR; c++) { Text t = createRow(c); - assertFalse("Failed with characer " + c, filter.filter(t)); + assertFalse("Failed with characer " + c, filter.filterRowKey(t)); } String yahooSite = "com.yahoo.www"; assertTrue("Failed with character " + - yahooSite, filter.filter(new Text(yahooSite))); + yahooSite, filter.filterRowKey(new Text(yahooSite))); } private void regexRowColumnTests(RowFilterInterface filter) @@ -128,7 +128,7 @@ Text t = createRow(c); for (Map.Entry e: this.colvalues.entrySet()) { assertFalse("Failed on " + c, - filter.filter(t, e.getKey(), e.getValue())); + filter.filterColumn(t, e.getKey(), e.getValue())); } } // Try a row and column I know will pass. @@ -136,19 +136,19 @@ Text r = createRow(c); Text col = new Text(Character.toString(c)); assertFalse("Failed with character " + c, - filter.filter(r, col, GOOD_BYTES)); + filter.filterColumn(r, col, GOOD_BYTES)); // Do same but with bad bytes. assertTrue("Failed with character " + c, - filter.filter(r, col, "badbytes".getBytes(HConstants.UTF8_ENCODING))); + filter.filterColumn(r, col, "badbytes".getBytes(HConstants.UTF8_ENCODING))); // Do with good bytes but bad column name. Should not filter out. assertFalse("Failed with character " + c, - filter.filter(r, new Text("badcolumn"), GOOD_BYTES)); + filter.filterColumn(r, new Text("badcolumn"), GOOD_BYTES)); // Good column, good bytes but bad row. assertTrue("Failed with character " + c, - filter.filter(new Text("bad row"), new Text("badcolumn"), GOOD_BYTES)); + filter.filterColumn(new Text("bad row"), new Text("badcolumn"), GOOD_BYTES)); } private void filterNotNullTests(RowFilterInterface filter) throws Exception { @@ -166,7 +166,7 @@ // Try a row that is missing an expected columnKey. // Testing row with columnKeys: a-c assertTrue("Failed with last columnKey " + thirdToLast, filter. - filterNotNull(colvalues)); + filterRow(colvalues)); // Try a row that has all expected columnKeys, and NO null-expected // columnKeys. @@ -174,13 +174,13 @@ colvalues.put(new Text(new String(new char[] { secondToLast })), GOOD_BYTES); assertFalse("Failed with last columnKey " + secondToLast, filter. - filterNotNull(colvalues)); + filterRow(colvalues)); // Try a row that has all expected columnKeys AND a null-expected columnKey. // Testing row with columnKeys: a-e colvalues.put(new Text(new String(new char[] { LAST_CHAR })), GOOD_BYTES); assertTrue("Failed with last columnKey " + LAST_CHAR, filter. - filterNotNull(colvalues)); + filterRow(colvalues)); // Try a row that has all expected columnKeys and a null-expected columnKey // that maps to a null value. @@ -188,7 +188,7 @@ colvalues.put(new Text(new String(new char[] { LAST_CHAR })), HLogEdit.deleteBytes.get()); assertFalse("Failed with last columnKey " + LAST_CHAR + " mapping to null.", - filter.filterNotNull(colvalues)); + filter.filterRow(colvalues)); } private Text createRow(final char c) { Index: src/test/org/apache/hadoop/hbase/filter/TestRowFilterSet.java =================================================================== --- src/test/org/apache/hadoop/hbase/filter/TestRowFilterSet.java (revision 650327) +++ src/test/org/apache/hadoop/hbase/filter/TestRowFilterSet.java (working copy) @@ -163,7 +163,7 @@ RFSAssertReset(filter); // A row that should cause the RegExpRowFilter to fail. - boolean filtered = filter.filter(new Text("regex_match"), + boolean filtered = filter.filterColumn(new Text("regex_match"), new Text(new String(new char[] { FIRST_CHAR })), BAD_BYTES); assertTrue("Filtering on 'regex_match' and bad column data.", filtered); filterMPALL.rowProcessed(filtered, new Text("regex_match")); @@ -172,7 +172,7 @@ private void RFSAssertion(RowFilterInterface filter, String toTest, boolean assertTrue) throws Exception { Text testText = new Text(toTest); - boolean filtered = filter.filter(testText); + boolean filtered = filter.filterRowKey(testText); assertTrue("Filtering on '" + toTest + "'", assertTrue? filtered : !filtered); filter.rowProcessed(filtered, testText); Index: src/test/org/apache/hadoop/hbase/filter/TestPageRowFilter.java =================================================================== --- src/test/org/apache/hadoop/hbase/filter/TestPageRowFilter.java (revision 650327) +++ src/test/org/apache/hadoop/hbase/filter/TestPageRowFilter.java (working copy) @@ -83,7 +83,7 @@ final int pageSize) { for (int i = 0; i < (pageSize * 2); i++) { Text row = new Text(Integer.toString(i)); - boolean filterOut = filter.filter(row); + boolean filterOut = filter.filterRowKey(row); if (!filterOut) { assertFalse("Disagrees with 'filter'", filter.filterAllRemaining()); } else {