IGNITE-20454 Let the caller decide what exception is matter.

apache · Oct 17, 2023 · 3c5ffd7 · 3c5ffd7
1 parent fd4f3eb
commit 3c5ffd7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...ql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/rel/AsyncRootNode.java b/...ql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/rel/AsyncRootNode.java
@@ -151,8 +151,6 @@ public CompletableFuture<Void> closeAsync() {
                 if (!closed) {
                     Throwable th = ex.get();
 
-                    completePrefetchFuture(th);
-
                     if (th == null) {
                         th = new QueryCancelledException();
                     }
@@ -174,6 +172,8 @@ public CompletableFuture<Void> closeAsync() {
                         }
                     }, source::onError);
 
+                    completePrefetchFuture(th);
+
                     closed = true;
                 }
             }

diff --git a/...ne/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java b/...ne/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java
@@ -23,8 +23,11 @@
 import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
 import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedIn;
+import static org.apache.ignite.lang.ErrorGroups.Common.NODE_LEFT_ERR;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;