Skip to content

Commit 6572ff5

Browse files
committed
update slts
1 parent e0867bf commit 6572ff5

13 files changed

Lines changed: 140 additions & 201 deletions

datafusion/sqllogictest/test_files/explain_tree.slt

Lines changed: 36 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -819,32 +819,20 @@ explain SELECT int_col, bigint_col, int_col+bigint_col AS sum_col FROM table1;
819819
----
820820
physical_plan
821821
01)┌───────────────────────────┐
822-
02)│ ProjectionExec
822+
02)│ RepartitionExec
823823
03)│ -------------------- │
824-
04)│ bigint_col:
825-
05)│ bigint_col
824+
04)│ partition_count(in->out):
825+
05)│ 1 -> 4
826826
06)│ │
827-
07)│ int_col: int_col │
828-
08)│ │
829-
09)│ sum_col: │
830-
10)│ CAST(int_col AS Int64) + │
831-
11)│ bigint_col │
832-
12)└─────────────┬─────────────┘
833-
13)┌─────────────┴─────────────┐
834-
14)│ RepartitionExec │
835-
15)│ -------------------- │
836-
16)│ partition_count(in->out): │
837-
17)│ 1 -> 4 │
838-
18)│ │
839-
19)│ partitioning_scheme: │
840-
20)│ RoundRobinBatch(4) │
841-
21)└─────────────┬─────────────┘
842-
22)┌─────────────┴─────────────┐
843-
23)│ DataSourceExec │
844-
24)│ -------------------- │
845-
25)│ files: 1 │
846-
26)│ format: csv │
847-
27)└───────────────────────────┘
827+
07)│ partitioning_scheme: │
828+
08)│ RoundRobinBatch(4) │
829+
09)└─────────────┬─────────────┘
830+
10)┌─────────────┴─────────────┐
831+
11)│ DataSourceExec │
832+
12)│ -------------------- │
833+
13)│ files: 1 │
834+
14)│ format: csv │
835+
15)└───────────────────────────┘
848836

849837
query TT
850838
explain select
@@ -965,31 +953,20 @@ explain SELECT int_col, bigint_col, int_col+bigint_col AS sum_col FROM table4;
965953
----
966954
physical_plan
967955
01)┌───────────────────────────┐
968-
02)│ ProjectionExec
956+
02)│ RepartitionExec
969957
03)│ -------------------- │
970-
04)│ bigint_col:
971-
05)│ bigint_col
958+
04)│ partition_count(in->out):
959+
05)│ 1 -> 4
972960
06)│ │
973-
07)│ int_col: int_col │
974-
08)│ │
975-
09)│ sum_col: │
976-
10)│ int_col + bigint_col │
977-
11)└─────────────┬─────────────┘
978-
12)┌─────────────┴─────────────┐
979-
13)│ RepartitionExec │
980-
14)│ -------------------- │
981-
15)│ partition_count(in->out): │
982-
16)│ 1 -> 4 │
983-
17)│ │
984-
18)│ partitioning_scheme: │
985-
19)│ RoundRobinBatch(4) │
986-
20)└─────────────┬─────────────┘
987-
21)┌─────────────┴─────────────┐
988-
22)│ DataSourceExec │
989-
23)│ -------------------- │
990-
24)│ files: 1 │
991-
25)│ format: json │
992-
26)└───────────────────────────┘
961+
07)│ partitioning_scheme: │
962+
08)│ RoundRobinBatch(4) │
963+
09)└─────────────┬─────────────┘
964+
10)┌─────────────┴─────────────┐
965+
11)│ DataSourceExec │
966+
12)│ -------------------- │
967+
13)│ files: 1 │
968+
14)│ format: json │
969+
15)└───────────────────────────┘
993970

994971

995972
# Query with projection on arrow
@@ -998,32 +975,20 @@ explain SELECT int_col, bigint_col, int_col+bigint_col AS sum_col FROM table5;
998975
----
999976
physical_plan
1000977
01)┌───────────────────────────┐
1001-
02)│ ProjectionExec
978+
02)│ RepartitionExec
1002979
03)│ -------------------- │
1003-
04)│ bigint_col:
1004-
05)│ bigint_col
980+
04)│ partition_count(in->out):
981+
05)│ 1 -> 4
1005982
06)│ │
1006-
07)│ int_col: int_col │
1007-
08)│ │
1008-
09)│ sum_col: │
1009-
10)│ CAST(int_col AS Int64) + │
1010-
11)│ bigint_col │
1011-
12)└─────────────┬─────────────┘
1012-
13)┌─────────────┴─────────────┐
1013-
14)│ RepartitionExec │
1014-
15)│ -------------------- │
1015-
16)│ partition_count(in->out): │
1016-
17)│ 1 -> 4 │
1017-
18)│ │
1018-
19)│ partitioning_scheme: │
1019-
20)│ RoundRobinBatch(4) │
1020-
21)└─────────────┬─────────────┘
1021-
22)┌─────────────┴─────────────┐
1022-
23)│ DataSourceExec │
1023-
24)│ -------------------- │
1024-
25)│ files: 1 │
1025-
26)│ format: arrow │
1026-
27)└───────────────────────────┘
983+
07)│ partitioning_scheme: │
984+
08)│ RoundRobinBatch(4) │
985+
09)└─────────────┬─────────────┘
986+
10)┌─────────────┴─────────────┐
987+
11)│ DataSourceExec │
988+
12)│ -------------------- │
989+
13)│ files: 1 │
990+
14)│ format: arrow │
991+
15)└───────────────────────────┘
1027992

