IGNITE-23441 Sql. Cancellation of script execution #4706
+471
−84
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xtern
force-pushed
the
ignite-23441
branch
2 times, most recently
from
3e323aa
to
c942ddd
Compare
xtern
changed the title
This reverts commit 1f0cfcf.
xtern
commented
Nov 18, 2024
| @@ -543,7 +543,7 @@ public int openedCursors() { | |||
| } | |||
|
|
|||
| return (int) executor.runningQueries().stream() | |||
| .filter(info -> info.phase() == ExecutionPhase.EXECUTING) | |||
| .filter(info -> info.phase() == ExecutionPhase.EXECUTING && !info.script()) | |||
There was a problem hiding this comment.
This was not quite correct - the script itself does not open the cursor
zstan
reviewed
Nov 20, 2024
...engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCancelQueryTest.java
Outdated
Show resolved
Hide resolved
...ine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java
Outdated
Show resolved
Hide resolved
...ql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/SqlTestUtils.java
Outdated
Show resolved
Hide resolved
...ql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/SqlTestUtils.java
Outdated
Show resolved
Hide resolved
...ql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/SqlTestUtils.java
Show resolved
Hide resolved
...-engine/src/main/java/org/apache/ignite/internal/sql/engine/tx/ScriptTransactionContext.java
Outdated
Show resolved
Hide resolved
| @@ -202,14 +202,16 @@ CompletableFuture<AsyncSqlCursor<InternalSqlRow>> executeChildQuery( | |||
| } | |||
|
|
|||
| try { | |||
| trackQuery(query, null); | |||
| trackQuery(query, parent.cancellationToken); | |||
There was a problem hiding this comment.
seems we need not register additional cancel actions for childs ? i.e. we need different trackQuery implementation without "addCancelAction" actions
There was a problem hiding this comment.
Thanks. Reverted this change.
From my point of view, it is enough to pass null for the child query.
zstan
approved these changes
Nov 21, 2024
lowka
approved these changes
Nov 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.apache.org/jira/browse/IGNITE-23441