Skip to content

Fix early termination in LuceneSourceOperator #123197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 24, 2025
Merged

Fix early termination in LuceneSourceOperator #123197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e646a9
Fix early termination in LuceneSourceOperator
dnhatn Feb 21, 2025
1c0dd56
Update docs/changelog/123197.yaml
dnhatn Feb 22, 2025
02ebb8a
harden
dnhatn Feb 22, 2025
e61b28b
Merge branch 'main' into fix-limit-operator
dnhatn Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/123197.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 123197
summary: Fix early termination in `LuceneSourceOperator`
area: ES|QL
type: bug
issues: []
2 changes: 1 addition & 1 deletion ...gin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSourceOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void collect(int doc) throws IOException {

@Override
public boolean isFinished() {
return doneCollecting;
return doneCollecting || remainingDocs <= 0;
}

@Override
Expand Down
22 changes: 22 additions & 0 deletions ...sql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneSourceOperatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.elasticsearch.compute.operator.Driver;
import org.elasticsearch.compute.operator.DriverContext;
import org.elasticsearch.compute.operator.Operator;
import org.elasticsearch.compute.operator.SourceOperator;
import org.elasticsearch.compute.test.AnyOperatorTestCase;
import org.elasticsearch.compute.test.OperatorTestCase;
import org.elasticsearch.compute.test.TestResultPageSinkOperator;
Expand Down Expand Up @@ -117,6 +118,27 @@ public void testShardDataPartitioning() {
testSimple(driverContext(), size, limit);
}

public void testEarlyTermination() {
int size = between(1_000, 20_000);
int limit = between(10, size);
Copy link
Contributor

@idegtiarenko idegtiarenko Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to confirm, max in between is exclusive and limit is always strictly less than size?

Copy link
Member Author

@dnhatn dnhatn Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Limit can be larger than the size.

LuceneSourceOperator.Factory factory = simple(randomFrom(DataPartitioning.values()), size, limit, scoring);
try (SourceOperator sourceOperator = factory.get(driverContext())) {
assertFalse(sourceOperator.isFinished());
int collected = 0;
while (sourceOperator.isFinished() == false) {
Page page = sourceOperator.getOutput();
if (page != null) {
collected += page.getPositionCount();
page.releaseBlocks();
}
if (collected >= limit) {
assertTrue("source operator is not finished after reaching limit", sourceOperator.isFinished());
assertThat(collected, equalTo(limit));
}
}
}
}

public void testEmpty() {
testSimple(driverContext(), 0, between(10, 10_000));
}
Expand Down