Added ExecutionInput cancellation #3880
Merged
+308
−67
Conversation
This file contains hidden or 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
Test Results 313 files ±0 313 suites ±0 48s ⏱️ -1s Results for commit bd4a098. ± Comparison against base commit 5a03541. This pull request removes 150 and adds 130 tests. Note that renamed tests count towards both.♻️ This comment has been updated with latest results. |
|
This should be combined with #3876 |
…ncellation-of-request # Conflicts: # src/main/java/graphql/execution/AsyncExecutionStrategy.java # src/main/java/graphql/execution/AsyncSerialExecutionStrategy.java # src/main/java/graphql/execution/ExecutionStrategy.java # src/main/java/graphql/execution/SubscriptionExecutionStrategy.java
…uest # Conflicts: # src/main/java/graphql/execution/ExecutionContext.java # src/main/java/graphql/execution/ExecutionStrategy.java
bbakerman
commented
Apr 2, 2025
| @@ -306,11 +332,18 @@ public Builder graphQLContext(Map<?, Object> mapOfContext) { | |||
| } | |||
|
|
|||
| // hidden on purpose | |||
| private Builder transfer(GraphQLContext graphQLContext) { | |||
| private Builder internalTransferContext(GraphQLContext graphQLContext) { | |||
There was a problem hiding this comment.
I can rename because its private method. This is a transferring of the context to a new instance
bbakerman
commented
Apr 2, 2025
| @@ -483,7 +483,6 @@ private CompletableFuture<ExecutionResult> parseValidateAndExecute(ExecutionInpu | |||
| private PreparsedDocumentEntry parseAndValidate(AtomicReference<ExecutionInput> executionInputRef, GraphQLSchema graphQLSchema, InstrumentationState instrumentationState) { | |||
|
|
|||
| ExecutionInput executionInput = executionInputRef.get(); | |||
| String query = executionInput.getQuery(); | |||
There was a problem hiding this comment.
never used. Grey code. took the opportunity to remove it
bbakerman
commented
Apr 2, 2025
| @@ -22,11 +22,12 @@ public AbstractAsyncExecutionStrategy(DataFetcherExceptionHandler dataFetcherExc | |||
| } | |||
|
|
|||
| protected BiConsumer<List<Object>, Throwable> handleResults(ExecutionContext executionContext, List<String> fieldNames, CompletableFuture<ExecutionResult> overallResult) { | |||
| return (List<Object> results, Throwable exception) -> executionContext.run(() -> { | |||
| return (List<Object> results, Throwable exception) -> executionContext.run(exception, () -> { | |||
There was a problem hiding this comment.
whenever we call run here we need to respect if an exception was thrown on the inside when we check if we are cancelled.
There is not point throwing a "cancelled" exception if we are already in exception
bbakerman
commented
Apr 2, 2025
| * @param executionId the id of the current execution | ||
| * @param graphQLContext the graphql context | ||
| */ | ||
| void runningStateChanged(ExecutionId executionId, GraphQLContext graphQLContext, RunningState runningState); |
There was a problem hiding this comment.
made i an enum versus a boolean
bbakerman
commented
Apr 2, 2025
| @@ -371,48 +376,89 @@ public boolean isRunning() { | |||
| return isRunning.get() > 0; | |||
| } | |||
|
|
|||
| public void incrementRunning() { | |||
| if (isRunning.incrementAndGet() == 1 && engineRunningObserver != null) { | |||
| engineRunningObserver.runningStateChanged(executionId, graphQLContext, true); | |||
There was a problem hiding this comment.
never needed to be public. Never used publically
bbakerman
commented
Apr 2, 2025
| checkIsCancelled(throwable); | ||
|
|
||
| if (isRunning.incrementAndGet() == 1) { | ||
| changeOfState(RUNNING); |
There was a problem hiding this comment.
changeOfState encapsulates the null check
bbakerman
commented
Apr 2, 2025
| if (isRunning.incrementAndGet() == 1 && engineRunningObserver != null) { | ||
| engineRunningObserver.runningStateChanged(executionId, graphQLContext, true); | ||
| private void incrementRunning(Throwable throwable) { | ||
| checkIsCancelled(throwable); |
There was a problem hiding this comment.
we now check if we are cancelled in a common place
bbakerman
commented
Apr 2, 2025
| return executionResult; | ||
| }); | ||
| }); | ||
| })); |
andimarek
requested changes
Apr 2, 2025
| @ExperimentalApi | ||
| @NullMarked | ||
| public interface EngineRunningObserver { | ||
|
|
||
| enum RunningState { |
There was a problem hiding this comment.
Can we add started and finished here to make it complete?
There was a problem hiding this comment.
Maybe not .., we have ways to detect that
andimarek
approved these changes
Apr 2, 2025
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.
Addressing #3879
This allows the graphql operation to be co-operatively cancelled. It use the "engine run state" tracking to know when its a good time to cancel and abort