Skip to content

Commit 37f75e9

Browse files
committed
Merge branch 'main' into integration-16801
2 parents a362bcf + d9e963e commit 37f75e9

File tree

26 files changed

+1566
-589
lines changed

26 files changed

+1566
-589
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ repository = "https://github.com/apache/datafusion"
7777
# Define Minimum Supported Rust Version (MSRV)
7878
rust-version = "1.85.1"
7979
# Define DataFusion version
80-
version = "48.0.0"
80+
version = "49.0.0"
8181

8282
[workspace.dependencies]
8383
# We turn off default-features for some dependencies here so the workspaces which inherit them can
@@ -99,7 +99,6 @@ arrow-flight = { version = "55.2.0", features = [
9999
] }
100100
arrow-ipc = { version = "55.2.0", default-features = false, features = [
101101
"lz4",
102-
"zstd",
103102
] }
104103
arrow-ord = { version = "55.2.0", default-features = false }
105104
arrow-schema = { version = "55.2.0", default-features = false }
@@ -110,41 +109,41 @@ chrono = { version = "0.4.41", default-features = false }
110109
criterion = "0.5.1"
111110
ctor = "0.4.0"
112111
dashmap = "6.0.1"
113-
datafusion = { path = "datafusion/core", version = "48.0.0", default-features = false }
114-
datafusion-catalog = { path = "datafusion/catalog", version = "48.0.0" }
115-
datafusion-catalog-listing = { path = "datafusion/catalog-listing", version = "48.0.0" }
116-
datafusion-common = { path = "datafusion/common", version = "48.0.0", default-features = false }
117-
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "48.0.0" }
118-
datafusion-datasource = { path = "datafusion/datasource", version = "48.0.0", default-features = false }
119-
datafusion-datasource-avro = { path = "datafusion/datasource-avro", version = "48.0.0", default-features = false }
120-
datafusion-datasource-csv = { path = "datafusion/datasource-csv", version = "48.0.0", default-features = false }
121-
datafusion-datasource-json = { path = "datafusion/datasource-json", version = "48.0.0", default-features = false }
122-
datafusion-datasource-parquet = { path = "datafusion/datasource-parquet", version = "48.0.0", default-features = false }
123-
datafusion-doc = { path = "datafusion/doc", version = "48.0.0" }
124-
datafusion-execution = { path = "datafusion/execution", version = "48.0.0" }
125-
datafusion-expr = { path = "datafusion/expr", version = "48.0.0" }
126-
datafusion-expr-common = { path = "datafusion/expr-common", version = "48.0.0" }
127-
datafusion-ffi = { path = "datafusion/ffi", version = "48.0.0" }
128-
datafusion-functions = { path = "datafusion/functions", version = "48.0.0" }
129-
datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "48.0.0" }
130-
datafusion-functions-aggregate-common = { path = "datafusion/functions-aggregate-common", version = "48.0.0" }
131-
datafusion-functions-nested = { path = "datafusion/functions-nested", version = "48.0.0" }
132-
datafusion-functions-table = { path = "datafusion/functions-table", version = "48.0.0" }
133-
datafusion-functions-window = { path = "datafusion/functions-window", version = "48.0.0" }
134-
datafusion-functions-window-common = { path = "datafusion/functions-window-common", version = "48.0.0" }
135-
datafusion-macros = { path = "datafusion/macros", version = "48.0.0" }
136-
datafusion-optimizer = { path = "datafusion/optimizer", version = "48.0.0", default-features = false }
137-
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "48.0.0", default-features = false }
138-
datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "48.0.0", default-features = false }
139-
datafusion-physical-optimizer = { path = "datafusion/physical-optimizer", version = "48.0.0" }
140-
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "48.0.0" }
141-
datafusion-proto = { path = "datafusion/proto", version = "48.0.0" }
142-
datafusion-proto-common = { path = "datafusion/proto-common", version = "48.0.0" }
143-
datafusion-pruning = { path = "datafusion/pruning", version = "48.0.0" }
144-
datafusion-session = { path = "datafusion/session", version = "48.0.0" }
145-
datafusion-spark = { path = "datafusion/spark", version = "48.0.0" }
146-
datafusion-sql = { path = "datafusion/sql", version = "48.0.0" }
147-
datafusion-substrait = { path = "datafusion/substrait", version = "48.0.0" }
112+
datafusion = { path = "datafusion/core", version = "49.0.0", default-features = false }
113+
datafusion-catalog = { path = "datafusion/catalog", version = "49.0.0" }
114+
datafusion-catalog-listing = { path = "datafusion/catalog-listing", version = "49.0.0" }
115+
datafusion-common = { path = "datafusion/common", version = "49.0.0", default-features = false }
116+
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "49.0.0" }
117+
datafusion-datasource = { path = "datafusion/datasource", version = "49.0.0", default-features = false }
118+
datafusion-datasource-avro = { path = "datafusion/datasource-avro", version = "49.0.0", default-features = false }
119+
datafusion-datasource-csv = { path = "datafusion/datasource-csv", version = "49.0.0", default-features = false }
120+
datafusion-datasource-json = { path = "datafusion/datasource-json", version = "49.0.0", default-features = false }
121+
datafusion-datasource-parquet = { path = "datafusion/datasource-parquet", version = "49.0.0", default-features = false }
122+
datafusion-doc = { path = "datafusion/doc", version = "49.0.0" }
123+
datafusion-execution = { path = "datafusion/execution", version = "49.0.0" }
124+
datafusion-expr = { path = "datafusion/expr", version = "49.0.0" }
125+
datafusion-expr-common = { path = "datafusion/expr-common", version = "49.0.0" }
126+
datafusion-ffi = { path = "datafusion/ffi", version = "49.0.0" }
127+
datafusion-functions = { path = "datafusion/functions", version = "49.0.0" }
128+
datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "49.0.0" }
129+
datafusion-functions-aggregate-common = { path = "datafusion/functions-aggregate-common", version = "49.0.0" }
130+
datafusion-functions-nested = { path = "datafusion/functions-nested", version = "49.0.0" }
131+
datafusion-functions-table = { path = "datafusion/functions-table", version = "49.0.0" }
132+
datafusion-functions-window = { path = "datafusion/functions-window", version = "49.0.0" }
133+
datafusion-functions-window-common = { path = "datafusion/functions-window-common", version = "49.0.0" }
134+
datafusion-macros = { path = "datafusion/macros", version = "49.0.0" }
135+
datafusion-optimizer = { path = "datafusion/optimizer", version = "49.0.0", default-features = false }
136+
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "49.0.0", default-features = false }
137+
datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "49.0.0", default-features = false }
138+
datafusion-physical-optimizer = { path = "datafusion/physical-optimizer", version = "49.0.0" }
139+
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "49.0.0" }
140+
datafusion-proto = { path = "datafusion/proto", version = "49.0.0" }
141+
datafusion-proto-common = { path = "datafusion/proto-common", version = "49.0.0" }
142+
datafusion-pruning = { path = "datafusion/pruning", version = "49.0.0" }
143+
datafusion-session = { path = "datafusion/session", version = "49.0.0" }
144+
datafusion-spark = { path = "datafusion/spark", version = "49.0.0" }
145+
datafusion-sql = { path = "datafusion/sql", version = "49.0.0" }
146+
datafusion-substrait = { path = "datafusion/substrait", version = "49.0.0" }
148147
doc-comment = "0.3"
149148
env_logger = "0.11"
150149
futures = "0.3"

