[multistage] fix usage of metadata overrides #11587
Merged
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
pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/StageMetadata.java
Outdated
Show resolved
Hide resolved
...query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/OpChainExecutionContext.java
Outdated
Show resolved
Hide resolved
pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/QueryRunner.java
Show resolved
Hide resolved
...t-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/AggregateOperator.java
Outdated
Show resolved
Hide resolved
pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java
Show resolved
Hide resolved
| // first put all custom Properties | ||
| requestMetadata.putAll(customProperties); | ||
| // put all overrides from request | ||
| requestMetadata.putAll(requestMetadataOriginal); |
Contributor
There was a problem hiding this comment.
I think we should put request level metadata first, then override the stage level custom property
Contributor
Author
There was a problem hiding this comment.
this changes the previous behavior. i will separate that into a different PR outside of this bugfix
pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/QueryRunner.java
Outdated
Show resolved
Hide resolved
Codecov Report
@@ Coverage Diff @@
## master #11587 +/- ##
============================================
- Coverage 63.04% 63.03% -0.01%
+ Complexity 1109 1105 -4
============================================
Files 2320 2326 +6
Lines 124667 124884 +217
Branches 19033 19063 +30
============================================
+ Hits 78600 78726 +126
- Misses 40476 40549 +73
- Partials 5591 5609 +18
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 88 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
walterddr
commented
Sep 13, 2023
pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/QueryRunner.java
Outdated
Show resolved
Hide resolved
Jackie-Jiang
approved these changes
Sep 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
custom properties in StageMetadata and
requestMetadata from WorkerRequest are immutable
mutating it during execution causes race-condition in set b/c multiple worker shares the same metadata
thus