1028993
# Query with PartialSortExec.
1029994
query TT

datafusion/sqllogictest/test_files/group_by.slt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4371,8 +4371,8 @@ logical_plan
43714371
03)----TableScan: unbounded_csv_with_timestamps2 projection=[name, ts]
43724372
physical_plan
43734373
01)SortPreservingMergeExec: [name@0 DESC, time_chunks@1 DESC], fetch=5
4374-
02)--ProjectionExec: expr=[name@0 as name, date_bin(IntervalMonthDayNano { months: 0, days: 0, nanoseconds: 900000000000 }, ts@1) as time_chunks]
4375-
03)----RepartitionExec: partitioning=RoundRobinBatch(8), input_partitions=1, maintains_sort_order=true
4374+
02)--RepartitionExec: partitioning=RoundRobinBatch(8), input_partitions=1, maintains_sort_order=true
4375+
03)----ProjectionExec: expr=[name@0 as name, date_bin(IntervalMonthDayNano { months: 0, days: 0, nanoseconds: 900000000000 }, ts@1) as time_chunks]
43764376
04)------StreamingTableExec: partition_sizes=1, projection=[name, ts], infinite_source=true, output_ordering=[name@0 DESC, ts@1 DESC]
43774377

43784378
statement ok

datafusion/sqllogictest/test_files/join.slt.part

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,8 +1177,8 @@ logical_plan
11771177
physical_plan
11781178
01)HashJoinExec: mode=CollectLeft, join_type=Inner, on=[(CAST(t1.v0 AS Float64)@6, v1@1)], filter=v1@1 + CAST(v0@0 AS Float64) > 0, projection=[v0@0, v1@1, v2@3, v3@4, v4@5, v0@7, v1@8]
11791179
02)--CoalescePartitionsExec
1180-
03)----ProjectionExec: expr=[v0@0 as v0, v1@1 as v1, v0@2 as v0, v2@3 as v2, v3@4 as v3, v4@5 as v4, CAST(v0@0 AS Float64) as CAST(t1.v0 AS Float64)]
1181-
04)------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
1180+
03)----RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
1181+
04)------ProjectionExec: expr=[v0@0 as v0, v1@1 as v1, v0@2 as v0, v2@3 as v2, v3@4 as v3, v4@5 as v4, CAST(v0@0 AS Float64) as CAST(t1.v0 AS Float64)]
11821182
05)--------HashJoinExec: mode=CollectLeft, join_type=Inner, on=[(v0@0, v0@0), (v1@1, v1@1)], projection=[v0@0, v1@1, v0@2, v2@4, v3@5, v4@6]
11831183
06)----------DataSourceExec: partitions=1, partition_sizes=[0]
11841184
07)----------DataSourceExec: partitions=1, partition_sizes=[0]
@@ -1375,8 +1375,8 @@ physical_plan
13751375
06)------HashJoinExec: mode=CollectLeft, join_type=Inner, on=[(CAST(f.a AS Int64)@1, col0@0)], projection=[a@0, col0@2, col1@3]
13761376
07)--------ProjectionExec: expr=[a@0 as a, CAST(a@0 AS Int64) as CAST(f.a AS Int64)]
13771377
08)----------DataSourceExec: partitions=1, partition_sizes=[1]
1378-
09)--------ProjectionExec: expr=[CAST(x@0 AS Int64) + 1 as col0, CAST(y@1 AS Int64) + 1 as col1]
1379-
10)----------RepartitionExec: partitioning=RoundRobinBatch(16), input_partitions=1
1378+
09)--------RepartitionExec: partitioning=RoundRobinBatch(16), input_partitions=1
1379+
10)----------ProjectionExec: expr=[CAST(x@0 AS Int64) + 1 as col0, CAST(y@1 AS Int64) + 1 as col1]
13801380
11)------------FilterExec: y@1 = x@0
13811381
12)--------------DataSourceExec: partitions=1, partition_sizes=[1]
13821382

datafusion/sqllogictest/test_files/join_is_not_distinct_from.slt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ physical_plan
143143
01)ProjectionExec: expr=[id@0 as t1_id, id@2 as t2_id, val@1 as val, val@3 as val]
144144
02)--HashJoinExec: mode=CollectLeft, join_type=Inner, on=[(t1.val + Int64(1)@2, t2.val + Int64(1)@2)], projection=[id@0, val@1, id@3, val@4], NullsEqual: true
145145
03)----CoalescePartitionsExec
146-
04)------ProjectionExec: expr=[id@0 as id, val@1 as val, CAST(val@1 AS Int64) + 1 as t1.val + Int64(1)]
147-
05)--------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
146+
04)------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
147+
05)--------ProjectionExec: expr=[id@0 as id, val@1 as val, CAST(val@1 AS Int64) + 1 as t1.val + Int64(1)]
148148
06)----------FilterExec: CAST(val@1 AS Int64) + 1 IS NOT DISTINCT FROM 11
149149
07)------------DataSourceExec: partitions=1, partition_sizes=[1]
150150
08)----ProjectionExec: expr=[id@0 as id, val@1 as val, CAST(val@1 AS Int64) + 1 as t2.val + Int64(1)]

0 commit comments

Comments
 (0)