Skip to content

Commit 559bbee

Browse files
committed
Merge branch 'main' into feat/aggregate-udf-ffi
2 parents cbd4f7f + eeea69d commit 559bbee

File tree

294 files changed

+12424
-6556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+12424
-6556
lines changed

.asf.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ github:
5050
main:
5151
required_pull_request_reviews:
5252
required_approving_review_count: 1
53+
pull_requests:
54+
# enable updating head branches of pull requests
55+
allow_update_branch: true
5356

5457
# publishes the content of the `asf-site` branch to
5558
# https://datafusion.apache.org/

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ members = [
4848
"datafusion/proto-common",
4949
"datafusion/proto-common/gen",
5050
"datafusion/session",
51+
"datafusion/spark",
5152
"datafusion/sql",
5253
"datafusion/sqllogictest",
5354
"datafusion/substrait",
@@ -138,6 +139,7 @@ datafusion-physical-plan = { path = "datafusion/physical-plan", version = "47.0.
138139
datafusion-proto = { path = "datafusion/proto", version = "47.0.0" }
139140
datafusion-proto-common = { path = "datafusion/proto-common", version = "47.0.0" }
140141
datafusion-session = { path = "datafusion/session", version = "47.0.0" }
142+
datafusion-spark = { path = "datafusion/spark", version = "47.0.0" }
141143
datafusion-sql = { path = "datafusion/sql", version = "47.0.0" }
142144
doc-comment = "0.3"
143145
env_logger = "0.11"

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache DataFusion
2-
Copyright 2019-2024 The Apache Software Foundation
2+
Copyright 2019-2025 The Apache Software Foundation
33

44
This product includes software developed at
5-
The Apache Software Foundation (http://www.apache.org/).
5+
The Apache Software Foundation (http://www.apache.org/).

datafusion-cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ backtrace = ["datafusion/backtrace"]
3737
[dependencies]
3838
arrow = { workspace = true }
3939
async-trait = { workspace = true }
40-
aws-config = "1.6.1"
40+
aws-config = "1.6.2"
4141
aws-credential-types = "1.2.0"
42-
clap = { version = "4.5.36", features = ["derive", "cargo"] }
42+
clap = { version = "4.5.37", features = ["derive", "cargo"] }
4343
datafusion = { workspace = true, features = [
4444
"avro",
4545
"crypto_expressions",

0 commit comments

Comments
 (0)