zacharymorn commented on a change in pull request #1998:
URL: https://github.com/apache/lucene-solr/pull/1998#discussion_r509844747
##########
File path:
lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
##########
@@ -496,35 +496,38 @@ public TermsEnum iterator() throws IOException {
* exitable enumeration of terms.
*/
public static class ExitableTermsEnum extends FilterTermsEnum {
-
+ private static final int MAX_CALLS_BEFORE_QUERY_TIMEOUT_CHECK = (1 << 4) -
1; // 15
+ private int calls;
private QueryTimeout queryTimeout;
/** Constructor **/
public ExitableTermsEnum(TermsEnum termsEnum, QueryTimeout queryTimeout) {
super(termsEnum);
this.queryTimeout = queryTimeout;
- checkAndThrow();
+ checkAndThrowWithSampling();
}
/**
* Throws {@link ExitingReaderException} if {@link
QueryTimeout#shouldExit()} returns true,
* or if {@link Thread#interrupted()} returns true.
*/
- private void checkAndThrow() {
- if (queryTimeout.shouldExit()) {
- throw new ExitingReaderException("The request took too long to iterate
over terms. Timeout: "
- + queryTimeout.toString()
- + ", TermsEnum=" + in
- );
- } else if (Thread.interrupted()) {
- throw new ExitingReaderException("Interrupted while iterating over
terms. TermsEnum=" + in);
+ private void checkAndThrowWithSampling() {
Review comment:
Done.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
