remove range tree impl

apache · Jan 10, 2025 · 71bf057 · 71bf057
1 parent e63d9ae
commit 71bf057
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 97 deletions.
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesMultiRangeQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/DocValuesMultiRangeQuery.java
@@ -16,16 +16,10 @@
  */
 package org.apache.lucene.sandbox.search;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.TreeSet;
 import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.DocValuesSkipper;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.index.SortedSetDocValues;
 import org.apache.lucene.search.*;
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BytesRef;
@@ -121,92 +115,4 @@ SortedSetDocValuesMultiRangeQuery createSortedSetDocValuesMultiRangeQuery() {
           fieldName, clauses, this.bytesPerDim, comparator);
     }
   }
-
-  /**
-   * Builder like {@link SortedSetStabbingFixedBuilder} but using log(ranges) lookup per doc value
-   * instead of bitset check
-   */
-  public static class SortedSetStabbingFixedTreeBuilder extends SortedSetStabbingFixedBuilder {
-
-    public SortedSetStabbingFixedTreeBuilder(String fieldName, int bytesPerDim) {
-      super(fieldName, bytesPerDim);
-    }
-
-    @Override
-    SortedSetDocValuesMultiRangeQuery createSortedSetDocValuesMultiRangeQuery() {
-      return new SortedSetDocValuesMultiRangeQuery(
-          fieldName, clauses, this.bytesPerDim, comparator) {
-        @Override
-        public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost)
-            throws IOException {
-          return new MultiRangeWeight(boost, scoreMode) {
-            @Override
-            public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOException {
-              if (context.reader().getFieldInfos().fieldInfo(fieldName) == null) {
-                return null;
-              }
-              SortedSetDocValues values = DocValues.getSortedSet(context.reader(), fieldName);
-
-              return new MultiRangeScorerSupplier(values, context) {
-                @Override
-                public Scorer get(long leadCost) throws IOException {
-                  assert !rangeClauses.isEmpty() : "Builder should prevent it";
-                  TreeSet<OrdRange> ordRanges =
-                      new TreeSet<>((or1, or2) -> (int) (or1.lower - or2.lower));
-                  createOrdRanges(this.values, ordRanges);
-                  if (ordRanges.isEmpty()) {
-                    return empty();
-                  }
-                  long minOrd = ordRanges.getFirst().lower, maxOrd = ordRanges.getLast().upper;
-
-                  DocValuesSkipper skipper = this.context.reader().getDocValuesSkipper(fieldName);
-
-                  if (skipper != null
-                      && (minOrd > skipper.maxValue() || maxOrd < skipper.minValue())) {
-                    return empty();
-                  }
-
-                  TwoPhaseIterator iterator;
-                  SortedSetDocValues docValues = this.values;
-                  int depth = 1;
-                  for (int pow = 1; pow < ordRanges.size(); pow <<= 1, depth += 1)
-                    ;
-                  int finalDepth = depth;
-                  iterator =
-                      new TwoPhaseIterator(docValues) {
-                        // TODO unwrap singleton?
-                        @Override
-                        public boolean matches() throws IOException {
-                          for (int i = 0; i < docValues.docValueCount(); i++) {
-                            long ord = docValues.nextOrd();
-                            if (ord >= minOrd && ord <= maxOrd) {
-                              // TODO reuse instance, lookup increasing
-                              OrdRange lessOrEq = ordRanges.floor(new OrdRange(ord, ord));
-                              if (lessOrEq != null && lessOrEq.upper >= ord) {
-                                assert lessOrEq.lower <= ord;
-                                return true;
-                              }
-                            }
-                          }
-                          return false;
-                        }
-
-                        @Override
-                        public float matchCost() {
-                          return finalDepth; // 2 comparisons
-                        }
-                      };
-                  //                        }
-                  if (skipper != null) {
-                    iterator = new DocValuesRangeIterator(iterator, skipper, minOrd, maxOrd, true);
-                  }
-                  return new ConstantScoreScorer(score(), scoreMode, iterator);
-                }
-              };
-            }
-          };
-        }
-      };
-    }
-  }
 }
diff --git a/.../sandbox/src/java/org/apache/lucene/sandbox/search/SortedSetDocValuesMultiRangeQuery.java b/.../sandbox/src/java/org/apache/lucene/sandbox/search/SortedSetDocValuesMultiRangeQuery.java
@@ -286,7 +286,6 @@ public MultiRangeScorerSupplier(SortedSetDocValues values, LeafReaderContext con
 
       @Override
       public Scorer get(long leadCost) throws IOException {
-        assert !rangeClauses.isEmpty() : "Builder should prevent it";
         List<OrdRange> ordRanges = new ArrayList<>();
         createOrdRanges(values, ordRanges);
         if (ordRanges.isEmpty()) {

diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestSsDvMultiRangeQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestSsDvMultiRangeQuery.java
@@ -96,8 +96,7 @@ public void testDuelWithStandardDisjunction() throws IOException {
       LongPointMultiRangeBuilder builder1 = new LongPointMultiRangeBuilder("point", dims);
       BooleanQuery.Builder builder2 = new BooleanQuery.Builder();
       DocValuesMultiRangeQuery.SortedSetStabbingFixedBuilder builder3 =
-          // new DocValuesMultiRangeQuery.SordedSetStabbingFixedBuilder("docVal", Long.BYTES);
-          new DocValuesMultiRangeQuery.SortedSetStabbingFixedTreeBuilder("docVal", Long.BYTES);
+          new DocValuesMultiRangeQuery.SortedSetStabbingFixedBuilder("docVal", Long.BYTES);
 
       for (int i = 0; i < numRanges; i++) {
         long[] lower = new long[dims];