Use task actions to fetch used segments in MSQ #15284
Merged
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
|
@AmatyaAvadhanula , are more changes pending in this PR? |
|
@kfaraz, yes, there are several failing tests which need to be fixed. |
kfaraz
reviewed
Nov 8, 2023
| // If the task is operating with a REPLACE lock, | ||
| // any segment created after the lock was acquired for its interval will not be considered. | ||
| final Collection<DataSegment> publishedUsedSegments = new HashSet<>(); | ||
| for (Interval interval : intervals) { |
There was a problem hiding this comment.
Looking at RetrieveSegmentsToReplaceAction and the method IndexerMetadataStorageConnector.retrieveUsedSegmentsAndCreatedDates, I suppose we could just pass a list of intervals to the action rather than firing a separate action for each interval.
...-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java
Outdated
Show resolved
Hide resolved
This reverts commit 95ab649
kfaraz
approved these changes
Dec 1, 2023
| @@ -122,6 +128,14 @@ public <RetType> RetType submit(TaskAction<RetType> taskAction) | |||
| .build() | |||
| ).collect(Collectors.toSet()); | |||
| } | |||
| } else if (taskAction instanceof RetrieveSegmentsToReplaceAction) { | |||
| String dataSource = ((RetrieveSegmentsToReplaceAction) taskAction).getDataSource(); | |||
| return (RetType) injector.getInstance(SpecificSegmentsQuerySegmentWalker.class) | |||
There was a problem hiding this comment.
Could you please add a comment here explaining why we need to use the QuerySegmentWalker here instead of how we handle RetrieveUsedSegmentsAction here or how we would respond to the coordinatorClient().fetchUsedSegments() in MSQ tests?
yashdeep97
pushed a commit
to yashdeep97/druid
that referenced
this pull request
Dec 1, 2023
* Use task actions to fetch used segments in MSQ * Fix tests * Fixing tests. * Revert "Fix tests" This reverts commit 95ab649 * Removing conditional check in tests. * Pulling in latest changes. --------- Co-authored-by: cryptoe <[email protected]>
yashdeep97
pushed a commit
to yashdeep97/druid
that referenced
this pull request
Dec 1, 2023
* Use task actions to fetch used segments in MSQ * Fix tests * Fixing tests. * Revert "Fix tests" This reverts commit 95ab649 * Removing conditional check in tests. * Pulling in latest changes. --------- Co-authored-by: cryptoe <[email protected]>
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.
#15220 Introduced a new
RetrieveSegmentsToReplaceaction to be used in the DruidInputSource.This PR lets the MSQ Controller use this action in ControllerImpl#makeDataSegmentTimelineView, to allow a consistent set of segments to be returned, especially with a REPLACE lock.