Apache Lucene open-source search software
Add `count()` to `FilterWeight` (#15510)
Prudhvi Godithiace0ed95e91c
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 24dd8f1b51a..64889082770 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -205,6 +205,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 itsdiff --git a/lucene/core/src/java/org/apache/lucene/search/FilterWeight.java b/lucene/core/src/java/org/apache/lucene/search/FilterWeight.javaindex 16bb75ef406..018787d6d1b 100644--- a/lucene/core/src/java/org/apache/lucene/search/FilterWeight.java+++ b/lucene/core/src/java/org/apache/lucene/search/FilterWeight.java@@ -23,10 +23,6 @@ import org.apache.lucene.index.LeafReaderContext;* 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 abstract class FilterWeight extends Weight {public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOException {return in.scorerSupplier(context);}++ @Override+ public int count(LeafReaderContext context) throws IOException {+ return in.count(context);+ }}diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.java b/lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.javaindex a6177ab892b..64fc5bb057a 100644--- a/lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.java+++ b/lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.java@@ -18,7 +18,6 @@ package org.apache.lucene.search;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,28 +35,6 @@ public class TestFilterWeight extends LuceneTestCase {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 (NoSuchMethodException _) {- /* 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(diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.javaindex 9b118d3cf2e..242089568bc 100644--- a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java+++ b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java@@ -240,6 +240,11 @@ final class GlobalOrdinalsWithScoreQuery extends Query implements Accountable {// the memory used by the cachereturn false;}++ @Override+ public int count(LeafReaderContext context) {+ return -1;+ }}static final class OrdinalMapScorer extends BaseGlobalOrdinalScorer {diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.javaindex 6fd0dc99e6d..df0f4748aa5 100644--- a/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java+++ b/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java@@ -135,6 +135,11 @@ public class ToChildBlockJoinQuery extends Query {}return Explanation.noMatch("Not a match");}++ @Override+ public int count(LeafReaderContext context) {+ return -1;+ }}static class ToChildBlockJoinScorer extends Scorer {diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.javaindex 25b705b4efc..3fc0f2fbf66 100644--- a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java+++ b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java@@ -217,6 +217,11 @@ public class ToParentBlockJoinQuery extends Query {}return MatchesUtils.MATCH_WITH_NO_TERMS;}++ @Override+ public int count(LeafReaderContext context) {+ return -1;+ }}private static class ParentApproximation extends DocIdSetIterator {diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/RandomApproximationQuery.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/RandomApproximationQuery.javaindex 92f247e3754..efca4b2ad0a 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/RandomApproximationQuery.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/RandomApproximationQuery.java@@ -100,6 +100,11 @@ public class RandomApproximationQuery extends Query {}return new DefaultScorerSupplier(scorer);}++ @Override+ public int count(LeafReaderContext context) {+ return -1;+ }}private static class RandomApproximationScorer extends Scorer {