MSQ: Use VSF, give stages control over inputs. #18873
Open
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
The purpose of this config is to enable using SegmentLocalCacheManager for loading segments on MSQ worker tasks, where segments are not assigned by load/drop rules, and where there is not generally a specific maxSize configured for the local cache. We need to evict segments immediately so local disks don't fill up. The main changes: 1) In StorageLocation, update the releaseHold runnable to check for evictImmediately. If it is set, unmount the cache entry if all holds have been released. 2) In SegmentLocalCacheManager, when evictImmediately is set, "mount" sets an onUnmount handler to delete the info file.
This patch integrates MSQ with virtual storage. It also refactors how MSQ reads inputs to give stages more control over how inputs are read and merged. In particular, stages are now able to fully control merging logic. The main changes: 1) Integrate with virtual storage: merge the two DataSegmentProvider impls (Dart and Task) into DataSegmentProviderImpl that relies on SegmentManager. 2) Give stages control over input merging: rework InputSliceReader to return ReadablePartitions directly, without embedding any merging logic. Break out StandardPartitionReader as a separate class. Other changes: 1) Move ReadableInput to the querykit package. It is no longer specific to the MSQ framework. 2) Remove StandardStageProcessor, refactoring dependent code to not require it. 3) Remove ExternalColumnSelectorFactory wrapper. Type casting is now handled directly by RowBasedColumnSelectorFactory. 4) Include full query context in worker context, rather than just a subset. Includes apache#18871.
github-actions
bot
added
Area - Batch Ingestion
Area - Segment Format and Ser/De
Area - Ingestion
Area - MSQ
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputHolder.java
Fixed
Show fixed
Hide fixed
multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ReadableInputQueue.java
Fixed
Show fixed
Hide fixed
multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ReadableInputQueue.java
Dismissed
Show dismissed
Hide dismissed
| final int partitionNum = i % 2; | ||
|
|
||
| segments.add( | ||
| DataSegment.builder() |
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation Note test
| */ | ||
| public static DataSegment createDataSegmentForTest(final SegmentId segmentId) | ||
| { | ||
| return DataSegment.builder() |
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation Note test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 patch integrates MSQ with virtual storage. It also refactors how MSQ reads inputs to give stages more control over how inputs are read and merged. In particular, stages are now able to fully control merging logic.
The main changes:
Integrate with virtual storage. Removed DataSegmentProvider, replaced it with direct usage of SegmentManager by SegmentsInputSliceReader. The SegmentManager reference ends up wrapped into RegularLoadableSegment, which provides methods
acquire()andacquireIfCached()to the query logic.Give stages control over input merging: rework InputSliceReader to return ReadablePartitions directly, without embedding any merging logic. Break out StandardPartitionReader as a separate class.
Other changes:
Move ReadableInput to the querykit package. It is no longer specific to the MSQ framework.
Remove StandardStageProcessor, refactoring dependent code to not require it.
Remove ExternalColumnSelectorFactory wrapper. Type casting is now handled directly by RowBasedColumnSelectorFactory.
Include full query context in worker context, rather than just a subset.