Skip to content

Commit 2551c37

Browse files
authored
Merge branch 'main' into fast_sort_with_inlined_fast_key
2 parents e9cf5f9 + f4d1990 commit 2551c37

File tree

5 files changed

+66
-64
lines changed

5 files changed

+66
-64
lines changed

Cargo.lock

Lines changed: 48 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,20 +89,20 @@ ahash = { version = "0.8", default-features = false, features = [
8989
"runtime-rng",
9090
] }
9191
apache-avro = { version = "0.17", default-features = false }
92-
arrow = { version = "55.1.0", features = [
92+
arrow = { version = "55.2.0", features = [
9393
"prettyprint",
9494
"chrono-tz",
9595
] }
96-
arrow-buffer = { version = "55.0.0", default-features = false }
97-
arrow-flight = { version = "55.1.0", features = [
96+
arrow-buffer = { version = "55.2.0", default-features = false }
97+
arrow-flight = { version = "55.2.0", features = [
9898
"flight-sql-experimental",
9999
] }
100-
arrow-ipc = { version = "55.0.0", default-features = false, features = [
100+
arrow-ipc = { version = "55.2.0", default-features = false, features = [
101101
"lz4",
102102
"zstd",
103103
] }
104-
arrow-ord = { version = "55.0.0", default-features = false }
105-
arrow-schema = { version = "55.0.0", default-features = false }
104+
arrow-ord = { version = "55.2.0", default-features = false }
105+
arrow-schema = { version = "55.2.0", default-features = false }
106106
async-trait = "0.1.88"
107107
bigdecimal = "0.4.8"
108108
bytes = "1.10"
@@ -155,7 +155,7 @@ itertools = "0.14"
155155
log = "^0.4"
156156
object_store = { version = "0.12.2", default-features = false }
157157
parking_lot = "0.12"
158-
parquet = { version = "55.1.0", default-features = false, features = [
158+
parquet = { version = "55.2.0", default-features = false, features = [
159159
"arrow",
160160
"async",
161161
"object_store",

datafusion/sqllogictest/test_files/explain_tree.slt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ physical_plan
280280
06)┌─────────────┴─────────────┐
281281
07)│ DataSourceExec │
282282
08)│ -------------------- │
283-
09)│ bytes: 1072
283+
09)│ bytes: 1040
284284
10)│ format: memory │
285285
11)│ rows: 2 │
286286
12)└───────────────────────────┘
@@ -360,7 +360,7 @@ physical_plan
360360
21)┌─────────────┴─────────────┐┌─────────────┴─────────────┐
361361
22)│ DataSourceExec ││ ProjectionExec │
362362
23)│ -------------------- ││ -------------------- │
363-
24)│ bytes: 536 ││ date_col: date_col │
363+
24)│ bytes: 520 ││ date_col: date_col │
364364
25)│ format: memory ││ int_col: int_col │
365365
26)│ rows: 1 ││ │
366366
27)│ ││ string_col: │
@@ -655,7 +655,7 @@ physical_plan
655655
13)┌─────────────┴─────────────┐
656656
14)│ DataSourceExec │
657657
15)│ -------------------- │
658-
16)│ bytes: 536
658+
16)│ bytes: 520
659659
17)│ format: memory │
660660
18)│ rows: 1 │
661661
19)└───────────────────────────┘
@@ -1041,7 +1041,7 @@ physical_plan
10411041
13)┌─────────────┴─────────────┐
10421042
14)│ DataSourceExec │
10431043
15)│ -------------------- │
1044-
16)│ bytes: 536
1044+
16)│ bytes: 520
10451045
17)│ format: memory │
10461046
18)│ rows: 1 │
10471047
19)└───────────────────────────┘

datafusion/sqllogictest/test_files/repartition_scan.slt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ logical_plan
6161
physical_plan
6262
01)CoalesceBatchesExec: target_batch_size=8192
6363
02)--FilterExec: column1@0 != 42
64-
03)----DataSourceExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:0..137], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:137..274], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:274..411], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:411..547]]}, projection=[column1], file_type=parquet, predicate=column1@0 != 42, pruning_predicate=column1_null_count@2 != row_count@3 AND (column1_min@0 != 42 OR 42 != column1_max@1), required_guarantees=[column1 not in (42)]
64+
03)----DataSourceExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:0..141], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:141..282], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:282..423], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:423..563]]}, projection=[column1], file_type=parquet, predicate=column1@0 != 42, pruning_predicate=column1_null_count@2 != row_count@3 AND (column1_min@0 != 42 OR 42 != column1_max@1), required_guarantees=[column1 not in (42)]
6565

