Skip to content

Commit

Permalink
feat: add join type for logical plan display
Browse files Browse the repository at this point in the history
  • Loading branch information
@xudong963
xudong963 committed Jan 25, 2022
1 parent deaa8ac commit 4774940
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 27 deletions.
2 changes: 1 addition & 1 deletion datafusion/src/logical_plan/builder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ mod tests {

// id column should only show up once in projection
let expected = "Projection: #t1.id, #t1.first_name, #t1.last_name, #t1.state, #t1.salary, #t2.first_name, #t2.last_name, #t2.state, #t2.salary\
\n Join: Using #t1.id = #t2.id\
\n Inner Join: Using #t1.id = #t2.id\
\n TableScan: t1 projection=None\
\n TableScan: t2 projection=None";

Expand Down
18 changes: 16 additions & 2 deletions datafusion/src/logical_plan/plan.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -934,16 +934,30 @@ impl LogicalPlan {
LogicalPlan::Join(Join {
on: ref keys,
join_constraint,
join_type,
..
}) => {
let join_expr: Vec<String> =
keys.iter().map(|(l, r)| format!("{} = {}", l, r)).collect();
let join_type = match join_type {
JoinType::Inner => "Inner".to_string(),
JoinType::Left => "Left".to_string(),
JoinType::Right => "Right".to_string(),
JoinType::Full => "Full".to_string(),
JoinType::Semi => "Semi".to_string(),
JoinType::Anti => "Anti".to_string(),
};
match join_constraint {
JoinConstraint::On => {
write!(f, "Join: {}", join_expr.join(", "))
write!(f, "{} Join: {}", join_type, join_expr.join(", "))
}
JoinConstraint::Using => {
write!(f, "Join: Using {}", join_expr.join(", "))
write!(
f,
"{} Join: Using {}",
join_type,
join_expr.join(", ")
)
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions datafusion/src/optimizer/filter_push_down.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -997,15 +997,15 @@ mod tests {
format!("{:?}", plan),
"\
Filter: #test.a <= Int64(1)\
\n Join: #test.a = #test2.a\
\n Inner Join: #test.a = #test2.a\
\n TableScan: test projection=None\
\n Projection: #test2.a\
\n TableScan: test2 projection=None"
);

// filter sent to side before the join
let expected = "\
Join: #test.a = #test2.a\
Inner Join: #test.a = #test2.a\
\n Filter: #test.a <= Int64(1)\
\n TableScan: test projection=None\
\n Projection: #test2.a\
Expand Down Expand Up @@ -1038,15 +1038,15 @@ mod tests {
format!("{:?}", plan),
"\
Filter: #test.a <= Int64(1)\
\n Join: Using #test.a = #test2.a\
\n Inner Join: Using #test.a = #test2.a\
\n TableScan: test projection=None\
\n Projection: #test2.a\
\n TableScan: test2 projection=None"
);

// filter sent to side before the join
let expected = "\
Join: Using #test.a = #test2.a\
Inner Join: Using #test.a = #test2.a\
\n Filter: #test.a <= Int64(1)\
\n TableScan: test projection=None\
\n Projection: #test2.a\
Expand Down Expand Up @@ -1082,7 +1082,7 @@ mod tests {
format!("{:?}", plan),
"\
Filter: #test.c <= #test2.b\
\n Join: #test.a = #test2.a\
\n Inner Join: #test.a = #test2.a\
\n Projection: #test.a, #test.c\
\n TableScan: test projection=None\
\n Projection: #test2.a, #test2.b\
Expand Down Expand Up @@ -1121,15 +1121,15 @@ mod tests {
format!("{:?}", plan),
"\
Filter: #test.b <= Int64(1)\
\n Join: #test.a = #test2.a\
\n Inner Join: #test.a = #test2.a\
\n Projection: #test.a, #test.b\
\n TableScan: test projection=None\
\n Projection: #test2.a, #test2.c\
\n TableScan: test2 projection=None"
);

let expected = "\
Join: #test.a = #test2.a\
Inner Join: #test.a = #test2.a\
\n Projection: #test.a, #test.b\
\n Filter: #test.b <= Int64(1)\
\n TableScan: test projection=None\
Expand Down
6 changes: 3 additions & 3 deletions datafusion/src/optimizer/projection_push_down.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ mod tests {

// make sure projections are pushed down to both table scans
let expected = "Projection: #test.a, #test.b, #test2.c1\
\n Join: #test.a = #test2.c1\
\n Left Join: #test.a = #test2.c1\
\n TableScan: test projection=Some([0, 1])\
\n TableScan: test2 projection=Some([0])";

Expand Down Expand Up @@ -634,7 +634,7 @@ mod tests {

// make sure projections are pushed down to both table scans
let expected = "Projection: #test.a, #test.b\
\n Join: #test.a = #test2.c1\
\n Left Join: #test.a = #test2.c1\
\n TableScan: test projection=Some([0, 1])\
\n TableScan: test2 projection=Some([0])";

Expand Down Expand Up @@ -673,7 +673,7 @@ mod tests {

// make sure projections are pushed down to table scan
let expected = "Projection: #test.a, #test.b\
\n Join: Using #test.a = #test2.a\
\n Left Join: Using #test.a = #test2.a\
\n TableScan: test projection=Some([0, 1])\
\n TableScan: test2 projection=Some([0])";

Expand Down
22 changes: 11 additions & 11 deletions datafusion/src/sql/planner.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3241,7 +3241,7 @@ mod tests {
JOIN orders \
ON id = customer_id";
let expected = "Projection: #person.id, #orders.order_id\
\n Join: #person.id = #orders.customer_id\
\n Inner Join: #person.id = #orders.customer_id\
\n TableScan: person projection=None\
\n TableScan: orders projection=None";
quick_test(sql, expected);
Expand All @@ -3255,7 +3255,7 @@ mod tests {
ON id = customer_id AND order_id > 1 ";
let expected = "Projection: #person.id, #orders.order_id\
\n Filter: #orders.order_id > Int64(1)\
\n Join: #person.id = #orders.customer_id\
\n Inner Join: #person.id = #orders.customer_id\
\n TableScan: person projection=None\
\n TableScan: orders projection=None";
quick_test(sql, expected);
Expand All @@ -3268,7 +3268,7 @@ mod tests {
LEFT JOIN orders \
ON id = customer_id AND order_id > 1";
let expected = "Projection: #person.id, #orders.order_id\
\n Join: #person.id = #orders.customer_id\
\n Left Join: #person.id = #orders.customer_id\
\n TableScan: person projection=None\
\n Filter: #orders.order_id > Int64(1)\
\n TableScan: orders projection=None";
Expand All @@ -3282,7 +3282,7 @@ mod tests {
RIGHT JOIN orders \
ON id = customer_id AND id > 1";
let expected = "Projection: #person.id, #orders.order_id\
\n Join: #person.id = #orders.customer_id\
\n Right Join: #person.id = #orders.customer_id\
\n Filter: #person.id > Int64(1)\
\n TableScan: person projection=None\
\n TableScan: orders projection=None";
Expand All @@ -3296,7 +3296,7 @@ mod tests {
JOIN orders \
ON person.id = orders.customer_id";
let expected = "Projection: #person.id, #orders.order_id\
\n Join: #person.id = #orders.customer_id\
\n Inner Join: #person.id = #orders.customer_id\
\n TableScan: person projection=None\
\n TableScan: orders projection=None";
quick_test(sql, expected);
Expand All @@ -3309,7 +3309,7 @@ mod tests {
JOIN person as person2 \
USING (id)";
let expected = "Projection: #person.first_name, #person.id\
\n Join: Using #person.id = #person2.id\
\n Inner Join: Using #person.id = #person2.id\
\n TableScan: person projection=None\
\n TableScan: person2 projection=None";
quick_test(sql, expected);
Expand All @@ -3322,7 +3322,7 @@ mod tests {
JOIN lineitem as lineitem2 \
USING (l_item_id)";
let expected = "Projection: #lineitem.l_item_id, #lineitem.l_description, #lineitem.price, #lineitem2.l_description, #lineitem2.price\
\n Join: Using #lineitem.l_item_id = #lineitem2.l_item_id\
\n Inner Join: Using #lineitem.l_item_id = #lineitem2.l_item_id\
\n TableScan: lineitem projection=None\
\n TableScan: lineitem2 projection=None";
quick_test(sql, expected);
Expand All @@ -3336,8 +3336,8 @@ mod tests {
JOIN lineitem ON o_item_id = l_item_id";
let expected =
"Projection: #person.id, #orders.order_id, #lineitem.l_description\
\n Join: #orders.o_item_id = #lineitem.l_item_id\
\n Join: #person.id = #orders.customer_id\
\n Inner Join: #orders.o_item_id = #lineitem.l_item_id\
\n Inner Join: #person.id = #orders.customer_id\
\n TableScan: person projection=None\
\n TableScan: orders projection=None\
\n TableScan: lineitem projection=None";
Expand Down Expand Up @@ -3870,8 +3870,8 @@ mod tests {
fn cross_join_to_inner_join() {
let sql = "select person.id from person, orders, lineitem where person.id = lineitem.l_item_id and orders.o_item_id = lineitem.l_description;";
let expected = "Projection: #person.id\
\n Join: #lineitem.l_description = #orders.o_item_id\
\n Join: #person.id = #lineitem.l_item_id\
\n Inner Join: #lineitem.l_description = #orders.o_item_id\
\n Inner Join: #person.id = #lineitem.l_item_id\
\n TableScan: person projection=None\
\n TableScan: lineitem projection=None\
\n TableScan: orders projection=None";
Expand Down
6 changes: 3 additions & 3 deletions datafusion/tests/sql/explain_analyze.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,9 +616,9 @@ order by
Sort: #revenue DESC NULLS FIRST\
\n Projection: #customer.c_custkey, #customer.c_name, #SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount) AS revenue, #customer.c_acctbal, #nation.n_name, #customer.c_address, #customer.c_phone, #customer.c_comment\
\n Aggregate: groupBy=[[#customer.c_custkey, #customer.c_name, #customer.c_acctbal, #customer.c_phone, #nation.n_name, #customer.c_address, #customer.c_comment]], aggr=[[SUM(#lineitem.l_extendedprice * Int64(1) - #lineitem.l_discount)]]\
\n Join: #customer.c_nationkey = #nation.n_nationkey\
\n Join: #orders.o_orderkey = #lineitem.l_orderkey\
\n Join: #customer.c_custkey = #orders.o_custkey\
\n Inner Join: #customer.c_nationkey = #nation.n_nationkey\
\n Inner Join: #orders.o_orderkey = #lineitem.l_orderkey\
\n Inner Join: #customer.c_custkey = #orders.o_custkey\
\n TableScan: customer projection=Some([0, 1, 2, 3, 4, 5, 7])\
\n Filter: #orders.o_orderdate >= Date32(\"8674\") AND #orders.o_orderdate < Date32(\"8766\")\
\n TableScan: orders projection=Some([0, 1, 4]), filters=[#orders.o_orderdate >= Date32(\"8674\"), #orders.o_orderdate < Date32(\"8766\")]\
Expand Down

0 comments on commit 4774940

Please sign in to comment.