Enhance RequireTimeCondition to handle complex joins #17408
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
kgyrtkirk
reviewed
Oct 28, 2024
Comment on lines
93
to
95
| if (plannerContext.getPlannerConfig().isRequireTimeCondition() | ||
| && !(druidQuery.getDataSource() instanceof InlineDataSource)) { | ||
| if (Intervals.ONLY_ETERNITY.equals(findBaseDataSourceIntervals(query))) { | ||
| if (!queryHasTimeFilter(query)) { |
There was a problem hiding this comment.
can you move this over to DataSourceAnalysis ?
I feel that this would fit better there.
you could use druidQuery.getDataSource().getAnalysis() to access it here.
I think that should also handle the druidQuery.getDataSource() instanceof InlineDataSource correctly; and shouldn't be checked at this point.
Comment on lines
213
to
228
| if (dataSource instanceof InlineDataSource) { | ||
| return true; | ||
| } | ||
| if (dataSource instanceof QueryDataSource) { | ||
| return queryHasTimeFilter(((QueryDataSource) dataSource).getQuery()); | ||
| } | ||
| if (dataSource instanceof JoinDataSource) { | ||
| return joinDataSourceHasTimeFilter((JoinDataSource) dataSource); | ||
| } | ||
| if (dataSource.getAnalysis().getBaseQuerySegmentSpec().isPresent()) { | ||
| return isIntervalNonEternity(dataSource.getAnalysis() | ||
| .getBaseQuerySegmentSpec() | ||
| .map(QuerySegmentSpec::getIntervals) | ||
| .get()); | ||
| } | ||
| return false; |
There was a problem hiding this comment.
the pattern of this method makes me wonder if it would be better to have a method on DataSource instead (with a default implementation to return false) so that every relevant subclass could implement it correctly?
There was a problem hiding this comment.
Thanks for takin a look @kgyrtkirk . Makes sense to have this at the DataSource level. Made the necessary changes.
github-actions
bot
added
Area - Batch Ingestion
Area - MSQ
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.
Fixes #17407 .
Description
Additions to NativeQueryMaker to handle JoinQueries.
Checks for a valid timefilter on the top level query if the left join data source is a TableDataSource. Makes sure both left and right datasources have valid timefilters and traverses nested join data sources recursively to check for valid time filter. We still ignore InlineDataSource if they're part of the JoinDataSource (existing behavior)
Fixed the bug ...
Renamed the class ...
Added a forbidden-apis entry ...
Release note
Key changed/added classes in this PR
NativeQueryMakerThis PR has: