Skip to content

Commit af13635

Browse files
committed
Adjust sqllogictests
1 parent f5d374b commit af13635

2 files changed

Lines changed: 20 additions & 18 deletions

File tree

datafusion/sqllogictest/test_files/array.slt

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6205,9 +6205,10 @@ physical_plan
62056205
03)----CoalescePartitionsExec
62066206
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
62076207
05)--------ProjectionExec: expr=[]
6208-
06)----------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6209-
07)------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6210-
08)--------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
6208+
06)----------CoalesceBatchesExec: target_batch_size=8192
6209+
07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6210+
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6211+
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
62116212

62126213
query I
62136214
with test AS (SELECT substr(md5(i::text)::text, 1, 32) as needle FROM generate_series(1, 100000) t(i))
@@ -6233,9 +6234,10 @@ physical_plan
62336234
03)----CoalescePartitionsExec
62346235
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
62356236
05)--------ProjectionExec: expr=[]
6236-
06)----------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6237-
07)------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6238-
08)--------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
6237+
06)----------CoalesceBatchesExec: target_batch_size=8192
6238+
07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6239+
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6240+
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
62396241

62406242
query I
62416243
with test AS (SELECT substr(md5(i::text)::text, 1, 32) as needle FROM generate_series(1, 100000) t(i))
@@ -6261,9 +6263,10 @@ physical_plan
62616263
03)----CoalescePartitionsExec
62626264
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
62636265
05)--------ProjectionExec: expr=[]
6264-
06)----------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6265-
07)------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6266-
08)--------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
6266+
06)----------CoalesceBatchesExec: target_batch_size=8192
6267+
07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6268+
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6269+
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
62676270

62686271
# FIXME: due to rewrite below not working, this is _extremely_ slow to evaluate
62696272
# query I
@@ -6291,9 +6294,10 @@ physical_plan
62916294
03)----CoalescePartitionsExec
62926295
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
62936296
05)--------ProjectionExec: expr=[]
6294-
06)----------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6295-
07)------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6296-
08)--------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
6297+
06)----------CoalesceBatchesExec: target_batch_size=8192
6298+
07)------------FilterExec: array_has([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c], substr(md5(CAST(value@0 AS Utf8View)), 1, 32))
6299+
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6300+
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
62976301

62986302
query I
62996303
with test AS (SELECT substr(md5(i::text)::text, 1, 32) as needle FROM generate_series(1, 100000) t(i))
@@ -6319,9 +6323,10 @@ physical_plan
63196323
03)----CoalescePartitionsExec
63206324
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
63216325
05)--------ProjectionExec: expr=[]
6322-
06)----------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6323-
07)------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6324-
08)--------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
6326+
06)----------CoalesceBatchesExec: target_batch_size=8192
6327+
07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8View)), 1, 32) IN (SET) ([7f4b18de3cfeb9b4ac78c381ee2ad278, a, b, c])
6328+
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
6329+
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
63256330

63266331
query I
63276332
with test AS (SELECT substr(md5(i::text)::text, 1, 32) as needle FROM generate_series(1, 100000) t(i))

datafusion/sqllogictest/test_files/joins.slt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5170,9 +5170,6 @@ DROP TABLE t2;
51705170
statement ok
51715171
set datafusion.explain.physical_plan_only = false;
51725172

5173-
statement ok
5174-
set datafusion.optimizer.enable_piecewise_merge_join = false;
5175-
51765173
# Test hash join with columns named c0, c1, c2
51775174
# These names match the internal naming pattern in inlist_builder.rs
51785175
# Regression test for https://github.com/apache/datafusion/pull/18393#discussion_r2601145291

0 commit comments

Comments
 (0)