You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@datafusion.apache.org by "goldmedal (via GitHub)" <gi...@apache.org> on 2024/08/25 15:54:43 UTC
[PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
goldmedal opened a new pull request, #12158:
URL: https://github.com/apache/datafusion/pull/12158
## Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
-->
Closes #12154.
## Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->
## What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->
## Are these changes tested?
yes
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
-->
## Are there any user-facing changes?
no
<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
<!--
If there are any breaking changes to public APIs, please add the `api change` label.
-->
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #12158:
URL: https://github.com/apache/datafusion/pull/12158#issuecomment-2335143089
🚀 thanks @goldmedal for the code and @devinjdangelo and @phillipleblanc for the review
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb merged PR #12158:
URL: https://github.com/apache/datafusion/pull/12158
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
Posted by "goldmedal (via GitHub)" <gi...@apache.org>.
goldmedal commented on PR #12158:
URL: https://github.com/apache/datafusion/pull/12158#issuecomment-2318385151
> Thanks @goldmedal! This looks reasonable to me. The only possible controversial change I notice is the added public methods in the expr crate. They seem reasonable enough to me though.
Thanks, @devinjdangelo. I removed the controversial parts to align with the coding style. I think they might not be necessary for this PR's purpose.
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on code in PR #12158:
URL: https://github.com/apache/datafusion/pull/12158#discussion_r1747768209
##########
datafusion/expr/src/logical_plan/builder.rs:
##########
@@ -333,6 +333,19 @@ impl LogicalPlanBuilder {
.map(Self::new)
}
+ /// Convert a table provider into a builder with a TableScan with filter and fetch
Review Comment:
This seems like a reasonably helpful API in my opinion
##########
datafusion/sql/tests/cases/plan_to_sql.rs:
##########
@@ -607,6 +609,151 @@ fn sql_round_trip(query: &str, expect: &str) {
assert_eq!(roundtrip_statement.to_string(), expect);
}
+#[test]
+fn test_table_scan_pushdown() -> Result<()> {
+ let schema = Schema::new(vec![
+ Field::new("id", DataType::Utf8, false),
+ Field::new("age", DataType::Utf8, false),
+ ]);
+
+ let scan_with_projection =
+ table_scan(Some("t1"), &schema, Some(vec![0, 1]))?.build()?;
+ let scan_with_projection = plan_to_sql(&scan_with_projection)?;
+ assert_eq!(
+ format!("{}", scan_with_projection),
+ "SELECT t1.id, t1.age FROM t1"
+ );
+
+ let scan_with_no_projection = table_scan(Some("t1"), &schema, None)?.build()?;
+ let scan_with_no_projection = plan_to_sql(&scan_with_no_projection)?;
+ assert_eq!(format!("{}", scan_with_no_projection), "SELECT * FROM t1");
+
+ let table_scan_with_projection_alias =
+ table_scan(Some("t1"), &schema, Some(vec![0, 1]))?
+ .alias("ta")?
+ .build()?;
+ let table_scan_with_projection_alias =
+ plan_to_sql(&table_scan_with_projection_alias)?;
+ assert_eq!(
+ format!("{}", table_scan_with_projection_alias),
+ "SELECT ta.id, ta.age FROM t1 AS ta"
+ );
+
+ let table_scan_with_no_projection_alias = table_scan(Some("t1"), &schema, None)?
+ .alias("ta")?
+ .build()?;
+ let table_scan_with_no_projection_alias =
+ plan_to_sql(&table_scan_with_no_projection_alias)?;
+ assert_eq!(
+ format!("{}", table_scan_with_no_projection_alias),
+ "SELECT * FROM t1 AS ta"
+ );
+
+ let query_from_table_scan_with_projection = LogicalPlanBuilder::from(
+ table_scan(Some("t1"), &schema, Some(vec![0, 1]))?.build()?,
+ )
+ .project(vec![wildcard()])?
+ .build()?;
+ let query_from_table_scan_with_projection =
+ plan_to_sql(&query_from_table_scan_with_projection)?;
+ assert_eq!(
+ format!("{}", query_from_table_scan_with_projection),
+ "SELECT * FROM (SELECT t1.id, t1.age FROM t1)"
+ );
+
+ let table_scan_with_filter = table_scan_with_filters(
+ Some("t1"),
+ &schema,
+ None,
+ vec![col("id").gt(col("age"))],
+ )?
+ .build()?;
+ let table_scan_with_filter = plan_to_sql(&table_scan_with_filter)?;
+ assert_eq!(
+ format!("{}", table_scan_with_filter),
+ "SELECT * FROM t1 WHERE (t1.id > t1.age)"
+ );
+
+ let table_scan_with_two_filter = table_scan_with_filters(
+ Some("t1"),
+ &schema,
+ None,
+ vec![col("id").gt(lit(1)), col("age").lt(lit(2))],
+ )?
+ .build()?;
+ let table_scan_with_two_filter = plan_to_sql(&table_scan_with_two_filter)?;
+ assert_eq!(
+ format!("{}", table_scan_with_two_filter),
+ "SELECT * FROM t1 WHERE ((t1.id > 1) AND (t1.age < 2))"
+ );
+
+ // TODO: support filters for table scan with alias
Review Comment:
I suggest we file a ticket for this gap and leave a link to it in this comment
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
Posted by "goldmedal (via GitHub)" <gi...@apache.org>.
goldmedal commented on PR #12158:
URL: https://github.com/apache/datafusion/pull/12158#issuecomment-2335162233
Thanks @devinjdangelo @alamb @phillipleblanc for the review.
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
Posted by "goldmedal (via GitHub)" <gi...@apache.org>.
goldmedal commented on code in PR #12158:
URL: https://github.com/apache/datafusion/pull/12158#discussion_r1730386778
##########
datafusion/sql/src/unparser/plan.rs:
##########
@@ -507,6 +523,72 @@ impl Unparser<'_> {
}
}
+ fn unparse_table_scan_pushdown(
+ plan: &LogicalPlan,
+ alias: Option<TableReference>,
+ ) -> Result<LogicalPlan> {
+ match plan {
+ LogicalPlan::TableScan(table_scan) => {
+ // TODO: support filters for table scan with alias
+ if alias.is_some() && !table_scan.filters().is_empty() {
+ return not_impl_err!(
+ "Subquery alias is not supported for table scan with pushdown filters"
+ );
+ }
Review Comment:
There are some issues with handling the table name prefix for the column. It isn't simple. I think we can create another issue for it. See the example in the unit tests.
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
Posted by "goldmedal (via GitHub)" <gi...@apache.org>.
goldmedal commented on code in PR #12158:
URL: https://github.com/apache/datafusion/pull/12158#discussion_r1747985197
##########
datafusion/sql/tests/cases/plan_to_sql.rs:
##########
@@ -607,6 +609,151 @@ fn sql_round_trip(query: &str, expect: &str) {
assert_eq!(roundtrip_statement.to_string(), expect);
}
+#[test]
+fn test_table_scan_pushdown() -> Result<()> {
+ let schema = Schema::new(vec![
+ Field::new("id", DataType::Utf8, false),
+ Field::new("age", DataType::Utf8, false),
+ ]);
+
+ let scan_with_projection =
+ table_scan(Some("t1"), &schema, Some(vec![0, 1]))?.build()?;
+ let scan_with_projection = plan_to_sql(&scan_with_projection)?;
+ assert_eq!(
+ format!("{}", scan_with_projection),
+ "SELECT t1.id, t1.age FROM t1"
+ );
+
+ let scan_with_no_projection = table_scan(Some("t1"), &schema, None)?.build()?;
+ let scan_with_no_projection = plan_to_sql(&scan_with_no_projection)?;
+ assert_eq!(format!("{}", scan_with_no_projection), "SELECT * FROM t1");
+
+ let table_scan_with_projection_alias =
+ table_scan(Some("t1"), &schema, Some(vec![0, 1]))?
+ .alias("ta")?
+ .build()?;
+ let table_scan_with_projection_alias =
+ plan_to_sql(&table_scan_with_projection_alias)?;
+ assert_eq!(
+ format!("{}", table_scan_with_projection_alias),
+ "SELECT ta.id, ta.age FROM t1 AS ta"
+ );
+
+ let table_scan_with_no_projection_alias = table_scan(Some("t1"), &schema, None)?
+ .alias("ta")?
+ .build()?;
+ let table_scan_with_no_projection_alias =
+ plan_to_sql(&table_scan_with_no_projection_alias)?;
+ assert_eq!(
+ format!("{}", table_scan_with_no_projection_alias),
+ "SELECT * FROM t1 AS ta"
+ );
+
+ let query_from_table_scan_with_projection = LogicalPlanBuilder::from(
+ table_scan(Some("t1"), &schema, Some(vec![0, 1]))?.build()?,
+ )
+ .project(vec![wildcard()])?
+ .build()?;
+ let query_from_table_scan_with_projection =
+ plan_to_sql(&query_from_table_scan_with_projection)?;
+ assert_eq!(
+ format!("{}", query_from_table_scan_with_projection),
+ "SELECT * FROM (SELECT t1.id, t1.age FROM t1)"
+ );
+
+ let table_scan_with_filter = table_scan_with_filters(
+ Some("t1"),
+ &schema,
+ None,
+ vec![col("id").gt(col("age"))],
+ )?
+ .build()?;
+ let table_scan_with_filter = plan_to_sql(&table_scan_with_filter)?;
+ assert_eq!(
+ format!("{}", table_scan_with_filter),
+ "SELECT * FROM t1 WHERE (t1.id > t1.age)"
+ );
+
+ let table_scan_with_two_filter = table_scan_with_filters(
+ Some("t1"),
+ &schema,
+ None,
+ vec![col("id").gt(lit(1)), col("age").lt(lit(2))],
+ )?
+ .build()?;
+ let table_scan_with_two_filter = plan_to_sql(&table_scan_with_two_filter)?;
+ assert_eq!(
+ format!("{}", table_scan_with_two_filter),
+ "SELECT * FROM t1 WHERE ((t1.id > 1) AND (t1.age < 2))"
+ );
+
+ // TODO: support filters for table scan with alias
Review Comment:
filed https://github.com/apache/datafusion/issues/12368
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] Unparse TableScan with projections, filters or fetch to SQL string [datafusion]
Posted by "phillipleblanc (via GitHub)" <gi...@apache.org>.
phillipleblanc commented on code in PR #12158:
URL: https://github.com/apache/datafusion/pull/12158#discussion_r1747999070
##########
datafusion/sql/src/unparser/plan.rs:
##########
@@ -532,6 +548,73 @@ impl Unparser<'_> {
}
}
+ fn unparse_table_scan_pushdown(
+ plan: &LogicalPlan,
+ alias: Option<TableReference>,
+ ) -> Result<LogicalPlan> {
+ match plan {
+ LogicalPlan::TableScan(table_scan) => {
+ // TODO: support filters for table scan with alias.Remove this check after #12368 issue.
Review Comment:
```suggestion
// TODO: support filters for table scan with alias. Remove this check after #12368 issue.
```
--
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: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org