You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@datafusion.apache.org by "NGA-TRAN (via GitHub)" <gi...@apache.org> on 2025/07/10 19:43:24 UTC
[PR] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
NGA-TRAN opened a new pull request, #16742:
URL: https://github.com/apache/datafusion/pull/16742
## 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.
-->
This are tests per @alamb's suggestion at https://github.com/apache/datafusion/pull/16662#pullrequestreview-2994410907:
`I also wonder if we should add examples / tpch serialization for all the remaining tpch queries in datafuison-proto`
## 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.
-->
This PR introduces two separate tests:
1. test_serialize_deserialize_tpch_queries Validates serialization and deserialization for all 21 TPC-H queries. Note: Q16 is excluded due to a known bug #16665
2. test_round_trip_tpch_queries Compares the original and deserialized versions of each query. Currently ignored: Only 4 out of 22 queries pass at the moment.
## 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.
-->
New tests
## Are these changes tested?
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
3. 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)?
-->
They are tests. No new functionality
## Are there any user-facing changes?
<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
No
<!--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "LiaCastaneda (via GitHub)" <gi...@apache.org>.
LiaCastaneda commented on code in PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#discussion_r2199941659
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
Review Comment:
there is also `parquet_test_data()` which stores data on `datafusion/parquet-testing`
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
+
+ // TPC-H table names
+ let tables = [
+ "part", "supplier", "partsupp", "customer", "orders", "lineitem", "nation",
+ "region",
+ ];
+
+ // Create external tables for all TPC-H tables
+ for table in &tables {
+ let table_sql = format!(
+ "CREATE EXTERNAL TABLE {table} STORED AS PARQUET LOCATION '{test_data}/tpch_{table}_small.parquet'"
Review Comment:
we can also use `register_parquet`
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "LiaCastaneda (via GitHub)" <gi...@apache.org>.
LiaCastaneda commented on PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#issuecomment-3061154200
Just out of curiosity, do you know if the issue is that an specific node can't serialize?
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "NGA-TRAN (via GitHub)" <gi...@apache.org>.
NGA-TRAN commented on code in PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#discussion_r2205580973
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
+
+ // TPC-H table names
+ let tables = [
+ "part", "supplier", "partsupp", "customer", "orders", "lineitem", "nation",
+ "region",
+ ];
+
+ // Create external tables for all TPC-H tables
+ for table in &tables {
+ let table_sql = format!(
+ "CREATE EXTERNAL TABLE {table} STORED AS PARQUET LOCATION '{test_data}/tpch_{table}_small.parquet'"
+ );
+ ctx.sql(&table_sql).await.map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to create {table} table: {e}").into(),
+ )
+ })?;
+ }
+
+ Ok(ctx)
+}
+
+/// Helper function to get TPC-H query SQL
+fn get_tpch_query_sql(query: usize) -> Result<Vec<String>> {
+ use std::fs;
+
+ if !(1..=22).contains(&query) {
+ return Err(DataFusionError::External(
+ format!("Invalid TPC-H query number: {query}").into(),
+ ));
+ }
+
+ let filename = format!("../../benchmarks/queries/q{query}.sql");
+ let contents = fs::read_to_string(&filename).map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to read query file {filename}: {e}").into(),
+ )
+ })?;
+
+ Ok(contents
+ .split(';')
+ .map(|s| s.trim())
+ .filter(|s| !s.is_empty())
+ .map(|s| s.to_string())
+ .collect())
+}
+
+// Skip q16 until https://github.com/apache/datafusion/issues/16665 is fixed
+#[tokio::test]
+async fn test_serialize_deserialize_tpch_queries() -> Result<()> {
+ // Create context with TPC-H tables
+ let ctx = tpch_context().await?;
+
+ // repeat to run all 22 queries except q16 due to bug above
+ for query in 1..=22 {
+ if query == 16 {
+ continue;
+ }
+ // run all statements in the query
+ let sql = get_tpch_query_sql(query)?;
+ for stmt in sql {
+ let logical_plan = ctx.sql(&stmt).await?.into_unoptimized_plan();
+ let optimized_plan = ctx.state().optimize(&logical_plan)?;
+ let physical_plan = ctx.state().create_physical_plan(&optimized_plan).await?;
+
+ // serialize the physical plan
+ let codec = DefaultPhysicalExtensionCodec {};
+ let proto =
+ PhysicalPlanNode::try_from_physical_plan(physical_plan.clone(), &codec)?;
+
+ // deserialize the physical plan
+ let _deserialized_plan =
+ proto.try_into_physical_plan(&ctx, ctx.runtime_env().as_ref(), &codec)?;
+ }
+ }
+
+ Ok(())
+}
+
+// Only 4 queries pass: q3, q5, q10, q12
+// The rest fails with 2 different reasons:
+// - q16 fails at deserialization step: https://github.com/apache/datafusion/issues/16665
+// - Other queries fails due to mismatch between the serialized and deserialized physical plans
Review Comment:
Created https://github.com/apache/datafusion/issues/16772
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "NGA-TRAN (via GitHub)" <gi...@apache.org>.
NGA-TRAN commented on code in PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#discussion_r2205580481
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
+
+ // TPC-H table names
+ let tables = [
+ "part", "supplier", "partsupp", "customer", "orders", "lineitem", "nation",
+ "region",
+ ];
+
+ // Create external tables for all TPC-H tables
+ for table in &tables {
+ let table_sql = format!(
+ "CREATE EXTERNAL TABLE {table} STORED AS PARQUET LOCATION '{test_data}/tpch_{table}_small.parquet'"
+ );
+ ctx.sql(&table_sql).await.map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to create {table} table: {e}").into(),
+ )
+ })?;
+ }
+
+ Ok(ctx)
+}
+
+/// Helper function to get TPC-H query SQL
+fn get_tpch_query_sql(query: usize) -> Result<Vec<String>> {
+ use std::fs;
+
+ if !(1..=22).contains(&query) {
+ return Err(DataFusionError::External(
+ format!("Invalid TPC-H query number: {query}").into(),
+ ));
+ }
+
+ let filename = format!("../../benchmarks/queries/q{query}.sql");
+ let contents = fs::read_to_string(&filename).map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to read query file {filename}: {e}").into(),
+ )
+ })?;
+
+ Ok(contents
+ .split(';')
+ .map(|s| s.trim())
+ .filter(|s| !s.is_empty())
+ .map(|s| s.to_string())
+ .collect())
+}
+
+// Skip q16 until https://github.com/apache/datafusion/issues/16665 is fixed
+#[tokio::test]
+async fn test_serialize_deserialize_tpch_queries() -> Result<()> {
Review Comment:
Done
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "NGA-TRAN (via GitHub)" <gi...@apache.org>.
NGA-TRAN commented on PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#issuecomment-3070612263
@alamb and @XiangpengHao : I have created a new ticket for the display & hashset bug; and also merge q16 test into the the new test for all tpc-h queries
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "XiangpengHao (via GitHub)" <gi...@apache.org>.
XiangpengHao commented on PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#issuecomment-3062716781
I checked #16744 with this test, and confirm that most tests still fails.
A closer look at this show that it's mostly due to the field "human_display", the deserialized one seems to strip out the human_display. So it's probably a different bug from #16665
I plan to fix the human_display thing over the weekend unless someone beats me to it.
Here's a diff: https://www.diffchecker.com/Jy2neEt0/
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "NGA-TRAN (via GitHub)" <gi...@apache.org>.
NGA-TRAN commented on code in PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#discussion_r2198593774
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
+
+ // TPC-H table names
+ let tables = [
+ "part", "supplier", "partsupp", "customer", "orders", "lineitem", "nation",
+ "region",
+ ];
+
+ // Create external tables for all TPC-H tables
+ for table in &tables {
+ let table_sql = format!(
+ "CREATE EXTERNAL TABLE {table} STORED AS PARQUET LOCATION '{test_data}/tpch_{table}_small.parquet'"
+ );
+ ctx.sql(&table_sql).await.map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to create {table} table: {e}").into(),
+ )
+ })?;
+ }
+
+ Ok(ctx)
+}
+
+/// Helper function to get TPC-H query SQL
+fn get_tpch_query_sql(query: usize) -> Result<Vec<String>> {
+ use std::fs;
+
+ if !(1..=22).contains(&query) {
+ return Err(DataFusionError::External(
+ format!("Invalid TPC-H query number: {query}").into(),
+ ));
+ }
+
+ let filename = format!("../../benchmarks/queries/q{query}.sql");
+ let contents = fs::read_to_string(&filename).map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to read query file {filename}: {e}").into(),
+ )
+ })?;
+
+ Ok(contents
+ .split(';')
+ .map(|s| s.trim())
+ .filter(|s| !s.is_empty())
+ .map(|s| s.to_string())
+ .collect())
+}
+
+// Skip q16 until https://github.com/apache/datafusion/issues/16665 is fixed
+#[tokio::test]
+async fn test_serialize_deserialize_tpch_queries() -> Result<()> {
+ // Create context with TPC-H tables
+ let ctx = tpch_context().await?;
+
+ // repeat to run all 22 queries except q16 due to bug above
+ for query in 1..=22 {
+ if query == 16 {
+ continue;
+ }
+ // run all statements in the query
+ let sql = get_tpch_query_sql(query)?;
+ for stmt in sql {
+ let logical_plan = ctx.sql(&stmt).await?.into_unoptimized_plan();
+ let optimized_plan = ctx.state().optimize(&logical_plan)?;
+ let physical_plan = ctx.state().create_physical_plan(&optimized_plan).await?;
+
+ // serialize the physical plan
+ let codec = DefaultPhysicalExtensionCodec {};
+ let proto =
+ PhysicalPlanNode::try_from_physical_plan(physical_plan.clone(), &codec)?;
+
+ // deserialize the physical plan
+ let _deserialized_plan =
+ proto.try_into_physical_plan(&ctx, ctx.runtime_env().as_ref(), &codec)?;
+ }
+ }
+
+ Ok(())
+}
+
+// Only 4 queries pass: q3, q5, q10, q12
+// The rest fails with 2 different reasons:
+// - q16 fails at deserialization step: https://github.com/apache/datafusion/issues/16665
+// - Other queries fails due to mismatch between the serialized and deserialized physical plans
Review Comment:
@alamb : Let me know if you think a different bug ticket for this is necessary. I am happy to file it
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "NGA-TRAN (via GitHub)" <gi...@apache.org>.
NGA-TRAN commented on PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#issuecomment-3062011181
> Just out of curiosity, do you know if the issue is that an specific node can't serialize?
Some info and fix:
- https://github.com/apache/datafusion/issues/16665#issuecomment-3034340552
- https://github.com/apache/datafusion/pull/16744/
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "NGA-TRAN (via GitHub)" <gi...@apache.org>.
NGA-TRAN commented on code in PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#discussion_r2198593774
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
+
+ // TPC-H table names
+ let tables = [
+ "part", "supplier", "partsupp", "customer", "orders", "lineitem", "nation",
+ "region",
+ ];
+
+ // Create external tables for all TPC-H tables
+ for table in &tables {
+ let table_sql = format!(
+ "CREATE EXTERNAL TABLE {table} STORED AS PARQUET LOCATION '{test_data}/tpch_{table}_small.parquet'"
+ );
+ ctx.sql(&table_sql).await.map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to create {table} table: {e}").into(),
+ )
+ })?;
+ }
+
+ Ok(ctx)
+}
+
+/// Helper function to get TPC-H query SQL
+fn get_tpch_query_sql(query: usize) -> Result<Vec<String>> {
+ use std::fs;
+
+ if !(1..=22).contains(&query) {
+ return Err(DataFusionError::External(
+ format!("Invalid TPC-H query number: {query}").into(),
+ ));
+ }
+
+ let filename = format!("../../benchmarks/queries/q{query}.sql");
+ let contents = fs::read_to_string(&filename).map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to read query file {filename}: {e}").into(),
+ )
+ })?;
+
+ Ok(contents
+ .split(';')
+ .map(|s| s.trim())
+ .filter(|s| !s.is_empty())
+ .map(|s| s.to_string())
+ .collect())
+}
+
+// Skip q16 until https://github.com/apache/datafusion/issues/16665 is fixed
+#[tokio::test]
+async fn test_serialize_deserialize_tpch_queries() -> Result<()> {
+ // Create context with TPC-H tables
+ let ctx = tpch_context().await?;
+
+ // repeat to run all 22 queries except q16 due to bug above
+ for query in 1..=22 {
+ if query == 16 {
+ continue;
+ }
+ // run all statements in the query
+ let sql = get_tpch_query_sql(query)?;
+ for stmt in sql {
+ let logical_plan = ctx.sql(&stmt).await?.into_unoptimized_plan();
+ let optimized_plan = ctx.state().optimize(&logical_plan)?;
+ let physical_plan = ctx.state().create_physical_plan(&optimized_plan).await?;
+
+ // serialize the physical plan
+ let codec = DefaultPhysicalExtensionCodec {};
+ let proto =
+ PhysicalPlanNode::try_from_physical_plan(physical_plan.clone(), &codec)?;
+
+ // deserialize the physical plan
+ let _deserialized_plan =
+ proto.try_into_physical_plan(&ctx, ctx.runtime_env().as_ref(), &codec)?;
+ }
+ }
+
+ Ok(())
+}
+
+// Only 4 queries pass: q3, q5, q10, q12
+// The rest fails with 2 different reasons:
+// - q16 fails at deserialization step: https://github.com/apache/datafusion/issues/16665
+// - Other queries fails due to mismatch between the serialized and deserialized physical plans
Review Comment:
@alamb : Let me know if you think a different bug for this is necessary
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "NGA-TRAN (via GitHub)" <gi...@apache.org>.
NGA-TRAN commented on code in PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#discussion_r2200734851
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
+
+ // TPC-H table names
+ let tables = [
+ "part", "supplier", "partsupp", "customer", "orders", "lineitem", "nation",
+ "region",
+ ];
+
+ // Create external tables for all TPC-H tables
+ for table in &tables {
+ let table_sql = format!(
+ "CREATE EXTERNAL TABLE {table} STORED AS PARQUET LOCATION '{test_data}/tpch_{table}_small.parquet'"
+ );
+ ctx.sql(&table_sql).await.map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to create {table} table: {e}").into(),
+ )
+ })?;
+ }
+
+ Ok(ctx)
+}
+
+/// Helper function to get TPC-H query SQL
+fn get_tpch_query_sql(query: usize) -> Result<Vec<String>> {
+ use std::fs;
+
+ if !(1..=22).contains(&query) {
+ return Err(DataFusionError::External(
+ format!("Invalid TPC-H query number: {query}").into(),
+ ));
+ }
+
+ let filename = format!("../../benchmarks/queries/q{query}.sql");
+ let contents = fs::read_to_string(&filename).map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to read query file {filename}: {e}").into(),
+ )
+ })?;
+
+ Ok(contents
+ .split(';')
+ .map(|s| s.trim())
+ .filter(|s| !s.is_empty())
+ .map(|s| s.to_string())
+ .collect())
+}
+
+// Skip q16 until https://github.com/apache/datafusion/issues/16665 is fixed
+#[tokio::test]
+async fn test_serialize_deserialize_tpch_queries() -> Result<()> {
Review Comment:
I am thinking to merge the [failed q16 test ](https://github.com/apache/datafusion/pull/16662/files) into this test to make it one test
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "XiangpengHao (via GitHub)" <gi...@apache.org>.
XiangpengHao commented on PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#issuecomment-3062840649
A little bit more investigation show that some of the non-determinism is introduced by hashset, so we probably also want to change how we compare plans.
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on code in PR #16742:
URL: https://github.com/apache/datafusion/pull/16742#discussion_r2201829283
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
+
+ // TPC-H table names
+ let tables = [
+ "part", "supplier", "partsupp", "customer", "orders", "lineitem", "nation",
+ "region",
+ ];
+
+ // Create external tables for all TPC-H tables
+ for table in &tables {
+ let table_sql = format!(
+ "CREATE EXTERNAL TABLE {table} STORED AS PARQUET LOCATION '{test_data}/tpch_{table}_small.parquet'"
+ );
+ ctx.sql(&table_sql).await.map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to create {table} table: {e}").into(),
+ )
+ })?;
+ }
+
+ Ok(ctx)
+}
+
+/// Helper function to get TPC-H query SQL
+fn get_tpch_query_sql(query: usize) -> Result<Vec<String>> {
+ use std::fs;
+
+ if !(1..=22).contains(&query) {
+ return Err(DataFusionError::External(
+ format!("Invalid TPC-H query number: {query}").into(),
+ ));
+ }
+
+ let filename = format!("../../benchmarks/queries/q{query}.sql");
+ let contents = fs::read_to_string(&filename).map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to read query file {filename}: {e}").into(),
+ )
+ })?;
+
+ Ok(contents
+ .split(';')
+ .map(|s| s.trim())
+ .filter(|s| !s.is_empty())
+ .map(|s| s.to_string())
+ .collect())
+}
+
+// Skip q16 until https://github.com/apache/datafusion/issues/16665 is fixed
+#[tokio::test]
+async fn test_serialize_deserialize_tpch_queries() -> Result<()> {
+ // Create context with TPC-H tables
+ let ctx = tpch_context().await?;
+
+ // repeat to run all 22 queries except q16 due to bug above
+ for query in 1..=22 {
+ if query == 16 {
+ continue;
+ }
+ // run all statements in the query
+ let sql = get_tpch_query_sql(query)?;
+ for stmt in sql {
+ let logical_plan = ctx.sql(&stmt).await?.into_unoptimized_plan();
+ let optimized_plan = ctx.state().optimize(&logical_plan)?;
+ let physical_plan = ctx.state().create_physical_plan(&optimized_plan).await?;
+
+ // serialize the physical plan
+ let codec = DefaultPhysicalExtensionCodec {};
+ let proto =
+ PhysicalPlanNode::try_from_physical_plan(physical_plan.clone(), &codec)?;
+
+ // deserialize the physical plan
+ let _deserialized_plan =
+ proto.try_into_physical_plan(&ctx, ctx.runtime_env().as_ref(), &codec)?;
+ }
+ }
+
+ Ok(())
+}
+
+// Only 4 queries pass: q3, q5, q10, q12
+// The rest fails with 2 different reasons:
+// - q16 fails at deserialization step: https://github.com/apache/datafusion/issues/16665
+// - Other queries fails due to mismatch between the serialized and deserialized physical plans
Review Comment:
Since I think @XiangpengHao says that https://github.com/apache/datafusion/pull/16744 does not fix them all, I do think we should file a separate bug to track the other failures. Who knows -- maybe even other people will fix them like @XiangpengHao did for #16665 ❤️
##########
datafusion/proto/tests/cases/roundtrip_physical_plan.rs:
##########
@@ -1780,3 +1780,111 @@ async fn test_tpch_part_in_list_query_with_real_parquet_data() -> Result<()> {
Ok(())
}
+
+/// Helper function to create a SessionContext with all TPC-H tables registered as external tables
+async fn tpch_context() -> Result<SessionContext> {
+ use datafusion_common::test_util::datafusion_test_data;
+
+ let ctx = SessionContext::new();
+ let test_data = datafusion_test_data();
+
+ // TPC-H table names
+ let tables = [
+ "part", "supplier", "partsupp", "customer", "orders", "lineitem", "nation",
+ "region",
+ ];
+
+ // Create external tables for all TPC-H tables
+ for table in &tables {
+ let table_sql = format!(
+ "CREATE EXTERNAL TABLE {table} STORED AS PARQUET LOCATION '{test_data}/tpch_{table}_small.parquet'"
+ );
+ ctx.sql(&table_sql).await.map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to create {table} table: {e}").into(),
+ )
+ })?;
+ }
+
+ Ok(ctx)
+}
+
+/// Helper function to get TPC-H query SQL
+fn get_tpch_query_sql(query: usize) -> Result<Vec<String>> {
+ use std::fs;
+
+ if !(1..=22).contains(&query) {
+ return Err(DataFusionError::External(
+ format!("Invalid TPC-H query number: {query}").into(),
+ ));
+ }
+
+ let filename = format!("../../benchmarks/queries/q{query}.sql");
+ let contents = fs::read_to_string(&filename).map_err(|e| {
+ DataFusionError::External(
+ format!("Failed to read query file {filename}: {e}").into(),
+ )
+ })?;
+
+ Ok(contents
+ .split(';')
+ .map(|s| s.trim())
+ .filter(|s| !s.is_empty())
+ .map(|s| s.to_string())
+ .collect())
+}
+
+// Skip q16 until https://github.com/apache/datafusion/issues/16665 is fixed
+#[tokio::test]
+async fn test_serialize_deserialize_tpch_queries() -> Result<()> {
Review Comment:
Yes please do
--
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] Add serialization/deserialization and round-trip tests for all tpc-h queries [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb merged PR #16742:
URL: https://github.com/apache/datafusion/pull/16742
--
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