Enhance table scan unparsing to avoid unnamed subqueries. #13006
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
goldmedal
changed the title
alamb
approved these changes
Oct 18, 2024
There was a problem hiding this comment.
This makes sense to me -- thank you @goldmedal
Perhaps @phillipleblanc and @sgrebnov have some time to review this as well
|
Let's merge this in and we can address any feedback as a follow on PR |
Comment on lines
+637
to
+642
| if alias.is_some() | ||
| && (table_scan.projection.is_some() || !table_scan.filters.is_empty()) | ||
| { | ||
| builder = builder.alias(alias.clone().unwrap())?; | ||
| } | ||
|
|
There was a problem hiding this comment.
Suggested change
| if alias.is_some() | |
| && (table_scan.projection.is_some() || !table_scan.filters.is_empty()) | |
| { | |
| builder = builder.alias(alias.clone().unwrap())?; | |
| } | |
| if let Some(ref alias) = alias { | |
| if table_scan.projection.is_some() || !table_scan.filters.is_empty() { | |
| builder = builder.alias(alias.clone())?; | |
| } | |
| } |
I find this to be slightly cleaner
Comment on lines
+693
to
+697
| if alias.is_some() | ||
| && (table_scan.projection.is_none() && table_scan.filters.is_empty()) | ||
| { | ||
| builder = builder.alias(alias.clone().unwrap())?; | ||
| } |
There was a problem hiding this comment.
Suggested change
| if alias.is_some() | |
| && (table_scan.projection.is_none() && table_scan.filters.is_empty()) | |
| { | |
| builder = builder.alias(alias.clone().unwrap())?; | |
| } | |
| if let Some(alias) = alias { | |
| if table_scan.projection.is_some() || !table_scan.filters.is_empty() { | |
| builder = builder.alias(alias)?; | |
| } | |
| } |
No need for a clone here.
|
Whoops, I had pending feedback that I didn't submit in time. |
I do that far more often than I would like to admit. Maybe it is a good excuse for a follow on PR |
@phillipleblanc I just noticed your reply now 😮. These suggestions make sense to me. I'll submit a follow PR for them soon. |
sgrebnov
pushed a commit
to spiceai/datafusion
that referenced
this pull request
Oct 23, 2024
sgrebnov
added a commit
to spiceai/datafusion
that referenced
this pull request
Oct 24, 2024
* init (apache#12453) * Fix unparse table scan with the projection pushdown (apache#12534) * unparse the projection base on the source schema * refactor and enhance the test * Fix unparsing OFFSET (apache#12539) * Unparse Sort with pushdown limit to SQL string (apache#12873) * unparse Sort with push down limit * cargo fmt * set query limit directly * Unparse `SubqueryAlias` without projections to SQL (apache#12896) * change pub function comment to doc * unparse subquery alias without projections * fix tests * rollback the empty line * rollback the empty line * exclude the table_scan with pushdown case * fmt and clippy * simplify the ast to string and remove unused debug code * enhance unparsing plan with pushdown to avoid unnamed subquery (apache#13006) * Update --------- Co-authored-by: Lordworms <[email protected]> Co-authored-by: Jax Liu <[email protected]> Co-authored-by: Justus Flerlage <[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.
Which issue does this PR close?
It's a follow-up PR of #12896
Rationale for this change
from #12896 (comment)
What changes are included in this PR?
Are these changes tested?
Enhance the original tests
Are there any user-facing changes?