Skip to content

Commit b175f9a

Browse files
andygroveandygrove
authored
Make binary operator formatting consistent between logical and physical plans (#3331)
1 parent d7fa064 commit b175f9a

File tree

9 files changed

+383
-382
lines changed

9 files changed

+383
-382
lines changed

‎datafusion/core/src/execution/context.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,11 +1872,11 @@ mod tests {
18721872
.await?;
18731873

18741874
let expected = vec![
1875-
"+----------------------+------------------------+------------------------+",
1876-
"| @@version | @name | @integer Plus Int64(1) |",
1877-
"+----------------------+------------------------+------------------------+",
1878-
"| system-var-@@version | user-defined-var-@name | 42 |",
1879-
"+----------------------+------------------------+------------------------+",
1875+
"+----------------------+------------------------+---------------------+",
1876+
"| @@version | @name | @integer + Int64(1) |",
1877+
"+----------------------+------------------------+---------------------+",
1878+
"| system-var-@@version | user-defined-var-@name | 42 |",
1879+
"+----------------------+------------------------+---------------------+",
18801880
];
18811881
assert_batches_eq!(expected, &results);
18821882

‎datafusion/core/src/physical_plan/planner.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ fn create_physical_name(e: &Expr, is_first_expr: bool) -> Result<String> {
108108
Expr::BinaryExpr { left, op, right } => {
109109
let left = create_physical_name(left, false)?;
110110
let right = create_physical_name(right, false)?;
111-
Ok(format!("{} {:?} {}", left, op, right))
111+
Ok(format!("{} {} {}", left, op, right))
112112
}
113113
Expr::Case {
114114
expr,

‎datafusion/core/tests/sql/aggregates.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,11 +1815,11 @@ async fn aggregate_avg_add() -> Result<()> {
18151815
assert_eq!(results.len(), 1);
18161816

18171817
let expected = vec![
1818-
"+--------------+----------------------------+----------------------------+----------------------------+",
1819-
"| AVG(test.c1) | AVG(test.c1) Plus Int64(1) | AVG(test.c1) Plus Int64(2) | Int64(1) Plus AVG(test.c1) |",
1820-
"+--------------+----------------------------+----------------------------+----------------------------+",
1821-
"| 1.5 | 2.5 | 3.5 | 2.5 |",
1822-
"+--------------+----------------------------+----------------------------+----------------------------+",
1818+
"+--------------+-------------------------+-------------------------+-------------------------+",
1819+
"| AVG(test.c1) | AVG(test.c1) + Int64(1) | AVG(test.c1) + Int64(2) | Int64(1) + AVG(test.c1) |",
1820+
"+--------------+-------------------------+-------------------------+-------------------------+",
1821+
"| 1.5 | 2.5 | 3.5 | 2.5 |",
1822+
"+--------------+-------------------------+-------------------------+-------------------------+",
18231823
];
18241824
assert_batches_sorted_eq!(expected, &results);
18251825

‎datafusion/core/tests/sql/decimal.rs‎

Lines changed: 152 additions & 152 deletions
Large diffs are not rendered by default.

‎datafusion/core/tests/sql/expr.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -561,14 +561,14 @@ async fn query_scalar_minus_array() -> Result<()> {
561561
let sql = "SELECT 4 - c1 FROM test";
562562
let actual = execute_to_batches(&ctx, sql).await;
563563
let expected = vec![
564-
"+------------------------+",
565-
"| Int64(4) Minus test.c1 |",
566-
"+------------------------+",
567-
"| 4 |",
568-
"| 3 |",
569-
"| |",
570-
"| 1 |",
571-
"+------------------------+",
564+
"+--------------------+",
565+
"| Int64(4) - test.c1 |",
566+
"+--------------------+",
567+
"| 4 |",
568+
"| 3 |",
569+
"| |",
570+
"| 1 |",
571+
"+--------------------+",
572572
];
573573
assert_batches_eq!(expected, &actual);
574574
Ok(())

‎datafusion/core/tests/sql/functions.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ async fn coalesce_mul_with_default_value() -> Result<()> {
333333
let sql = "SELECT COALESCE(c1 * c2, 0) FROM test";
334334
let actual = execute_to_batches(&ctx, sql).await;
335335
let expected = vec![
336-
"+---------------------------------------------+",
337-
"| coalesce(test.c1 Multiply test.c2,Int64(0)) |",
338-
"+---------------------------------------------+",
339-
"| 2 |",
340-
"| 0 |",
341-
"| 0 |",
342-
"| 0 |",
343-
"+---------------------------------------------+",
336+
"+--------------------------------------+",
337+
"| coalesce(test.c1 * test.c2,Int64(0)) |",
338+
"+--------------------------------------+",
339+
"| 2 |",
340+
"| 0 |",
341+
"| 0 |",
342+
"| 0 |",
343+
"+--------------------------------------+",
344344
];
345345
assert_batches_eq!(expected, &actual);
346346
Ok(())

‎datafusion/core/tests/sql/select.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -478,14 +478,14 @@ async fn use_between_expression_in_select_query() -> Result<()> {
478478
let actual = execute_to_batches(&ctx, sql).await;
479479
// Expect field name to be correctly converted for expr, low and high.
480480
let expected = vec![
481-
"+--------------------------------------------------------------------+",
482-
"| abs(test.c1) BETWEEN Int64(0) AND log(test.c1 Multiply Int64(100)) |",
483-
"+--------------------------------------------------------------------+",
484-
"| true |",
485-
"| true |",
486-
"| false |",
487-
"| false |",
488-
"+--------------------------------------------------------------------+",
481+
"+-------------------------------------------------------------+",
482+
"| abs(test.c1) BETWEEN Int64(0) AND log(test.c1 * Int64(100)) |",
483+
"+-------------------------------------------------------------+",
484+
"| true |",
485+
"| true |",
486+
"| false |",
487+
"| false |",
488+
"+-------------------------------------------------------------+",
489489
];
490490
assert_batches_eq!(expected, &actual);
491491

@@ -1204,11 +1204,11 @@ async fn unprojected_filter() {
12041204
let results = df.collect().await.unwrap();
12051205

12061206
let expected = vec![
1207-
"+--------------------------+",
1208-
"| ?table?.i Plus ?table?.i |",
1209-
"+--------------------------+",
1210-
"| 6 |",
1211-
"+--------------------------+",
1207+
"+-----------------------+",
1208+
"| ?table?.i + ?table?.i |",
1209+
"+-----------------------+",
1210+
"| 6 |",
1211+
"+-----------------------+",
12121212
];
12131213
assert_batches_sorted_eq!(expected, &results);
12141214
}

0 commit comments

Comments
 (0)