Update to honor enableSkipping in XFieldComparatorSource

Signed-off-by: Marc Handalian <[email protected]>
opensearch-project · Dec 4, 2023 · 2c9ce79 · 2c9ce79
1 parent 26f9fc6
commit 2c9ce79
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 13 deletions.
diff --git a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java
@@ -121,13 +121,13 @@ abstract class XFieldComparatorSource extends FieldComparatorSource {
         protected final MultiValueMode sortMode;
         protected final Object missingValue;
         protected final Nested nested;
-        protected Pruning pruning;
+        protected boolean enableSkipping;
 
         public XFieldComparatorSource(Object missingValue, MultiValueMode sortMode, Nested nested) {
             this.sortMode = sortMode;
             this.missingValue = missingValue;
             this.nested = nested;
-            this.pruning = Pruning.GREATER_THAN; // true by default
+            this.enableSkipping = true; // true by default
         }
 
         public MultiValueMode sortMode() {
@@ -139,7 +139,14 @@ public Nested nested() {
         }
 
         public void disableSkipping() {
-            this.pruning = Pruning.NONE;
+            this.enableSkipping = false;
+        }
+
+        protected Pruning filterPruning(Pruning pruning) {
+            if (this.enableSkipping) {
+                return pruning;
+            }
+            return Pruning.NONE;
         }
 
         /**

diff --git a/...in/java/org/opensearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java b/...in/java/org/opensearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java
@@ -102,7 +102,7 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning p
                 indexFieldData.getFieldName(),
                 sortMissingLast,
                 reversed,
-                pruning
+                filterPruning(pruning)
             ) {
 
                 @Override

diff --git a/...ain/java/org/opensearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java b/...ain/java/org/opensearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java
@@ -98,7 +98,7 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning p
         assert indexFieldData == null || fieldname.equals(indexFieldData.getFieldName());
 
         final double dMissingValue = (Double) missingObject(missingValue, reversed);
-        return new DoubleComparator(numHits, fieldname, dMissingValue, reversed, pruning) {
+        return new DoubleComparator(numHits, fieldname, dMissingValue, reversed, filterPruning(pruning)) {
             @Override
             public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
                 return new DoubleLeafComparator(context) {

diff --git a/...main/java/org/opensearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java b/...main/java/org/opensearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java
@@ -91,7 +91,7 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning p
         assert indexFieldData == null || fieldname.equals(indexFieldData.getFieldName());
 
         final float fMissingValue = (Float) missingObject(missingValue, reversed);
-        return new FloatComparator(numHits, fieldname, fMissingValue, reversed, pruning) {
+        return new FloatComparator(numHits, fieldname, fMissingValue, reversed, filterPruning(pruning)) {
             @Override
             public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
                 return new FloatLeafComparator(context) {

diff --git a/.../java/org/opensearch/index/fielddata/fieldcomparator/HalfFloatValuesComparatorSource.java b/.../java/org/opensearch/index/fielddata/fieldcomparator/HalfFloatValuesComparatorSource.java
@@ -47,7 +47,7 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning p
         assert indexFieldData == null || fieldname.equals(indexFieldData.getFieldName());
 
         final float fMissingValue = (Float) missingObject(missingValue, reversed);
-        return new HalfFloatComparator(numHits, fieldname, fMissingValue, reversed, pruning) {
+        return new HalfFloatComparator(numHits, fieldname, fMissingValue, reversed, filterPruning(pruning)) {
             @Override
             public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
                 return new HalfFloatLeafComparator(context) {

diff --git a/...c/main/java/org/opensearch/index/fielddata/fieldcomparator/IntValuesComparatorSource.java b/...c/main/java/org/opensearch/index/fielddata/fieldcomparator/IntValuesComparatorSource.java
@@ -71,7 +71,7 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning p
         assert indexFieldData == null || fieldname.equals(indexFieldData.getFieldName());
 
         final int iMissingValue = (Integer) missingObject(missingValue, reversed);
-        return new IntComparator(numHits, fieldname, iMissingValue, reversed, pruning) {
+        return new IntComparator(numHits, fieldname, iMissingValue, reversed, filterPruning(pruning)) {
             @Override
             public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
                 return new IntLeafComparator(context) {

diff --git a/.../main/java/org/opensearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java b/.../main/java/org/opensearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java
@@ -115,7 +115,7 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning p
         assert indexFieldData == null || fieldname.equals(indexFieldData.getFieldName());
 
         final long lMissingValue = (Long) missingObject(missingValue, reversed);
-        return new LongComparator(numHits, fieldname, lMissingValue, reversed, pruning) {
+        return new LongComparator(numHits, fieldname, lMissingValue, reversed, filterPruning(pruning)) {
             @Override
             public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
                 return new LongLeafComparator(context) {

diff --git a/...va/org/opensearch/index/fielddata/fieldcomparator/UnsignedLongValuesComparatorSource.java b/...va/org/opensearch/index/fielddata/fieldcomparator/UnsignedLongValuesComparatorSource.java
@@ -89,7 +89,7 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning p
         assert indexFieldData == null || fieldname.equals(indexFieldData.getFieldName());
 
         final BigInteger ulMissingValue = (BigInteger) missingObject(missingValue, reversed);
-        return new UnsignedLongComparator(numHits, fieldname, ulMissingValue, reversed, pruning) {
+        return new UnsignedLongComparator(numHits, fieldname, ulMissingValue, reversed, filterPruning(pruning)) {
             @Override
             public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
                 return new UnsignedLongLeafComparator(context) {

diff --git a/...rc/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregator.java b/...rc/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregator.java
@@ -37,7 +37,23 @@
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.lucene.index.SortedNumericDocValues;
 import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.CollectionTerminatedException;
+import org.apache.lucene.search.DocIdSet;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.FieldComparator;
+import org.apache.lucene.search.FieldDoc;
+import org.apache.lucene.search.LeafFieldComparator;
+import org.apache.lucene.search.Pruning;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.SortedNumericSelector;
+import org.apache.lucene.search.SortedNumericSortField;
+import org.apache.lucene.search.Weight;
 import org.apache.lucene.search.comparators.LongComparator;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.RoaringDocIdSet;
@@ -340,7 +356,7 @@ public int hashCode() {
 
                     @Override
                     public FieldComparator<?> getComparator(int numHits, Pruning pruning) {
-                        return new LongComparator(1, delegate.getField(), (Long) missingValue, delegate.getReverse(), pruning) {
+                        return new LongComparator(1, delegate.getField(), (Long) missingValue, delegate.getReverse(), Pruning.NONE) {
                             @Override
                             public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
                                 return new LongLeafComparator(context) {

diff --git a/server/src/main/java/org/opensearch/search/sort/GeoDistanceSortBuilder.java b/server/src/main/java/org/opensearch/search/sort/GeoDistanceSortBuilder.java
@@ -732,7 +732,7 @@ private NumericDoubleValues getNumericDoubleValues(LeafReaderContext context) th
 
             @Override
             public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {
-                return new DoubleComparator(numHits, null, null, reversed, pruning) {
+                return new DoubleComparator(numHits, null, null, reversed, filterPruning(pruning)) {
                     @Override
                     public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
                         return new DoubleLeafComparator(context) {