Skip to content

Apache Lucene open-source search software

Remove DISIDocIdStream. (#14550)

Adrien Grand26b3a155dfdd
diff --git a/lucene/core/src/java/org/apache/lucene/search/DISIDocIdStream.java b/lucene/core/src/java/org/apache/lucene/search/DISIDocIdStream.java
deleted file mode 100644
index 201cbfe09fa..00000000000
--- a/lucene/core/src/java/org/apache/lucene/search/DISIDocIdStream.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.lucene.search;
-
-import java.io.IOException;
-import org.apache.lucene.util.FixedBitSet;
-
-final class DISIDocIdStream extends DocIdStream {
-
- private final DocIdSetIterator iterator;
- private final int max;
- private final FixedBitSet spare;
-
- DISIDocIdStream(DocIdSetIterator iterator, int max, FixedBitSet spare) {
- if (max - iterator.docID() > spare.length()) {
- throw new IllegalArgumentException("Bit set is too small to hold all potential matches");
- }
- this.iterator = iterator;
- this.max = max;
- this.spare = spare;
- }
-
- @Override
- public boolean mayHaveRemaining() {
- return iterator.docID() < max;
- }
-
- @Override
- public void forEach(int upTo, CheckedIntConsumer<IOException> consumer) throws IOException {
- // If there are no live docs to apply, loading matching docs into a bit set and then iterating
- // bits is unlikely to beat iterating the iterator directly.
- upTo = Math.min(upTo, max);
- for (int doc = iterator.docID(); doc < upTo; doc = iterator.nextDoc()) {
- consumer.accept(doc);
- }
- }
-
- @Override
- public int count(int upTo) throws IOException {
- upTo = Math.min(upTo, max);
- if (iterator.docID() >= upTo) {
- return 0;
- }
- // If the collector is just interested in the count, loading in a bit set and counting bits is
- // often faster than incrementing a counter on every call to nextDoc().
- assert spare.scanIsEmpty();
- int offset = iterator.docID();
- iterator.intoBitSet(upTo, spare, offset);
- int count = spare.cardinality(0, upTo - offset);
- spare.clear(0, upTo - offset);
- assert spare.scanIsEmpty();
- return count;
- }
-}
diff --git a/lucene/core/src/java/org/apache/lucene/search/DenseConjunctionBulkScorer.java b/lucene/core/src/java/org/apache/lucene/search/DenseConjunctionBulkScorer.java
index 57ad593916c..22909d45400 100644
--- a/lucene/core/src/java/org/apache/lucene/search/DenseConjunctionBulkScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/DenseConjunctionBulkScorer.java
@@ -198,17 +198,7 @@ final class DenseConjunctionBulkScorer extends BulkScorer {
int bitsetWindowMax = (int) Math.min(minDocIDRunEnd, (long) WINDOW_SIZE + min);
if (windowTwoPhases.isEmpty()) {
- if (acceptDocs == null && windowApproximations.size() == 1) {
- // We have a range of doc IDs where all matches of an iterator are matches of the
- // conjunction.
- DocIdSetIterator iterator = windowApproximations.get(0);
- if (iterator.docID() < min) {
- iterator.advance(min);
- }
- collector.collect(new DISIDocIdStream(iterator, bitsetWindowMax, clauseWindowMatches));
- } else {
- scoreWindowUsingBitSet(collector, acceptDocs, windowApproximations, min, bitsetWindowMax);
- }
+ scoreWindowUsingBitSet(collector, acceptDocs, windowApproximations, min, bitsetWindowMax);
} else {
windowTwoPhases.sort(Comparator.comparingDouble(TwoPhaseIterator::matchCost));
scoreWindowUsingLeapFrog(
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDISIDocIdStream.java b/lucene/core/src/test/org/apache/lucene/search/TestDISIDocIdStream.java
deleted file mode 100644
index 0948c236884..00000000000
--- a/lucene/core/src/test/org/apache/lucene/search/TestDISIDocIdStream.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * 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.lucene.search;
-
-import java.io.IOException;
-import org.apache.lucene.tests.util.LuceneTestCase;
-import org.apache.lucene.tests.util.TestUtil;
-import org.apache.lucene.util.BitSetIterator;
-import org.apache.lucene.util.FixedBitSet;
-
-public class TestDISIDocIdStream extends LuceneTestCase {
-
- private static FixedBitSet randomBitSet() {
- FixedBitSet set = new FixedBitSet(100);
- for (int i = TestUtil.nextInt(random(), 0, 5);
- i < set.length();
- i += TestUtil.nextInt(random(), 1, 5)) {
- set.set(i);
- }
- return set;
- }
-
- public void testForEach() throws IOException {
- FixedBitSet bitSet = randomBitSet();
- BitSetIterator iterator = new BitSetIterator(bitSet, bitSet.approximateCardinality());
- iterator.advance(42);
- DocIdStream stream = new DISIDocIdStream(iterator, 80, new FixedBitSet(40));
-
- BitSetIterator expected = new BitSetIterator(bitSet, bitSet.approximateCardinality());
- expected.advance(42);
-
- stream.forEach(
- doc -> {
- assertEquals(expected.docID(), doc);
- assertTrue(doc < 80);
- expected.nextDoc();
- });
- assertTrue(expected.docID() >= 80);
- }
-
- public void testCount() throws IOException {
- FixedBitSet bitSet = randomBitSet();
- BitSetIterator iterator = new BitSetIterator(bitSet, bitSet.approximateCardinality());
- iterator.advance(42);
- DocIdStream stream = new DISIDocIdStream(iterator, 80, new FixedBitSet(40));
- assertEquals(bitSet.cardinality(42, 80), stream.count());
- }
-
- public void testForEachUpTo() throws IOException {
- FixedBitSet bitSet = randomBitSet();
- BitSetIterator iterator = new BitSetIterator(bitSet, bitSet.approximateCardinality());
- iterator.advance(42);
- DocIdStream stream = new DISIDocIdStream(iterator, 80, new FixedBitSet(40));
-
- BitSetIterator expected = new BitSetIterator(bitSet, bitSet.approximateCardinality());
- expected.advance(42);
-
- assertTrue(stream.mayHaveRemaining());
- stream.forEach(40, _ -> fail());
-
- assertTrue(stream.mayHaveRemaining());
- stream.forEach(
- 60,
- doc -> {
- assertEquals(expected.docID(), doc);
- assertTrue(doc < 60);
- expected.nextDoc();
- });
- assertTrue(expected.docID() >= 60);
-
- assertTrue(stream.mayHaveRemaining());
- stream.forEach(
- 120,
- doc -> {
- assertEquals(expected.docID(), doc);
- assertTrue(doc < 80);
- expected.nextDoc();
- });
- assertTrue(expected.docID() >= 80);
-
- assertFalse(stream.mayHaveRemaining());
- }
-
- public void testCountUpTo() throws IOException {
- FixedBitSet bitSet = randomBitSet();
- BitSetIterator iterator = new BitSetIterator(bitSet, bitSet.approximateCardinality());
- iterator.advance(42);
- DocIdStream stream = new DISIDocIdStream(iterator, 80, new FixedBitSet(40));
-
- assertTrue(stream.mayHaveRemaining());
- assertEquals(0, stream.count(40));
-
- assertTrue(stream.mayHaveRemaining());
- assertEquals(bitSet.cardinality(42, 60), stream.count(60));
-
- assertTrue(stream.mayHaveRemaining());
- assertEquals(bitSet.cardinality(60, 80), stream.count(120));
-
- assertFalse(stream.mayHaveRemaining());
-
- assertEquals(0, stream.count(40)); // we're well past this doc
- assertEquals(0, stream.count(100)); // we're well past this doc/max
- assertEquals(0, stream.count()); // we're well past this doc/max
- }
-
- // Tests that count when the iterator, but not the external interaction with the stream,
- // is past max does not fail, returns 0.
- public void testCountUpTo2() throws IOException {
- FixedBitSet bitSet = new FixedBitSet(100);
- bitSet.set(1);
- bitSet.set(85);
- BitSetIterator iterator = new BitSetIterator(bitSet, bitSet.approximateCardinality());
- DocIdStream stream = new DISIDocIdStream(iterator, 80, new FixedBitSet(100));
- iterator.advance(1);
-
- assertEquals(1, stream.count(79));
- assertEquals(0, stream.count());
- }
-
- public void testMixForEachCountUpTo() throws IOException {
- FixedBitSet bitSet = randomBitSet();
- BitSetIterator iterator = new BitSetIterator(bitSet, bitSet.approximateCardinality());
- iterator.advance(42);
- DocIdStream stream = new DISIDocIdStream(iterator, 80, new FixedBitSet(40));
-
- BitSetIterator expected = new BitSetIterator(bitSet, bitSet.approximateCardinality());
-
- assertTrue(stream.mayHaveRemaining());
- stream.forEach(40, _ -> fail());
-
- assertTrue(stream.mayHaveRemaining());
- assertEquals(bitSet.cardinality(42, 50), stream.count(50));
-
- assertTrue(stream.mayHaveRemaining());
- expected.advance(50);
- stream.forEach(
- 60,
- doc -> {
- assertEquals(expected.docID(), doc);
- assertTrue(doc < 60);
- expected.nextDoc();
- });
- assertTrue(expected.docID() >= 60);
-
- assertTrue(stream.mayHaveRemaining());
- assertEquals(bitSet.cardinality(60, 70), stream.count(70));
-
- assertTrue(stream.mayHaveRemaining());
- expected.advance(70);
- stream.forEach(
- 120,
- doc -> {
- assertEquals(expected.docID(), doc);
- assertTrue(doc < 80);
- expected.nextDoc();
- });
- assertTrue(expected.docID() >= 80);
-
- assertFalse(stream.mayHaveRemaining());
- }
-}