Skip to content

ESQL: Fix a breaker bug #136105

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 3 commits into from
Oct 9, 2025
Merged

ESQL: Fix a breaker bug #136105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e881c28
ESQL: Fix a breaker bug
nik9000 Oct 7, 2025
84c9311
Update docs/changelog/136105.yaml
nik9000 Oct 7, 2025
93b0ea1
Merge branch 'main' into esql_fix_double_release
nik9000 Oct 8, 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
7 changes: 7 additions & 0 deletions docs/changelog/136105.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pr: 136105
summary: Fix a breaker bug
area: ES|QL
type: bug
issues:
- 135224
- 135260
6 changes: 0 additions & 6 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,12 +528,6 @@ tests:
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=analytics/nested_top_metrics_sort/terms order by top metrics numeric not null integer values}
issue: https://github.com/elastic/elasticsearch/issues/135162
- class: org.elasticsearch.compute.operator.topn.TopNOperatorTests
method: testSimpleWithCranky
issue: https://github.com/elastic/elasticsearch/issues/135224
- class: org.elasticsearch.compute.operator.topn.TopNOperatorTests
method: testSimpleCircuitBreaking
issue: https://github.com/elastic/elasticsearch/issues/135260
- class: org.elasticsearch.xpack.esql.qa.single_node.PushQueriesIT
method: testEqualityAndOther {SEMANTIC_TEXT_WITH_KEYWORD}
issue: https://github.com/elastic/elasticsearch/issues/135333
Expand Down
10 changes: 7 additions & 3 deletions ...ugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ static final class Row implements Accountable, Releasable {
RefCounted shardRefCounter;

Row(CircuitBreaker breaker, List<SortOrder> sortOrders, int preAllocatedKeysSize, int preAllocatedValueSize) {
breaker.addEstimateBytesAndMaybeBreak(SHALLOW_SIZE, "topn");
this.breaker = breaker;
boolean success = false;
try {
breaker.addEstimateBytesAndMaybeBreak(SHALLOW_SIZE, "topn");
keys = new BreakingBytesRefBuilder(breaker, "topn", preAllocatedKeysSize);
values = new BreakingBytesRefBuilder(breaker, "topn", preAllocatedValueSize);
bytesOrder = new BytesOrder(sortOrders, breaker, "topn");
Expand Down Expand Up @@ -684,8 +684,12 @@ public long ramBytesUsed() {

@Override
public void close() {
Releasables.close(Releasables.wrap(this), () -> breaker.addWithoutBreaking(-Queue.sizeOf(topCount)));

Releasables.close(
// Release all entries in the topn
Releasables.wrap(this),
// Release the array itself
() -> breaker.addWithoutBreaking(-Queue.sizeOf(topCount))
);
}

public static long sizeOf(int topCount) {
Expand Down