6666
# disable round robin repartitioning
6767
statement ok
@@ -77,7 +77,7 @@ logical_plan
7777
physical_plan
7878
01)CoalesceBatchesExec: target_batch_size=8192
7979
02)--FilterExec: column1@0 != 42
80-
03)----DataSourceExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:0..137], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:137..274], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:274..411], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:411..547]]}, projection=[column1], file_type=parquet, predicate=column1@0 != 42, pruning_predicate=column1_null_count@2 != row_count@3 AND (column1_min@0 != 42 OR 42 != column1_max@1), required_guarantees=[column1 not in (42)]
80+
03)----DataSourceExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:0..141], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:141..282], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:282..423], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:423..563]]}, projection=[column1], file_type=parquet, predicate=column1@0 != 42, pruning_predicate=column1_null_count@2 != row_count@3 AND (column1_min@0 != 42 OR 42 != column1_max@1), required_guarantees=[column1 not in (42)]
8181

8282
# enable round robin repartitioning again
8383
statement ok
@@ -102,7 +102,7 @@ physical_plan
102102
02)--SortExec: expr=[column1@0 ASC NULLS LAST], preserve_partitioning=[true]
103103
03)----CoalesceBatchesExec: target_batch_size=8192
104104
04)------FilterExec: column1@0 != 42
105-
05)--------DataSourceExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/1.parquet:0..272], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/1.parquet:272..538, WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:0..6], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:6..278], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:278..547]]}, projection=[column1], file_type=parquet, predicate=column1@0 != 42, pruning_predicate=column1_null_count@2 != row_count@3 AND (column1_min@0 != 42 OR 42 != column1_max@1), required_guarantees=[column1 not in (42)]
105+
05)--------DataSourceExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/1.parquet:0..280], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/1.parquet:280..554, WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:0..6], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:6..286], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:286..563]]}, projection=[column1], file_type=parquet, predicate=column1@0 != 42, pruning_predicate=column1_null_count@2 != row_count@3 AND (column1_min@0 != 42 OR 42 != column1_max@1), required_guarantees=[column1 not in (42)]
106106

107107

108108
## Read the files as though they are ordered
@@ -138,7 +138,7 @@ physical_plan
138138
01)SortPreservingMergeExec: [column1@0 ASC NULLS LAST]
139139
02)--CoalesceBatchesExec: target_batch_size=8192
140140
03)----FilterExec: column1@0 != 42
141-
04)------DataSourceExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/1.parquet:0..269], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:0..273], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:273..547], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/1.parquet:269..538]]}, projection=[column1], output_ordering=[column1@0 ASC NULLS LAST], file_type=parquet, predicate=column1@0 != 42, pruning_predicate=column1_null_count@2 != row_count@3 AND (column1_min@0 != 42 OR 42 != column1_max@1), required_guarantees=[column1 not in (42)]
141+
04)------DataSourceExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/1.parquet:0..277], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:0..281], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/2.parquet:281..563], [WORKSPACE_ROOT/datafusion/sqllogictest/test_files/scratch/repartition_scan/parquet_table/1.parquet:277..554]]}, projection=[column1], output_ordering=[column1@0 ASC NULLS LAST], file_type=parquet, predicate=column1@0 != 42, pruning_predicate=column1_null_count@2 != row_count@3 AND (column1_min@0 != 42 OR 42 != column1_max@1), required_guarantees=[column1 not in (42)]
142142

143143
# Cleanup
144144
statement ok

docs/source/library-user-guide/functions/adding-udfs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ types of UDFs.
3636

3737
## Adding a Scalar UDF
3838

39-
A Scalar UDF is a function that takes a row of data and returns a single value. In order for good performance
39+
A Scalar UDF is a function that takes a row of data and returns a single value. To achieve good performance,
4040
such functions are "vectorized" in DataFusion, meaning they get one or more Arrow Arrays as input and produce
4141
an Arrow Array with the same number of rows as output.
4242

@@ -48,8 +48,8 @@ To create a Scalar UDF, you
4848

4949
In the following example, we will add a function takes a single i64 and returns a single i64 with 1 added to it:
5050

51-
For brevity, we'll skipped some error handling, but e.g. you may want to check that `args.len()` is the expected number
52-
of arguments.
51+
For brevity, we'll skip some error handling.
52+
For production code, you may want to check, for example, that `args.len()` matches the expected number of arguments.
5353

5454
### Adding by `impl ScalarUDFImpl`
5555

0 commit comments

Comments
 (0)