Skip to content

Commit b6c6023

Browse files
author
Jiayu Liu
committed
fix partition by print
1 parent ecc10dc commit b6c6023

File tree

2 files changed

+31
-35
lines changed

2 files changed

+31
-35
lines changed

‎datafusion/src/logical_plan/plan.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -687,11 +687,7 @@ impl LogicalPlan {
687687
LogicalPlan::Window {
688688
ref window_expr, ..
689689
} => {
690-
write!(
691-
f,
692-
"WindowAggr: windowExpr=[{:?}] partitionBy=[]",
693-
window_expr
694-
)
690+
write!(f, "WindowAggr: windowExpr=[{:?}]", window_expr)
695691
}
696692
LogicalPlan::Aggregate {
697693
ref group_expr,

‎datafusion/src/sql/planner.rs

+30-30
Original file line numberDiff line numberDiff line change
@@ -2738,7 +2738,7 @@ mod tests {
27382738
let sql = "SELECT order_id, MAX(order_id) OVER () from orders";
27392739
let expected = "\
27402740
Projection: #order_id, #MAX(order_id)\
2741-
\n WindowAggr: windowExpr=[[MAX(#order_id)]] partitionBy=[]\
2741+
\n WindowAggr: windowExpr=[[MAX(#order_id)]]\
27422742
\n TableScan: orders projection=None";
27432743
quick_test(sql, expected);
27442744
}
@@ -2748,7 +2748,7 @@ mod tests {
27482748
let sql = "SELECT order_id oid, MAX(order_id) OVER () max_oid from orders";
27492749
let expected = "\
27502750
Projection: #order_id AS oid, #MAX(order_id) AS max_oid\
2751-
\n WindowAggr: windowExpr=[[MAX(#order_id)]] partitionBy=[]\
2751+
\n WindowAggr: windowExpr=[[MAX(#order_id)]]\
27522752
\n TableScan: orders projection=None";
27532753
quick_test(sql, expected);
27542754
}
@@ -2758,7 +2758,7 @@ mod tests {
27582758
let sql = "SELECT order_id, MAX(qty * 1.1) OVER () from orders";
27592759
let expected = "\
27602760
Projection: #order_id, #MAX(qty Multiply Float64(1.1))\
2761-
\n WindowAggr: windowExpr=[[MAX(#qty Multiply Float64(1.1))]] partitionBy=[]\
2761+
\n WindowAggr: windowExpr=[[MAX(#qty Multiply Float64(1.1))]]\
27622762
\n TableScan: orders projection=None";
27632763
quick_test(sql, expected);
27642764
}
@@ -2769,7 +2769,7 @@ mod tests {
27692769
"SELECT order_id, MAX(qty) OVER (), min(qty) over (), aVg(qty) OVER () from orders";
27702770
let expected = "\
27712771
Projection: #order_id, #MAX(qty), #MIN(qty), #AVG(qty)\
2772-
\n WindowAggr: windowExpr=[[MAX(#qty), MIN(#qty), AVG(#qty)]] partitionBy=[]\
2772+
\n WindowAggr: windowExpr=[[MAX(#qty), MIN(#qty), AVG(#qty)]]\
27732773
\n TableScan: orders projection=None";
27742774
quick_test(sql, expected);
27752775
}
@@ -2788,7 +2788,7 @@ mod tests {
27882788
let sql = "SELECT order_id, MAX(qty) OVER (PARTITION BY order_id) from orders";
27892789
let expected = "\
27902790
Projection: #order_id, #MAX(qty)\
2791-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2791+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
27922792
\n Sort: #order_id ASC NULLS FIRST\
27932793
\n TableScan: orders projection=None";
27942794
quick_test(sql, expected);
@@ -2811,9 +2811,9 @@ mod tests {
28112811
let sql = "SELECT order_id, MAX(qty) OVER (ORDER BY order_id), MIN(qty) OVER (ORDER BY order_id DESC) from orders";
28122812
let expected = "\
28132813
Projection: #order_id, #MAX(qty), #MIN(qty)\
2814-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2814+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
28152815
\n Sort: #order_id ASC NULLS FIRST\
2816-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
2816+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
28172817
\n Sort: #order_id DESC NULLS FIRST\
28182818
\n TableScan: orders projection=None";
28192819
quick_test(sql, expected);
@@ -2824,9 +2824,9 @@ mod tests {
28242824
let sql = "SELECT order_id, MAX(qty) OVER (ORDER BY order_id RANGE BETWEEN 3 PRECEDING and 3 FOLLOWING), MIN(qty) OVER (ORDER BY order_id DESC) from orders";
28252825
let expected = "\
28262826
Projection: #order_id, #MAX(qty), #MIN(qty)\
2827-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2827+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
28282828
\n Sort: #order_id ASC NULLS FIRST\
2829-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
2829+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
28302830
\n Sort: #order_id DESC NULLS FIRST\
28312831
\n TableScan: orders projection=None";
28322832
quick_test(sql, expected);
@@ -2837,9 +2837,9 @@ mod tests {
28372837
let sql = "SELECT order_id, MAX(qty) OVER (ORDER BY order_id RANGE 3 PRECEDING), MIN(qty) OVER (ORDER BY order_id DESC) from orders";
28382838
let expected = "\
28392839
Projection: #order_id, #MAX(qty), #MIN(qty)\
2840-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2840+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
28412841
\n Sort: #order_id ASC NULLS FIRST\
2842-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
2842+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
28432843
\n Sort: #order_id DESC NULLS FIRST\
28442844
\n TableScan: orders projection=None";
28452845
quick_test(sql, expected);
@@ -2850,9 +2850,9 @@ mod tests {
28502850
let sql = "SELECT order_id, MAX(qty) OVER (ORDER BY order_id GROUPS 3 PRECEDING), MIN(qty) OVER (ORDER BY order_id DESC) from orders";
28512851
let expected = "\
28522852
Projection: #order_id, #MAX(qty), #MIN(qty)\
2853-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2853+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
28542854
\n Sort: #order_id ASC NULLS FIRST\
2855-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
2855+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
28562856
\n Sort: #order_id DESC NULLS FIRST\
28572857
\n TableScan: orders projection=None";
28582858
quick_test(sql, expected);
@@ -2875,9 +2875,9 @@ mod tests {
28752875
let sql = "SELECT order_id, MAX(qty) OVER (ORDER BY order_id), MIN(qty) OVER (ORDER BY (order_id + 1)) from orders";
28762876
let expected = "\
28772877
Projection: #order_id, #MAX(qty), #MIN(qty)\
2878-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2878+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
28792879
\n Sort: #order_id ASC NULLS FIRST\
2880-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
2880+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
28812881
\n Sort: #order_id Plus Int64(1) ASC NULLS FIRST\
28822882
\n TableScan: orders projection=None";
28832883
quick_test(sql, expected);
@@ -2901,10 +2901,10 @@ mod tests {
29012901
let sql = "SELECT order_id, MAX(qty) OVER (ORDER BY qty, order_id), SUM(qty) OVER (), MIN(qty) OVER (ORDER BY order_id, qty) from orders";
29022902
let expected = "\
29032903
Projection: #order_id, #MAX(qty), #SUM(qty), #MIN(qty)\
2904-
\n WindowAggr: windowExpr=[[SUM(#qty)]] partitionBy=[]\
2905-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2904+
\n WindowAggr: windowExpr=[[SUM(#qty)]]\
2905+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
29062906
\n Sort: #qty ASC NULLS FIRST, #order_id ASC NULLS FIRST\
2907-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
2907+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
29082908
\n Sort: #order_id ASC NULLS FIRST, #qty ASC NULLS FIRST\
29092909
\n TableScan: orders projection=None";
29102910
quick_test(sql, expected);
@@ -2928,10 +2928,10 @@ mod tests {
29282928
let sql = "SELECT order_id, MAX(qty) OVER (ORDER BY order_id), SUM(qty) OVER (), MIN(qty) OVER (ORDER BY order_id, qty) from orders";
29292929
let expected = "\
29302930
Projection: #order_id, #MAX(qty), #SUM(qty), #MIN(qty)\
2931-
\n WindowAggr: windowExpr=[[SUM(#qty)]] partitionBy=[]\
2932-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2931+
\n WindowAggr: windowExpr=[[SUM(#qty)]]\
2932+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
29332933
\n Sort: #order_id ASC NULLS FIRST\
2934-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
2934+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
29352935
\n Sort: #order_id ASC NULLS FIRST, #qty ASC NULLS FIRST\
29362936
\n TableScan: orders projection=None";
29372937
quick_test(sql, expected);
@@ -2959,10 +2959,10 @@ mod tests {
29592959
let expected = "\
29602960
Sort: #order_id ASC NULLS FIRST\
29612961
\n Projection: #order_id, #MAX(qty), #SUM(qty), #MIN(qty)\
2962-
\n WindowAggr: windowExpr=[[SUM(#qty)]] partitionBy=[]\
2963-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2962+
\n WindowAggr: windowExpr=[[SUM(#qty)]]\
2963+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
29642964
\n Sort: #qty ASC NULLS FIRST, #order_id ASC NULLS FIRST\
2965-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
2965+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
29662966
\n Sort: #order_id ASC NULLS FIRST, #qty ASC NULLS FIRST\
29672967
\n TableScan: orders projection=None";
29682968
quick_test(sql, expected);
@@ -2983,7 +2983,7 @@ mod tests {
29832983
"SELECT order_id, MAX(qty) OVER (PARTITION BY order_id ORDER BY qty) from orders";
29842984
let expected = "\
29852985
Projection: #order_id, #MAX(qty)\
2986-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
2986+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
29872987
\n Sort: #order_id ASC NULLS FIRST, #qty ASC NULLS FIRST\
29882988
\n TableScan: orders projection=None";
29892989
quick_test(sql, expected);
@@ -3004,7 +3004,7 @@ mod tests {
30043004
"SELECT order_id, MAX(qty) OVER (PARTITION BY order_id, qty ORDER BY qty) from orders";
30053005
let expected = "\
30063006
Projection: #order_id, #MAX(qty)\
3007-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
3007+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
30083008
\n Sort: #order_id ASC NULLS FIRST, #qty ASC NULLS FIRST\
30093009
\n TableScan: orders projection=None";
30103010
quick_test(sql, expected);
@@ -3028,9 +3028,9 @@ mod tests {
30283028
"SELECT order_id, MAX(qty) OVER (PARTITION BY order_id, qty ORDER BY qty), MIN(qty) OVER (PARTITION BY qty ORDER BY order_id) from orders";
30293029
let expected = "\
30303030
Projection: #order_id, #MAX(qty), #MIN(qty)\
3031-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
3031+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
30323032
\n Sort: #order_id ASC NULLS FIRST, #qty ASC NULLS FIRST\
3033-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
3033+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
30343034
\n Sort: #qty ASC NULLS FIRST, #order_id ASC NULLS FIRST\
30353035
\n TableScan: orders projection=None";
30363036
quick_test(sql, expected);
@@ -3053,9 +3053,9 @@ mod tests {
30533053
"SELECT order_id, MAX(qty) OVER (PARTITION BY order_id ORDER BY qty), MIN(qty) OVER (PARTITION BY order_id, qty ORDER BY price) from orders";
30543054
let expected = "\
30553055
Projection: #order_id, #MAX(qty), #MIN(qty)\
3056-
\n WindowAggr: windowExpr=[[MAX(#qty)]] partitionBy=[]\
3056+
\n WindowAggr: windowExpr=[[MAX(#qty)]]\
30573057
\n Sort: #order_id ASC NULLS FIRST, #qty ASC NULLS FIRST\
3058-
\n WindowAggr: windowExpr=[[MIN(#qty)]] partitionBy=[]\
3058+
\n WindowAggr: windowExpr=[[MIN(#qty)]]\
30593059
\n Sort: #order_id ASC NULLS FIRST, #qty ASC NULLS FIRST, #price ASC NULLS FIRST\
30603060
\n TableScan: orders projection=None";
30613061
quick_test(sql, expected);

0 commit comments

Comments
 (0)