refine query cancel resp msg#9242
Merged
Jackie-Jiang merged 3 commits intoapache:masterfrom Aug 24, 2022
Merged
Conversation
6f061d6 to
e24edf6
Compare
Codecov Report
@@ Coverage Diff @@
## master #9242 +/- ##
============================================
- Coverage 69.93% 67.10% -2.83%
+ Complexity 5009 4816 -193
============================================
Files 1860 1382 -478
Lines 99185 72022 -27163
Branches 15082 11533 -3549
============================================
- Hits 69367 48333 -21034
+ Misses 24905 20176 -4729
+ Partials 4913 3513 -1400
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
055950a to
7d0f7ac
Compare
Contributor
Jackie-Jiang
left a comment
There was a problem hiding this comment.
We also need to handle the exception in SelectionOrderByCombineOperator
pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java
Outdated
Show resolved
Hide resolved
pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseCombineOperator.java
Outdated
Show resolved
Hide resolved
9d282c3 to
d7af8d1
Compare
Jackie-Jiang
approved these changes
Aug 22, 2022
pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseCombineOperator.java
Outdated
Show resolved
Hide resolved
...re/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java
Outdated
Show resolved
Hide resolved
pinot-core/src/main/java/org/apache/pinot/core/plan/CombinePlanNode.java
Outdated
Show resolved
Hide resolved
pinot-core/src/main/java/org/apache/pinot/core/transport/InstanceRequestHandler.java
Outdated
Show resolved
Hide resolved
pinot-core/src/main/java/org/apache/pinot/core/transport/InstanceRequestHandler.java
Outdated
Show resolved
Hide resolved
pinot-core/src/main/java/org/apache/pinot/core/transport/InstanceRequestHandler.java
Outdated
Show resolved
Hide resolved
pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java
Outdated
Show resolved
Hide resolved
deebbef to
8948cb4
Compare
8948cb4 to
a23db86
Compare
a23db86 to
d4e2c4b
Compare
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
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.
This PR mainly refines the query cancel resp msg, by defining some explicit query cancel error code and msg, instead of bubbling up the Executor's CancellationException.
Also moves the query tracking mechanism for query cancellation from QueryScheduler to InstanceRequestHandler to be less likely to be overwritten by subclasses, and be more consistent with the logic in BaseBrokerRequestHandler.