Add count() to FilterWeight (#15510)

Author: prudhvigodithi

lucene/CHANGES.txt

@@ -51,6 +51,8 @@ API Changes
 * GITHUB#15581: Minor javadoc clarification that HasIndexSlice::getSlice can return null
   (Chris Hegarty)
 
+* GITHUB#15502: Add `count()` method to `FilterWeight`  (Prudhvi Godithi)
+
 New Features
 ---------------------
 * GITHUB#15328: VectorSimilarityFunction.getValues() now implements doubleVal allowing its

lucene/core/src/java/org/apache/lucene/search/FilterWeight.java

@@ -23,10 +23,6 @@
  * A {@code FilterWeight} contains another {@code Weight} and implements all abstract methods by
  * calling the contained weight's method.
  *
- * <p>Note that {@code FilterWeight} does not override the non-abstract {@link
- * Weight#bulkScorer(LeafReaderContext)} method and subclasses of {@code FilterWeight} must provide
- * their bulkScorer implementation if required.
- *
  * @lucene.internal
  */
 public abstract class FilterWeight extends Weight {
@@ -67,4 +63,9 @@ public Matches matches(LeafReaderContext context, int doc) throws IOException {
   public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOException {
     return in.scorerSupplier(context);
   }
+
+  @Override
+  public int count(LeafReaderContext context) throws IOException {
+    return in.count(context);
+  }
 }

lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.java

@@ -18,7 +18,6 @@
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.Arrays;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.junit.Test;
 
@@ -36,30 +35,6 @@ private void implTestDeclaredMethodsOverridden(Class<?> superClass, Class<?> sub
       final int modifiers = superClassMethod.getModifiers();
       if (Modifier.isFinal(modifiers)) continue;
       if (Modifier.isStatic(modifiers)) continue;
-      if (Arrays.asList("bulkScorer", "count").contains(superClassMethod.getName())) {
-        try {
-          final Method subClassMethod =
-              subClass.getDeclaredMethod(
-                  superClassMethod.getName(), superClassMethod.getParameterTypes());
-          fail(
-              subClass
-                  + " must not override\n'"
-                  + superClassMethod
-                  + "'"
-                  + " but it does override\n'"
-                  + subClassMethod
-                  + "'");
-        } catch (
-            @SuppressWarnings("unused")
-            NoSuchMethodException e) {
-          /* FilterWeight must not override the bulkScorer method
-           * since as of July 2016 not all deriving classes use the
-           * {code}return in.bulkScorer(content);{code}
-           * implementation that FilterWeight.bulkScorer would use.
-           */
-          continue;
-        }
-      }
       try {
         final Method subClassMethod =
             subClass.getDeclaredMethod(

lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java

@@ -240,6 +240,11 @@ public boolean isCacheable(LeafReaderContext ctx) {
       // the memory used by the cache
       return false;
     }
+
+    @Override
+    public int count(LeafReaderContext context) {
+      return -1;
+    }
   }
 
   static final class OrdinalMapScorer extends BaseGlobalOrdinalScorer {

lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java

@@ -135,6 +135,11 @@ public Explanation explain(LeafReaderContext context, int doc) throws IOExceptio
       }
       return Explanation.noMatch("Not a match");
     }
+
+    @Override
+    public int count(LeafReaderContext context) {
+      return -1;
+    }
   }
 
   static class ToChildBlockJoinScorer extends Scorer {

lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java

@@ -217,6 +217,11 @@ public Matches matches(LeafReaderContext context, int doc) throws IOException {
       }
       return MatchesUtils.MATCH_WITH_NO_TERMS;
     }
+
+    @Override
+    public int count(LeafReaderContext context) {
+      return -1;
+    }
   }
 
   private static class ParentApproximation extends DocIdSetIterator {

lucene/test-framework/src/java/org/apache/lucene/tests/search/RandomApproximationQuery.java

@@ -100,6 +100,11 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
       }
       return new DefaultScorerSupplier(scorer);
     }
+
+    @Override
+    public int count(LeafReaderContext context) {
+      return -1;
+    }
   }
 
   private static class RandomApproximationScorer extends Scorer {