You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2022/11/24 15:37:25 UTC
[lucene] branch main updated: Remove QueryTimeout#isTimeoutEnabled method and move check to caller (#11954)
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new b15ace46b27 Remove QueryTimeout#isTimeoutEnabled method and move check to caller (#11954)
b15ace46b27 is described below
commit b15ace46b27284c431894a286fd5e54ec8fc1f96
Author: Shubham Chaudhary <36...@users.noreply.github.com>
AuthorDate: Thu Nov 24 21:07:20 2022 +0530
Remove QueryTimeout#isTimeoutEnabled method and move check to caller (#11954)
Co-authored-by: Shubham <cs...@amazon.com>
---
lucene/CHANGES.txt | 2 +
.../lucene/index/ExitableDirectoryReader.java | 333 ++++++++++-----------
.../java/org/apache/lucene/index/QueryTimeout.java | 7 -
.../org/apache/lucene/search/IndexSearcher.java | 2 +-
.../lucene/search/TimeLimitingBulkScorer.java | 5 +-
.../lucene/index/TestExitableDirectoryReader.java | 84 +-----
.../lucene/search/TestTimeLimitingBulkScorer.java | 5 -
7 files changed, 174 insertions(+), 264 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 6d85af8eac0..b3d5f23e448 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -158,6 +158,8 @@ Bug Fixes
* GITHUB#11907: Fix latent casting bugs in BKDWriter. (Ben Trent)
+* GITHUB#11954: Remove QueryTimeout#isTimeoutEnabled method and move check to caller. (Shubham Chaudhary)
+
Optimizations
---------------------
* GITHUB#11738: Optimize MultiTermQueryConstantScoreWrapper when a term is present that matches all
diff --git a/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
index 8bb1e449f47..09da414221a 100644
--- a/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
@@ -17,6 +17,7 @@
package org.apache.lucene.index;
import java.io.IOException;
+import java.util.Objects;
import org.apache.lucene.index.FilterLeafReader.FilterTerms;
import org.apache.lucene.index.FilterLeafReader.FilterTermsEnum;
import org.apache.lucene.search.DocIdSetIterator;
@@ -53,7 +54,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
/** Constructor * */
public ExitableSubReaderWrapper(QueryTimeout queryTimeout) {
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
}
@Override
@@ -72,7 +73,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
/** Constructor * */
public ExitableFilterAtomicReader(LeafReader in, QueryTimeout queryTimeout) {
super(in);
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
}
@Override
@@ -81,9 +82,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
if (pointValues == null) {
return null;
}
- return (queryTimeout.isTimeoutEnabled())
- ? new ExitablePointValues(pointValues, queryTimeout)
- : pointValues;
+ return new ExitablePointValues(pointValues, queryTimeout);
}
@Override
@@ -92,7 +91,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
if (terms == null) {
return null;
}
- return (queryTimeout.isTimeoutEnabled()) ? new ExitableTerms(terms, queryTimeout) : terms;
+ return new ExitableTerms(terms, queryTimeout);
}
// this impl does not change deletes or data so we can delegate the
@@ -113,41 +112,39 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
if (numericDocValues == null) {
return null;
}
- return (queryTimeout.isTimeoutEnabled())
- ? new FilterNumericDocValues(numericDocValues) {
- private int docToCheck = 0;
-
- @Override
- public int advance(int target) throws IOException {
- final int advance = super.advance(target);
- if (advance >= docToCheck) {
- checkAndThrow(in);
- docToCheck = advance + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advance;
- }
+ return new FilterNumericDocValues(numericDocValues) {
+ private int docToCheck = 0;
+
+ @Override
+ public int advance(int target) throws IOException {
+ final int advance = super.advance(target);
+ if (advance >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = advance + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advance;
+ }
- @Override
- public boolean advanceExact(int target) throws IOException {
- final boolean advanceExact = super.advanceExact(target);
- if (target >= docToCheck) {
- checkAndThrow(in);
- docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advanceExact;
- }
+ @Override
+ public boolean advanceExact(int target) throws IOException {
+ final boolean advanceExact = super.advanceExact(target);
+ if (target >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advanceExact;
+ }
- @Override
- public int nextDoc() throws IOException {
- final int nextDoc = super.nextDoc();
- if (nextDoc >= docToCheck) {
- checkAndThrow(in);
- docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return nextDoc;
- }
+ @Override
+ public int nextDoc() throws IOException {
+ final int nextDoc = super.nextDoc();
+ if (nextDoc >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
}
- : numericDocValues;
+ return nextDoc;
+ }
+ };
}
@Override
@@ -156,41 +153,39 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
if (binaryDocValues == null) {
return null;
}
- return (queryTimeout.isTimeoutEnabled())
- ? new FilterBinaryDocValues(binaryDocValues) {
- private int docToCheck = 0;
-
- @Override
- public int advance(int target) throws IOException {
- final int advance = super.advance(target);
- if (target >= docToCheck) {
- checkAndThrow(in);
- docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advance;
- }
+ return new FilterBinaryDocValues(binaryDocValues) {
+ private int docToCheck = 0;
+
+ @Override
+ public int advance(int target) throws IOException {
+ final int advance = super.advance(target);
+ if (target >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advance;
+ }
- @Override
- public boolean advanceExact(int target) throws IOException {
- final boolean advanceExact = super.advanceExact(target);
- if (target >= docToCheck) {
- checkAndThrow(in);
- docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advanceExact;
- }
+ @Override
+ public boolean advanceExact(int target) throws IOException {
+ final boolean advanceExact = super.advanceExact(target);
+ if (target >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advanceExact;
+ }
- @Override
- public int nextDoc() throws IOException {
- final int nextDoc = super.nextDoc();
- if (nextDoc >= docToCheck) {
- checkAndThrow(in);
- docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return nextDoc;
- }
+ @Override
+ public int nextDoc() throws IOException {
+ final int nextDoc = super.nextDoc();
+ if (nextDoc >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
}
- : binaryDocValues;
+ return nextDoc;
+ }
+ };
}
@Override
@@ -199,42 +194,40 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
if (sortedDocValues == null) {
return null;
}
- return (queryTimeout.isTimeoutEnabled())
- ? new FilterSortedDocValues(sortedDocValues) {
+ return new FilterSortedDocValues(sortedDocValues) {
- private int docToCheck = 0;
+ private int docToCheck = 0;
- @Override
- public int advance(int target) throws IOException {
- final int advance = super.advance(target);
- if (advance >= docToCheck) {
- checkAndThrow(in);
- docToCheck = advance + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advance;
- }
+ @Override
+ public int advance(int target) throws IOException {
+ final int advance = super.advance(target);
+ if (advance >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = advance + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advance;
+ }
- @Override
- public boolean advanceExact(int target) throws IOException {
- final boolean advanceExact = super.advanceExact(target);
- if (target >= docToCheck) {
- checkAndThrow(in);
- docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advanceExact;
- }
+ @Override
+ public boolean advanceExact(int target) throws IOException {
+ final boolean advanceExact = super.advanceExact(target);
+ if (target >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advanceExact;
+ }
- @Override
- public int nextDoc() throws IOException {
- final int nextDoc = super.nextDoc();
- if (nextDoc >= docToCheck) {
- checkAndThrow(in);
- docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return nextDoc;
- }
+ @Override
+ public int nextDoc() throws IOException {
+ final int nextDoc = super.nextDoc();
+ if (nextDoc >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
}
- : sortedDocValues;
+ return nextDoc;
+ }
+ };
}
@Override
@@ -243,42 +236,40 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
if (sortedNumericDocValues == null) {
return null;
}
- return (queryTimeout.isTimeoutEnabled())
- ? new FilterSortedNumericDocValues(sortedNumericDocValues) {
+ return new FilterSortedNumericDocValues(sortedNumericDocValues) {
- private int docToCheck = 0;
+ private int docToCheck = 0;
- @Override
- public int advance(int target) throws IOException {
- final int advance = super.advance(target);
- if (advance >= docToCheck) {
- checkAndThrow(in);
- docToCheck = advance + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advance;
- }
+ @Override
+ public int advance(int target) throws IOException {
+ final int advance = super.advance(target);
+ if (advance >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = advance + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advance;
+ }
- @Override
- public boolean advanceExact(int target) throws IOException {
- final boolean advanceExact = super.advanceExact(target);
- if (target >= docToCheck) {
- checkAndThrow(in);
- docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advanceExact;
- }
+ @Override
+ public boolean advanceExact(int target) throws IOException {
+ final boolean advanceExact = super.advanceExact(target);
+ if (target >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advanceExact;
+ }
- @Override
- public int nextDoc() throws IOException {
- final int nextDoc = super.nextDoc();
- if (nextDoc >= docToCheck) {
- checkAndThrow(in);
- docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return nextDoc;
- }
+ @Override
+ public int nextDoc() throws IOException {
+ final int nextDoc = super.nextDoc();
+ if (nextDoc >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
}
- : sortedNumericDocValues;
+ return nextDoc;
+ }
+ };
}
@Override
@@ -287,42 +278,40 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
if (sortedSetDocValues == null) {
return null;
}
- return (queryTimeout.isTimeoutEnabled())
- ? new FilterSortedSetDocValues(sortedSetDocValues) {
+ return new FilterSortedSetDocValues(sortedSetDocValues) {
- private int docToCheck = 0;
+ private int docToCheck = 0;
- @Override
- public int advance(int target) throws IOException {
- final int advance = super.advance(target);
- if (advance >= docToCheck) {
- checkAndThrow(in);
- docToCheck = advance + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advance;
- }
+ @Override
+ public int advance(int target) throws IOException {
+ final int advance = super.advance(target);
+ if (advance >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = advance + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advance;
+ }
- @Override
- public boolean advanceExact(int target) throws IOException {
- final boolean advanceExact = super.advanceExact(target);
- if (target >= docToCheck) {
- checkAndThrow(in);
- docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return advanceExact;
- }
+ @Override
+ public boolean advanceExact(int target) throws IOException {
+ final boolean advanceExact = super.advanceExact(target);
+ if (target >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = target + DOCS_BETWEEN_TIMEOUT_CHECK;
+ }
+ return advanceExact;
+ }
- @Override
- public int nextDoc() throws IOException {
- final int nextDoc = super.nextDoc();
- if (nextDoc >= docToCheck) {
- checkAndThrow(in);
- docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
- }
- return nextDoc;
- }
+ @Override
+ public int nextDoc() throws IOException {
+ final int nextDoc = super.nextDoc();
+ if (nextDoc >= docToCheck) {
+ checkAndThrow(in);
+ docToCheck = nextDoc + DOCS_BETWEEN_TIMEOUT_CHECK;
}
- : sortedSetDocValues;
+ return nextDoc;
+ }
+ };
}
@Override
@@ -331,9 +320,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
if (vectorValues == null) {
return null;
}
- return (queryTimeout.isTimeoutEnabled())
- ? new ExitableVectorValues(vectorValues)
- : vectorValues;
+ return new ExitableVectorValues(vectorValues);
}
@Override
@@ -465,7 +452,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
private ExitablePointValues(PointValues in, QueryTimeout queryTimeout) {
this.in = in;
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
checkAndThrow();
}
@@ -549,7 +536,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
PointValues pointValues, PointValues.PointTree in, QueryTimeout queryTimeout) {
this.pointValues = pointValues;
this.in = in;
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
this.exitableIntersectVisitor = new ExitableIntersectVisitor(queryTimeout);
}
@@ -641,7 +628,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
private int calls;
private ExitableIntersectVisitor(QueryTimeout queryTimeout) {
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
}
private void setIntersectVisitor(PointValues.IntersectVisitor in) {
@@ -704,7 +691,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
/** Constructor * */
public ExitableTerms(Terms terms, QueryTimeout queryTimeout) {
super(terms);
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
}
@Override
@@ -731,7 +718,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
/** Constructor * */
public ExitableTermsEnum(TermsEnum termsEnum, QueryTimeout queryTimeout) {
super(termsEnum);
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
checkTimeoutWithSampling();
}
@@ -770,11 +757,12 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
*/
public ExitableDirectoryReader(DirectoryReader in, QueryTimeout queryTimeout) throws IOException {
super(in, new ExitableSubReaderWrapper(queryTimeout));
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
}
@Override
protected DirectoryReader doWrapDirectoryReader(DirectoryReader in) throws IOException {
+ Objects.requireNonNull(queryTimeout, "Query timeout must not be null");
return new ExitableDirectoryReader(in, queryTimeout);
}
@@ -784,6 +772,7 @@ public class ExitableDirectoryReader extends FilterDirectoryReader {
*/
public static DirectoryReader wrap(DirectoryReader in, QueryTimeout queryTimeout)
throws IOException {
+ Objects.requireNonNull(queryTimeout, "Query timeout must not be null");
return new ExitableDirectoryReader(in, queryTimeout);
}
diff --git a/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java b/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java
index 0f9ac1ce7f4..0c64f4c2c9a 100644
--- a/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java
+++ b/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java
@@ -27,11 +27,4 @@ public interface QueryTimeout {
* stop processing a query.
*/
public abstract boolean shouldExit();
-
- /**
- * Returns true if timeouts are enabled for this query (i.e. if shouldExit would ever return true)
- */
- public default boolean isTimeoutEnabled() {
- return true;
- }
}
diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
index 6d16e76365f..1f114105d9a 100644
--- a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
+++ b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
@@ -737,7 +737,7 @@ public class IndexSearcher {
}
BulkScorer scorer = weight.bulkScorer(ctx);
if (scorer != null) {
- if (queryTimeout != null && queryTimeout.isTimeoutEnabled()) {
+ if (queryTimeout != null) {
scorer = new TimeLimitingBulkScorer(scorer, queryTimeout);
}
try {
diff --git a/lucene/core/src/java/org/apache/lucene/search/TimeLimitingBulkScorer.java b/lucene/core/src/java/org/apache/lucene/search/TimeLimitingBulkScorer.java
index 4d8c00b04cd..83687491a3d 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TimeLimitingBulkScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TimeLimitingBulkScorer.java
@@ -18,6 +18,7 @@
package org.apache.lucene.search;
import java.io.IOException;
+import java.util.Objects;
import org.apache.lucene.index.QueryTimeout;
import org.apache.lucene.util.Bits;
@@ -55,14 +56,14 @@ final class TimeLimitingBulkScorer extends BulkScorer {
*/
public TimeLimitingBulkScorer(BulkScorer bulkScorer, QueryTimeout queryTimeout) {
this.in = bulkScorer;
- this.queryTimeout = queryTimeout;
+ this.queryTimeout = Objects.requireNonNull(queryTimeout);
}
@Override
public int score(LeafCollector collector, Bits acceptDocs, int min, int max) throws IOException {
while (min < max) {
final int newMax = (int) Math.min((long) min + INTERVAL, max);
- if (queryTimeout.shouldExit() == true) {
+ if (queryTimeout.shouldExit()) {
throw new TimeLimitingBulkScorer.TimeExceededException();
}
min = in.score(collector, acceptDocs, min, newMax); // in is the wrapped bulk scorer
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java
index eed079a8bfe..03476c14a26 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java
@@ -164,17 +164,6 @@ public class TestExitableDirectoryReader extends LuceneTestCase {
searcher = new IndexSearcher(reader);
searcher.search(query, 10);
reader.close();
-
- // Set a negative time allowed and expect the query to complete (should disable timeouts)
- // Not checking the validity of the result, all we are bothered about in this test is the timing
- // out.
- directoryReader = DirectoryReader.open(directory);
- exitableDirectoryReader = new ExitableDirectoryReader(directoryReader, disabledQueryTimeout());
- reader = new TestReader(getOnlyLeafReader(exitableDirectoryReader));
- searcher = new IndexSearcher(reader);
- searcher.search(query, 10);
- reader.close();
-
directory.close();
}
@@ -287,48 +276,11 @@ public class TestExitableDirectoryReader extends LuceneTestCase {
searcher = new IndexSearcher(reader);
searcher.search(query, 10);
reader.close();
-
- // Set a negative time allowed and expect the query to complete (should disable timeouts)
- // Not checking the validity of the result, all we are bothered about in this test is the timing
- // out.
- directoryReader = DirectoryReader.open(directory);
- exitableDirectoryReader = new ExitableDirectoryReader(directoryReader, disabledQueryTimeout());
- reader = new TestReader(getOnlyLeafReader(exitableDirectoryReader));
- searcher = new IndexSearcher(reader);
- searcher.search(query, 10);
- reader.close();
-
directory.close();
}
- private static QueryTimeout disabledQueryTimeout() {
- return new QueryTimeout() {
-
- @Override
- public boolean shouldExit() {
- return false;
- }
-
- @Override
- public boolean isTimeoutEnabled() {
- return false;
- }
- };
- }
-
private static QueryTimeout infiniteQueryTimeout() {
- return new QueryTimeout() {
-
- @Override
- public boolean shouldExit() {
- return false;
- }
-
- @Override
- public boolean isTimeoutEnabled() {
- return true;
- }
- };
+ return () -> false;
}
private static class CountingQueryTimeout implements QueryTimeout {
@@ -340,29 +292,13 @@ public class TestExitableDirectoryReader extends LuceneTestCase {
return false;
}
- @Override
- public boolean isTimeoutEnabled() {
- return true;
- }
-
public int getShouldExitCallCount() {
return counter;
}
}
private static QueryTimeout immediateQueryTimeout() {
- return new QueryTimeout() {
-
- @Override
- public boolean shouldExit() {
- return true;
- }
-
- @Override
- public boolean isTimeoutEnabled() {
- return true;
- }
- };
+ return () -> true;
}
@FunctionalInterface
@@ -420,9 +356,7 @@ public class TestExitableDirectoryReader extends LuceneTestCase {
directoryReader = DirectoryReader.open(directory);
exitableDirectoryReader =
- new ExitableDirectoryReader(
- directoryReader,
- random().nextBoolean() ? infiniteQueryTimeout() : disabledQueryTimeout());
+ new ExitableDirectoryReader(directoryReader, infiniteQueryTimeout());
{
IndexReader reader = new TestReader(getOnlyLeafReader(exitableDirectoryReader));
final LeafReader leaf = reader.leaves().get(0).reader();
@@ -475,18 +409,14 @@ public class TestExitableDirectoryReader extends LuceneTestCase {
QueryTimeout queryTimeout;
if (random().nextBoolean()) {
- if (random().nextBoolean()) {
- queryTimeout = immediateQueryTimeout();
- } else {
- queryTimeout = infiniteQueryTimeout();
- }
+ queryTimeout = immediateQueryTimeout();
} else {
- queryTimeout = disabledQueryTimeout();
+ queryTimeout = infiniteQueryTimeout();
}
DirectoryReader directoryReader = DirectoryReader.open(directory);
- DirectoryReader exitableDirectoryReader =
- new ExitableDirectoryReader(directoryReader, queryTimeout);
+ DirectoryReader exitableDirectoryReader = directoryReader;
+ exitableDirectoryReader = new ExitableDirectoryReader(directoryReader, queryTimeout);
IndexReader reader = new TestReader(getOnlyLeafReader(exitableDirectoryReader));
LeafReaderContext context = reader.leaves().get(0);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingBulkScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingBulkScorer.java
index 25d0d12856b..7e6677fd8d8 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingBulkScorer.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingBulkScorer.java
@@ -75,11 +75,6 @@ public class TestTimeLimitingBulkScorer extends LuceneTestCase {
}
return false;
}
-
- @Override
- public boolean isTimeoutEnabled() {
- return true;
- }
};
}
}