Skip to content

Commit 0e3b61f

Browse files
committed
Merge branch 'qianqian/fed-test-workflow' of https://github.com/spiceai/datafusion-federation into qianqian/fed-test-workflow
2 parents 0fa07ed + ab50ae8 commit 0e3b61f

23 files changed

Lines changed: 47 additions & 44 deletions

integration-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "macros"] }
1616
async-trait.workspace = true
1717
tonic = "0.12.2"
1818
futures.workspace = true
19-
insta = { version = "1.42.0" }
19+
insta = { version = "1.42.0", features = ["filters"]}
2020
chrono = "0.4.31"
2121
datafusion-federation.path = "../datafusion-federation"

integration-test/snapshots/explain/federation_integration_tests__tpch_tpch_q10_explain.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: test/src/main.rs
2+
source: integration-test/src/main.rs
33
description: Federated Query Explain
44
expression: plan_display
55
---
@@ -20,6 +20,6 @@ expression: plan_display
2020
| | TableScan: lineitem projection=[l_orderkey, l_extendedprice, l_discount], full_filters=[lineitem.l_returnflag = Utf8("R")] |
2121
| | TableScan: nation projection=[n_nationkey, n_name] |
2222
| physical_plan | SchemaCastScanExec |
23-
| | VirtualExecutionPlan name=duckdb compute_context=/Users/qianqian/datafusion-federation/tpch_sf1.db sql=SELECT customer.c_custkey, customer.c_name, sum((lineitem.l_extendedprice * (1 - lineitem.l_discount))) AS revenue, customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment FROM customer JOIN orders ON ((customer.c_custkey = orders.o_custkey) AND ((orders.o_orderdate >= CAST('1993-10-01' AS DATE)) AND (orders.o_orderdate < CAST('1994-01-01' AS DATE)))) JOIN lineitem ON ((lineitem.l_orderkey = orders.o_orderkey) AND (lineitem.l_returnflag = 'R')) JOIN nation ON (customer.c_nationkey = nation.n_nationkey) GROUP BY customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment ORDER BY revenue DESC NULLS FIRST LIMIT 20 rewritten_sql=SELECT "customer"."c_custkey", "customer"."c_name", sum(("lineitem"."l_extendedprice" * (1 - "lineitem"."l_discount"))) AS "revenue", "customer"."c_acctbal", "nation"."n_name", "customer"."c_address", "customer"."c_phone", "customer"."c_comment" FROM "customer" JOIN "orders" ON (("customer"."c_custkey" = "orders"."o_custkey") AND (("orders"."o_orderdate" >= CAST('1993-10-01' AS DATE)) AND ("orders"."o_orderdate" < CAST('1994-01-01' AS DATE)))) JOIN "lineitem" ON (("lineitem"."l_orderkey" = "orders"."o_orderkey") AND ("lineitem"."l_returnflag" = 'R')) JOIN "nation" ON ("customer"."c_nationkey" = "nation"."n_nationkey") GROUP BY "customer"."c_custkey", "customer"."c_name", "customer"."c_acctbal", "customer"."c_phone", "nation"."n_name", "customer"."c_address", "customer"."c_comment" ORDER BY "revenue" DESC NULLS FIRST LIMIT 20 |
23+
| | VirtualExecutionPlan name=duckdb compute_context=tpch_sf1.db sql=SELECT customer.c_custkey, customer.c_name, sum((lineitem.l_extendedprice * (1 - lineitem.l_discount))) AS revenue, customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment FROM customer JOIN orders ON ((customer.c_custkey = orders.o_custkey) AND ((orders.o_orderdate >= CAST('1993-10-01' AS DATE)) AND (orders.o_orderdate < CAST('1994-01-01' AS DATE)))) JOIN lineitem ON ((lineitem.l_orderkey = orders.o_orderkey) AND (lineitem.l_returnflag = 'R')) JOIN nation ON (customer.c_nationkey = nation.n_nationkey) GROUP BY customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment ORDER BY revenue DESC NULLS FIRST LIMIT 20 rewritten_sql=SELECT "customer"."c_custkey", "customer"."c_name", sum(("lineitem"."l_extendedprice" * (1 - "lineitem"."l_discount"))) AS "revenue", "customer"."c_acctbal", "nation"."n_name", "customer"."c_address", "customer"."c_phone", "customer"."c_comment" FROM "customer" JOIN "orders" ON (("customer"."c_custkey" = "orders"."o_custkey") AND (("orders"."o_orderdate" >= CAST('1993-10-01' AS DATE)) AND ("orders"."o_orderdate" < CAST('1994-01-01' AS DATE)))) JOIN "lineitem" ON (("lineitem"."l_orderkey" = "orders"."o_orderkey") AND ("lineitem"."l_returnflag" = 'R')) JOIN "nation" ON ("customer"."c_nationkey" = "nation"."n_nationkey") GROUP BY "customer"."c_custkey", "customer"."c_name", "customer"."c_acctbal", "customer"."c_phone", "nation"."n_name", "customer"."c_address", "customer"."c_comment" ORDER BY "revenue" DESC NULLS FIRST LIMIT 20 |
2424
| | |
2525
+---------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

0 commit comments

Comments
 (0)