Skip to content

Commit 8c55e8a

Browse files
committed
upd
1 parent 34badf7 commit 8c55e8a

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSourceHandler.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
*/
3232
public final class ExchangeSourceHandler {
3333

34-
private volatile boolean completed = false;
3534
private final ExchangeBuffer buffer;
3635
private final Executor fetchExecutor;
3736

@@ -58,8 +57,8 @@ public ExchangeSourceHandler(int maxBufferSize, Executor fetchExecutor) {
5857
this.outstandingSources = new PendingInstances(() -> finishEarly(true, ActionListener.noop()));
5958
}
6059

61-
public boolean isCompleted() {
62-
return completed;
60+
public boolean isFinished() {
61+
return buffer.isFinished();
6362
}
6463

6564
private void checkFailure() {
@@ -305,7 +304,6 @@ public Releasable addEmptySink() {
305304
* @param drainingPages whether to discard pages already fetched in the exchange
306305
*/
307306
public void finishEarly(boolean drainingPages, ActionListener<Void> listener) {
308-
completed = true;
309307
buffer.finish(drainingPages);
310308
try (EsqlRefCountingListener refs = new EsqlRefCountingListener(listener)) {
311309
for (RemoteSink remoteSink : remoteSinks.values()) {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ public void testLimitConcurrentShards() {
261261
}
262262

263263
public void testCancelUnnecessaryRequests() {
264+
assumeTrue("Requires pragmas", canUseQueryPragmas());
264265
internalCluster().ensureAtLeastNumDataNodes(3);
265266

266267
var coordinatingNode = internalCluster().getNodeNames()[0];

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeComputeHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ protected void sendRequest(
112112
Map<Index, AliasFilter> aliasFilters,
113113
NodeListener nodeListener
114114
) {
115-
if (exchangeSource.isCompleted()) {
115+
if (exchangeSource.isFinished()) {
116116
nodeListener.onResponse(new DataNodeComputeResponse(List.of(), Map.of()));
117117
return;
118118
}

0 commit comments

Comments
 (0)