You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by "abhishek-chouhan (via GitHub)" <gi...@apache.org> on 2024/10/24 19:32:30 UTC
[PR] Enhance RequireTimeCondition to handle complex joins (druid)
abhishek-chouhan opened a new pull request, #17408:
URL: https://github.com/apache/druid/pull/17408
<!-- Thanks for trying to help us make Apache Druid be the best it can be! Please fill out as much of the following information as is possible (where relevant, and remove it when irrelevant) to help make the intention and scope of this PR clear in order to ease review. -->
<!-- Please read the doc for contribution (https://github.com/apache/druid/blob/master/CONTRIBUTING.md) before making this PR. Also, once you open a PR, please _avoid using force pushes and rebasing_ since these make it difficult for reviewers to see what you've changed in response to their reviews. See [the 'If your pull request shows conflicts with master' section](https://github.com/apache/druid/blob/master/CONTRIBUTING.md#if-your-pull-request-shows-conflicts-with-master) for more details. -->
Fixes #17407 .
<!-- Replace XXXX with the id of the issue fixed in this PR. Remove this section if there is no corresponding issue. Don't reference the issue in the title of this pull-request. -->
<!-- If you are a committer, follow the PR action item checklist for committers:
https://github.com/apache/druid/blob/master/dev/committer-instructions.md#pr-and-issue-action-item-checklist-for-committers. -->
### 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)
<!-- Describe the goal of this PR, what problem are you fixing. If there is a corresponding issue (referenced above), it's not necessary to repeat the description here, however, you may choose to keep one summary sentence. -->
<!-- Describe your patch: what did you change in code? How did you fix the problem? -->
<!-- If there are several relatively logically separate changes in this PR, create a mini-section for each of them. For example: -->
#### Fixed the bug ...
#### Renamed the class ...
#### Added a forbidden-apis entry ...
<!--
In each section, please describe design decisions made, including:
- Choice of algorithms
- Behavioral aspects. What configuration values are acceptable? How are corner cases and error conditions handled, such as when there are insufficient resources?
- Class organization and design (how the logic is split between classes, inheritance, composition, design patterns)
- Method organization and design (how the logic is split between methods, parameters and return types)
- Naming (class, method, API, configuration, HTTP endpoint, names of emitted metrics)
-->
<!-- It's good to describe an alternative design (or mention an alternative name) for every design (or naming) decision point and compare the alternatives with the designs that you've implemented (or the names you've chosen) to highlight the advantages of the chosen designs and names. -->
<!-- If there was a discussion of the design of the feature implemented in this PR elsewhere (e. g. a "Proposal" issue, any other issue, or a thread in the development mailing list), link to that discussion from this PR description and explain what have changed in your final design compared to your original proposal or the consensus version in the end of the discussion. If something hasn't changed since the original discussion, you can omit a detailed discussion of those aspects of the design here, perhaps apart from brief mentioning for the sake of readability of this PR description. -->
<!-- Some of the aspects mentioned above may be omitted for simple and small changes. -->
#### Release note
<!-- Give your best effort to summarize your changes in a couple of sentences aimed toward Druid users.
If your change doesn't have end user impact, you can skip this section.
For tips about how to write a good release note, see [Release notes](https://github.com/apache/druid/blob/master/CONTRIBUTING.md#release-notes).
-->
<hr>
##### Key changed/added classes in this PR
* `NativeQueryMaker`
<hr>
<!-- Check the items by putting "x" in the brackets for the done things. Not all of these items apply to every PR. Remove the items which are not done or not relevant to the PR. None of the items from the checklist below are strictly necessary, but it would be very helpful if you at least self-review the PR. -->
This PR has:
- [ x] been self-reviewed.
- [ ] using the [concurrency checklist](https://github.com/apache/druid/blob/master/dev/code-review/concurrency.md) (Remove this item if the PR doesn't have any relation to concurrency.)
- [ ] added documentation for new or modified features or behaviors.
- [ ] a release note entry in the PR description.
- [ ] added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
- [ ] added or updated version, license, or notice information in [licenses.yaml](https://github.com/apache/druid/blob/master/dev/license.md)
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
- [ x] added unit tests or modified existing tests to cover new code paths, ensuring the threshold for [code coverage](https://github.com/apache/druid/blob/master/dev/code-review/code-coverage.md) is met.
- [ ] added integration tests.
- [ ] been tested in a test Druid cluster.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #17408:
URL: https://github.com/apache/druid/pull/17408#issuecomment-3081934120
This pull request/issue has been closed due to lack of activity. If you think that
is incorrect, or the pull request requires review, you can revive the PR at any time.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "kgyrtkirk (via GitHub)" <gi...@apache.org>.
kgyrtkirk commented on code in PR #17408:
URL: https://github.com/apache/druid/pull/17408#discussion_r1819118545
##########
sql/src/main/java/org/apache/druid/sql/calcite/run/NativeQueryMaker.java:
##########
@@ -87,7 +92,7 @@ public QueryResponse<Object[]> runQuery(final DruidQuery druidQuery)
if (plannerContext.getPlannerConfig().isRequireTimeCondition()
&& !(druidQuery.getDataSource() instanceof InlineDataSource)) {
- if (Intervals.ONLY_ETERNITY.equals(findBaseDataSourceIntervals(query))) {
+ if (!queryHasTimeFilter(query)) {
Review 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.
##########
sql/src/main/java/org/apache/druid/sql/calcite/run/NativeQueryMaker.java:
##########
@@ -164,6 +169,70 @@ private List<Interval> findBaseDataSourceIntervals(Query<?> query)
.orElseGet(query::getIntervals);
}
+ private boolean queryHasTimeFilter(Query<?> query)
+ {
+ DataSource dataSource = query.getDataSource();
+ if (dataSource instanceof InlineDataSource) {
+ return true;
+ }
+ if (dataSource instanceof JoinDataSource) {
+ return joinDataSourceQueryHasTimeFilter(query);
+ }
+ return isIntervalNonEternity(findBaseDataSourceIntervals(query));
+ }
+
+ /**
+ * Checks if a join query has a valid time filter by inspecting parts of the joins and any subqueries used within.
+ * If the left datasource is a Table datasource, we require a timefilter on the top level query and a time filter on
+ * the right datasource, else we check for time filter on the left and right datasources making up the join recursively
+ */
+ private boolean joinDataSourceQueryHasTimeFilter(Query<?> query)
+ {
+ Preconditions.checkArgument(query.getDataSource() instanceof JoinDataSource);
+ JoinDataSource joinDataSource = (JoinDataSource) query.getDataSource();
+ if (joinDataSource.getLeft() instanceof TableDataSource) {
+ // Make sure we have a time filter on the base query since we have a concrete TableDataSource on the left
+ // And then make sure that right also has a time filter
+ if (isIntervalNonEternity(query.getIntervals())) {
+ return dataSourceHasTimeFilter(joinDataSource.getRight());
+ } else {
+ return false;
+ }
+ }
+ // Top level query does not have a time filter, check if all subqueries have a time filter
+ return joinDataSourceHasTimeFilter(joinDataSource);
+ }
+
+ private boolean joinDataSourceHasTimeFilter(JoinDataSource joinDataSource)
+ {
+ return dataSourceHasTimeFilter(joinDataSource.getLeft()) && dataSourceHasTimeFilter(joinDataSource.getRight());
+ }
+
+ private boolean dataSourceHasTimeFilter(DataSource dataSource)
+ {
+ 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;
Review 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?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "abhishek-chouhan (via GitHub)" <gi...@apache.org>.
abhishek-chouhan commented on PR #17408:
URL: https://github.com/apache/druid/pull/17408#issuecomment-2568373854
Commenting to reopen
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #17408:
URL: https://github.com/apache/druid/pull/17408#issuecomment-2566030014
This pull request has been marked as stale due to 60 days of inactivity.
It will be closed in 4 weeks if no further activity occurs. If you think
that's incorrect or this pull request should instead be reviewed, please simply
write any comment. Even if closed, you can still revive the PR at any time or
discuss it on the dev@druid.apache.org list.
Thank you for your contributions.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] closed pull request #17408: Enhance RequireTimeCondition to handle complex joins
URL: https://github.com/apache/druid/pull/17408
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #17408:
URL: https://github.com/apache/druid/pull/17408#issuecomment-2986122128
This pull request has been marked as stale due to 60 days of inactivity.
It will be closed in 4 weeks if no further activity occurs. If you think
that's incorrect or this pull request should instead be reviewed, please simply
write any comment. Even if closed, you can still revive the PR at any time or
discuss it on the dev@druid.apache.org list.
Thank you for your contributions.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "kgyrtkirk (via GitHub)" <gi...@apache.org>.
kgyrtkirk commented on PR #17408:
URL: https://github.com/apache/druid/pull/17408#issuecomment-2816563360
could you please try to merge changes from master?
there is a new class ExecutionVertex which might help
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] closed pull request #17408: Enhance RequireTimeCondition to handle complex joins
URL: https://github.com/apache/druid/pull/17408
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #17408:
URL: https://github.com/apache/druid/pull/17408#issuecomment-2695870762
This pull request has been marked as stale due to 60 days of inactivity.
It will be closed in 4 weeks if no further activity occurs. If you think
that's incorrect or this pull request should instead be reviewed, please simply
write any comment. Even if closed, you can still revive the PR at any time or
discuss it on the dev@druid.apache.org list.
Thank you for your contributions.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "abhishek-chouhan (via GitHub)" <gi...@apache.org>.
abhishek-chouhan commented on code in PR #17408:
URL: https://github.com/apache/druid/pull/17408#discussion_r1825278653
##########
sql/src/main/java/org/apache/druid/sql/calcite/run/NativeQueryMaker.java:
##########
@@ -164,6 +169,70 @@ private List<Interval> findBaseDataSourceIntervals(Query<?> query)
.orElseGet(query::getIntervals);
}
+ private boolean queryHasTimeFilter(Query<?> query)
+ {
+ DataSource dataSource = query.getDataSource();
+ if (dataSource instanceof InlineDataSource) {
+ return true;
+ }
+ if (dataSource instanceof JoinDataSource) {
+ return joinDataSourceQueryHasTimeFilter(query);
+ }
+ return isIntervalNonEternity(findBaseDataSourceIntervals(query));
+ }
+
+ /**
+ * Checks if a join query has a valid time filter by inspecting parts of the joins and any subqueries used within.
+ * If the left datasource is a Table datasource, we require a timefilter on the top level query and a time filter on
+ * the right datasource, else we check for time filter on the left and right datasources making up the join recursively
+ */
+ private boolean joinDataSourceQueryHasTimeFilter(Query<?> query)
+ {
+ Preconditions.checkArgument(query.getDataSource() instanceof JoinDataSource);
+ JoinDataSource joinDataSource = (JoinDataSource) query.getDataSource();
+ if (joinDataSource.getLeft() instanceof TableDataSource) {
+ // Make sure we have a time filter on the base query since we have a concrete TableDataSource on the left
+ // And then make sure that right also has a time filter
+ if (isIntervalNonEternity(query.getIntervals())) {
+ return dataSourceHasTimeFilter(joinDataSource.getRight());
+ } else {
+ return false;
+ }
+ }
+ // Top level query does not have a time filter, check if all subqueries have a time filter
+ return joinDataSourceHasTimeFilter(joinDataSource);
+ }
+
+ private boolean joinDataSourceHasTimeFilter(JoinDataSource joinDataSource)
+ {
+ return dataSourceHasTimeFilter(joinDataSource.getLeft()) && dataSourceHasTimeFilter(joinDataSource.getRight());
+ }
+
+ private boolean dataSourceHasTimeFilter(DataSource dataSource)
+ {
+ 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;
Review Comment:
Thanks for takin a look @kgyrtkirk . Makes sense to have this at the DataSource level. Made the necessary changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #17408:
URL: https://github.com/apache/druid/pull/17408#issuecomment-2767710602
This pull request/issue has been closed due to lack of activity. If you think that
is incorrect, or the pull request requires review, you can revive the PR at any time.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] Enhance RequireTimeCondition to handle complex joins (druid)
Posted by "kaisun2000 (via GitHub)" <gi...@apache.org>.
kaisun2000 commented on PR #17408:
URL: https://github.com/apache/druid/pull/17408#issuecomment-2816286660
@gianm, We still need this fix. Is there any blocking issue such as design etc to prevent merging this into trunk?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org