datafusion-cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ backtrace = ["datafusion/backtrace"]
3737
[dependencies]
3838
arrow = { workspace = true }
3939
async-trait = { workspace = true }
40-
aws-config = "1.8.1"
41-
aws-credential-types = "1.2.0"
40+
aws-config = "1.8.2"
41+
aws-credential-types = "1.2.4"
4242
clap = { version = "4.5.41", features = ["derive", "cargo"] }
4343
datafusion = { workspace = true, features = [
4444
"avro",

datafusion-examples/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ cargo run --example dataframe
5050
- [`advanced_udf.rs`](examples/advanced_udf.rs): Define and invoke a more complicated User Defined Scalar Function (UDF)
5151
- [`advanced_udwf.rs`](examples/advanced_udwf.rs): Define and invoke a more complicated User Defined Window Function (UDWF)
5252
- [`advanced_parquet_index.rs`](examples/advanced_parquet_index.rs): Creates a detailed secondary index that covers the contents of several parquet files
53+
- [`async_udf.rs`](examples/async_udf.rs): Define and invoke an asynchronous User Defined Scalar Function (UDF)
5354
- [`analyzer_rule.rs`](examples/analyzer_rule.rs): Use a custom AnalyzerRule to change a query's semantics (row level access control)
5455
- [`catalog.rs`](examples/catalog.rs): Register the table into a custom catalog
5556
- [`composed_extension_codec`](examples/composed_extension_codec.rs): Example of using multiple extension codecs for serialization / deserialization

0 commit comments

Comments
 (0)