HBASE-28622 FilterListWithAND can swallow SEEK_NEXT_USING_HINT

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java

@@ -38,6 +38,10 @@
  * can be used for row-based indexing, where references to other tables are stored across many
  * columns, in order to efficient lookups and paginated results for end users. Only most recent
  * versions are considered for pagination.
+ * @apiNote This filter is in awkward place, as even though it can return SEEK_NEXT_USING_HINT, it
+ *          also maintains an internal row state, so it is not marked as HintingFilter. Hinted seek
+ *          information may be lost when used in a MUST_PASS_ALL FilterList, which can result in
+ *          suboptimal performance.
  */
 @InterfaceAudience.Public
 public class ColumnPaginationFilter extends FilterBase {

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java

@@ -39,7 +39,7 @@
  * with columns like 'ball', 'act'.
  */
 @InterfaceAudience.Public
-public class ColumnPrefixFilter extends FilterBase {
+public class ColumnPrefixFilter extends FilterBase implements HintingFilter {
   protected byte[] prefix = null;
 
   public ColumnPrefixFilter(final byte[] prefix) {

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java

@@ -43,7 +43,7 @@
  * maxColumnInclusive specify if the ranges are inclusive or not.
  */
 @InterfaceAudience.Public
-public class ColumnRangeFilter extends FilterBase {
+public class ColumnRangeFilter extends FilterBase implements HintingFilter {
   protected byte[] minColumn = null;
   protected boolean minColumnInclusive = true;
   protected byte[] maxColumn = null;

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterListWithAND.java

@@ -33,13 +33,15 @@
 public class FilterListWithAND extends FilterListBase {
 
   private List<Filter> seekHintFilters = new ArrayList<>();
+  private boolean[] hintingFilters;
 
   public FilterListWithAND(List<Filter> filters) {
     super(filters);
     // For FilterList with AND, when call FL's transformCell(), we should transform cell for all
     // sub-filters (because all sub-filters return INCLUDE*). So here, fill this array with true. we
     // keep this in FilterListWithAND for abstracting the transformCell() in FilterListBase.
     subFiltersIncludedCell = new ArrayList<>(Collections.nCopies(filters.size(), true));
+    cacheHintingFilters();
   }
 
   @Override
@@ -49,6 +51,7 @@ public void addFilterLists(List<Filter> filters) {
     }
     this.filters.addAll(filters);
     this.subFiltersIncludedCell.addAll(Collections.nCopies(filters.size(), true));
+    this.cacheHintingFilters();
   }
 
   @Override
@@ -57,6 +60,20 @@ protected String formatLogFilters(List<Filter> logFilters) {
       logFilters.toString());
   }
 
+  /**
+   * As checks for this are in the hot path, we want them as fast as possible, so we are caching the
+   * status in an array.
+   */
+  private void cacheHintingFilters() {
+    int filtersSize = filters.size();
+    hintingFilters = new boolean[filtersSize];
+    for (int i = 0; i < filtersSize; i++) {
+      if (filters.get(i) instanceof HintingFilter) {
+        hintingFilters[i] = true;
+      }
+    }
+  }
+
   /**
    * FilterList with MUST_PASS_ALL choose the maximal forward step among sub-filters in filter list.
    * Let's call it: The Maximal Step Rule. So if filter-A in filter list return INCLUDE and filter-B
@@ -169,10 +186,15 @@ public ReturnCode filterCell(Cell c) throws IOException {
     }
     ReturnCode rc = ReturnCode.INCLUDE;
     this.seekHintFilters.clear();
-    for (int i = 0, n = filters.size(); i < n; i++) {
+    int i = 0;
+    int n = filters.size();
+    for (; i < n; i++) {
       Filter filter = filters.get(i);
       if (filter.filterAllRemaining()) {
-        return ReturnCode.NEXT_ROW;
+        rc = ReturnCode.NEXT_ROW;
+        // We need to process any remaining HintingFilters which may let us skip ahead
+        i++;
+        break;
       }
       ReturnCode localRC;
       localRC = filter.filterCell(c);
@@ -184,9 +206,23 @@ public ReturnCode filterCell(Cell c) throws IOException {
       // otherwise we may mess up the global state (such as offset, count..) in the following
       // sub-filters. (HBASE-20565)
       if (!isIncludeRelatedReturnCode(rc)) {
-        return rc;
+        // We need to process any remaining HintingFilters which may let us skip ahead
+        i++;
+        break;
       }
     }
+    // Now process the remaining hinting filters so that we can get all hints,
+    // and seek to the farthest cell possible. This ensures that we don't spend resources to process
+    // more rows than necessary. The farthest key is computed in getNextCellHint()
+    for (; i < n; i++) {
+      if (hintingFilters[i]) {
+        Filter filter = filters.get(i);
+        if (filter.filterCell(c) == ReturnCode.SEEK_NEXT_USING_HINT) {
+          seekHintFilters.add(filter);
+        }
+      }
+    }
+
     if (!seekHintFilters.isEmpty()) {
       return ReturnCode.SEEK_NEXT_USING_HINT;
     }
@@ -206,17 +242,23 @@ public boolean filterRowKey(Cell firstRowCell) throws IOException {
     if (isEmpty()) {
       return super.filterRowKey(firstRowCell);
     }
-    boolean retVal = false;
+    boolean anyFiltered = false;
+    boolean anyHintingPassed = false;
     for (int i = 0, n = filters.size(); i < n; i++) {
       Filter filter = filters.get(i);
       if (filter.filterAllRemaining() || filter.filterRowKey(firstRowCell)) {
         // Can't just return true here, because there are some filters (such as PrefixFilter) which
         // will catch the row changed event by filterRowKey(). If we return early here, those
         // filters will have no chance to update their row state.
-        retVal = true;
+        anyFiltered = true;
+      } else if (hintingFilters[i]) {
+        // If any of the hinting filters has returned false, then we must not filter this rowkey.
+        // Otherwise the filter doesn't get a chance to provide a seek hint, and the scan may
+        // regress into a full scan.
+        anyHintingPassed = true;
       }
     }
-    return retVal;
+    return anyFiltered && !anyHintingPassed;
   }
 
   @Override

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java

@@ -65,7 +65,7 @@
  * I.e. fuzzy info tells the matching mask is "????_99_????_01", where at ? can be any value.
  */
 @InterfaceAudience.Public
-public class FuzzyRowFilter extends FilterBase {
+public class FuzzyRowFilter extends FilterBase implements HintingFilter {
   private static final boolean UNSAFE_UNALIGNED = HBasePlatformDependent.unaligned();
   private List<Pair<byte[], byte[]>> fuzzyKeysData;
   // Used to record whether we want to skip the current row.

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/HintingFilter.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.filter;
+
+import org.apache.yetus.audience.InterfaceAudience;
+
+/**
+ * Marker interface for filters that may return SEEK_NEXT_USING_HINT. This marker interface
+ * indicates that when it's used in a MUST_PASS_ALL FilterList then filterCell() must always be
+ * called if filterRowKey() returned false.
+ */
+@InterfaceAudience.Public
+public interface HintingFilter {
+}

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java

@@ -50,7 +50,7 @@
  * fast-forwarding during scan. Thus, the scan will be quite efficient.
  */
 @InterfaceAudience.Public
-public class MultiRowRangeFilter extends FilterBase {
+public class MultiRowRangeFilter extends FilterBase implements HintingFilter {
 
   private static final int ROW_BEFORE_FIRST_RANGE = -1;
 

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java

@@ -42,7 +42,7 @@
  * with columns like 'ball', 'act'.
  */
 @InterfaceAudience.Public
-public class MultipleColumnPrefixFilter extends FilterBase {
+public class MultipleColumnPrefixFilter extends FilterBase implements HintingFilter {
   private static final Logger LOG = LoggerFactory.getLogger(MultipleColumnPrefixFilter.class);
   protected byte[] hint = null;
   protected TreeSet<byte[]> sortedPrefixes = createTreeSet();

hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java

@@ -43,7 +43,7 @@
  * {@link org.apache.hadoop.hbase.client.Scan#setTimestamp(long)}.
  */
 @InterfaceAudience.Public
-public class TimestampsFilter extends FilterBase {
+public class TimestampsFilter extends FilterBase implements HintingFilter {
 
   private final boolean canHint;
   TreeSet<Long> timestamps;

hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java

@@ -644,6 +644,12 @@ public int hashCode() {
     }
   }
 
+  private static class HintingMockFilter extends MockFilter implements HintingFilter {
+    public HintingMockFilter(ReturnCode targetRetCode) {
+      super(targetRetCode);
+    }
+  }
+
   @Test
   public void testShouldPassCurrentCellToFilter() throws IOException {
     KeyValue kv1 = new KeyValue(Bytes.toBytes("row"), Bytes.toBytes("fam"), Bytes.toBytes("a"), 1,
@@ -729,7 +735,7 @@ public void testTheMaximalRule() throws IOException {
     MockFilter filter3 = new MockFilter(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW);
     MockFilter filter4 = new MockFilter(ReturnCode.NEXT_COL);
     MockFilter filter5 = new MockFilter(ReturnCode.SKIP);
-    MockFilter filter6 = new MockFilter(ReturnCode.SEEK_NEXT_USING_HINT);
+    MockFilter filter6 = new HintingMockFilter(ReturnCode.SEEK_NEXT_USING_HINT);
     MockFilter filter7 = new MockFilter(ReturnCode.NEXT_ROW);
 
     FilterList filterList = new FilterList(Operator.MUST_PASS_ALL, filter1, filter2);
@@ -739,10 +745,10 @@ public void testTheMaximalRule() throws IOException {
     assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));
 
     filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter5, filter6);
-    assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));
+    assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));
 
     filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter6);
-    assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));
+    assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));
 
     filterList = new FilterList(Operator.MUST_PASS_ALL, filter3, filter1);
     assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));
@@ -767,7 +773,7 @@ public void testTheMinimalRule() throws IOException {
     MockFilter filter3 = new MockFilter(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW);
     MockFilter filter4 = new MockFilter(ReturnCode.NEXT_COL);
     MockFilter filter5 = new MockFilter(ReturnCode.SKIP);
-    MockFilter filter6 = new MockFilter(ReturnCode.SEEK_NEXT_USING_HINT);
+    MockFilter filter6 = new HintingMockFilter(ReturnCode.SEEK_NEXT_USING_HINT);
     FilterList filterList = new FilterList(Operator.MUST_PASS_ONE, filter1, filter2);
     assertEquals(ReturnCode.INCLUDE, filterList.filterCell(kv1));