From f1732c82b0c7fa965a72898b0c3f6800e488d0a3 Mon Sep 17 00:00:00 2001 From: Marko Grujic Date: Thu, 15 Aug 2024 10:52:17 +0200 Subject: [PATCH 1/2] DataFusion 41 upgrade --- Cargo.lock | 217 +++++++++++------------ Cargo.toml | 42 ++--- datafusion_remote_tables/Cargo.toml | 2 +- datafusion_remote_tables/src/factory.rs | 5 +- datafusion_remote_tables/src/provider.rs | 4 +- src/catalog/metastore.rs | 2 +- src/config/context.rs | 7 +- src/context/logical.rs | 20 ++- src/datafusion/parser.rs | 1 + src/datafusion/utils.rs | 23 ++- src/frontend/flight/sync/utils.rs | 2 +- src/frontend/flight/sync/writer.rs | 13 +- src/frontend/http.rs | 10 +- src/provider.rs | 6 +- src/system_tables.rs | 5 +- tests/flight/e2e.rs | 4 +- tests/statements/query.rs | 4 +- 17 files changed, 187 insertions(+), 180 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c63db9ec..e47b65d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1507,7 +1507,7 @@ dependencies = [ [[package]] name = "connectorx" version = "0.3.4-alpha.2" -source = "git+https://github.com/splitgraph/connector-x?branch=datafusion-40-upgrade#c18d9107a4afa84fc6604b55ea379ea7bb621128" +source = "git+https://github.com/splitgraph/connector-x?branch=datafusion-41-upgrade#76e82fd1530f83d0429be2a180b115b25f98f666" dependencies = [ "anyhow", "arrow", @@ -1577,13 +1577,13 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convergence" version = "0.16.0" -source = "git+https://github.com/splitgraph/convergence?branch=datafusion-40-upgrade#e64074434fe5337782c37f9bade6117eb86a94a2" +source = "git+https://github.com/splitgraph/convergence?branch=datafusion-41-upgrade#b1332ba41b6c03b70c4912b353925dc8f30be97d" dependencies = [ "async-trait", "bytes", "chrono", "futures", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "thiserror", "tokio", "tokio-util", @@ -1592,7 +1592,7 @@ dependencies = [ [[package]] name = "convergence-arrow" version = "0.16.0" -source = "git+https://github.com/splitgraph/convergence?branch=datafusion-40-upgrade#e64074434fe5337782c37f9bade6117eb86a94a2" +source = "git+https://github.com/splitgraph/convergence?branch=datafusion-41-upgrade#b1332ba41b6c03b70c4912b353925dc8f30be97d" dependencies = [ "async-trait", "chrono", @@ -1905,8 +1905,9 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "datafusion" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash 0.8.11", "arrow", @@ -1919,16 +1920,18 @@ dependencies = [ "bzip2", "chrono", "dashmap 6.0.1", + "datafusion-catalog", "datafusion-common", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", - "datafusion-functions 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", - "datafusion-functions-aggregate 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", - "datafusion-functions-array 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-nested", "datafusion-optimizer", "datafusion-physical-expr", - "datafusion-physical-expr-common 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", + "datafusion-physical-expr-common", + "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-sql", "flate2", @@ -1946,7 +1949,7 @@ dependencies = [ "paste", "pin-project-lite", "rand", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "tempfile", "tokio", "tokio-util", @@ -1956,10 +1959,25 @@ dependencies = [ "zstd 0.13.2", ] +[[package]] +name = "datafusion-catalog" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + [[package]] name = "datafusion-common" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash 0.8.11", "arrow", @@ -1974,21 +1992,23 @@ dependencies = [ "num_cpus", "object_store", "parquet", - "sqlparser 0.47.0", + "sqlparser 0.49.0", ] [[package]] name = "datafusion-common-runtime" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" dependencies = [ "tokio", ] [[package]] name = "datafusion-execution" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ "arrow", "chrono", @@ -2007,8 +2027,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash 0.8.11", "arrow", @@ -2018,15 +2039,16 @@ dependencies = [ "datafusion-common", "paste", "serde_json", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "strum", "strum_macros", ] [[package]] name = "datafusion-functions" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +<<<<<<< HEAD checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" dependencies = [ "arrow", @@ -2049,8 +2071,12 @@ dependencies = [ name = "datafusion-functions" version = "40.0.0" source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +======= +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" +>>>>>>> d5113ab (DataFusion 41 upgrade) dependencies = [ "arrow", + "arrow-buffer", "base64 0.22.1", "blake2", "blake3", @@ -2072,9 +2098,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" dependencies = [ "ahash 0.8.11", "arrow", @@ -2082,34 +2108,17 @@ dependencies = [ "datafusion-common", "datafusion-execution", "datafusion-expr", - "datafusion-physical-expr-common 40.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "datafusion-physical-expr-common", "log", "paste", - "sqlparser 0.47.0", -] - -[[package]] -name = "datafusion-functions-aggregate" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" -dependencies = [ - "ahash 0.8.11", - "arrow", - "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-physical-expr-common 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", - "log", - "paste", - "sqlparser 0.47.0", + "sqlparser 0.49.0", ] [[package]] -name = "datafusion-functions-array" -version = "40.0.0" +name = "datafusion-functions-nested" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ "arrow", "arrow-array", @@ -2119,37 +2128,19 @@ dependencies = [ "datafusion-common", "datafusion-execution", "datafusion-expr", - "datafusion-functions 40.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "datafusion-functions-aggregate 40.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.12.1", - "log", - "paste", -] - -[[package]] -name = "datafusion-functions-array" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" -dependencies = [ - "arrow", - "arrow-array", - "arrow-buffer", - "arrow-ord", - "arrow-schema", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", - "datafusion-functions-aggregate 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", + "datafusion-functions", + "datafusion-functions-aggregate", "itertools 0.12.1", "log", "paste", + "rand 0.8.5", ] [[package]] name = "datafusion-optimizer" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ "arrow", "async-trait", @@ -2167,8 +2158,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash 0.8.11", "arrow", @@ -2182,7 +2174,7 @@ dependencies = [ "datafusion-common", "datafusion-execution", "datafusion-expr", - "datafusion-physical-expr-common 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", + "datafusion-physical-expr-common", "half", "hashbrown 0.14.5", "hex", @@ -2196,9 +2188,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" dependencies = [ "ahash 0.8.11", "arrow", @@ -2209,22 +2201,28 @@ dependencies = [ ] [[package]] -name = "datafusion-physical-expr-common" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +name = "datafusion-physical-optimizer" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" dependencies = [ - "ahash 0.8.11", - "arrow", "datafusion-common", +<<<<<<< HEAD "datafusion-expr", "hashbrown 0.14.5", "rand", +======= + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", +>>>>>>> d5113ab (DataFusion 41 upgrade) ] [[package]] name = "datafusion-physical-plan" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash 0.8.11", "arrow", @@ -2238,9 +2236,9 @@ dependencies = [ "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", - "datafusion-functions-aggregate 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", + "datafusion-functions-aggregate", "datafusion-physical-expr", - "datafusion-physical-expr-common 40.0.0 (git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765)", + "datafusion-physical-expr-common", "futures", "half", "hashbrown 0.14.5", @@ -2256,8 +2254,9 @@ dependencies = [ [[package]] name = "datafusion-proto" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1d25864c18178d0e51438648f5e0fa08417dbbc39b642c1752cbbb1013abf0" dependencies = [ "arrow", "chrono", @@ -2271,8 +2270,9 @@ dependencies = [ [[package]] name = "datafusion-proto-common" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a683253732334526b1cc5314a73a0f786803831f7e189ed3fe387ac50d7222" dependencies = [ "arrow", "chrono", @@ -2301,8 +2301,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ "arrow", "arrow-array", @@ -2311,7 +2312,7 @@ dependencies = [ "datafusion-expr", "log", "regex", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "strum", ] @@ -2344,9 +2345,9 @@ dependencies = [ [[package]] name = "delta_kernel" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f22db2e9d735475ffcb97bf00b80d693b3d6b87ea11786bc48a7785e503680" +checksum = "fa08a82239f51e6d3d249c38f0f5bf7c8a78b28587e1b466893c9eac84d252d8" dependencies = [ "arrow-arith", "arrow-array", @@ -2368,6 +2369,7 @@ dependencies = [ "rustc_version", "serde", "serde_json", + "strum", "thiserror", "tracing", "url", @@ -2378,9 +2380,9 @@ dependencies = [ [[package]] name = "delta_kernel_derive" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bdaeea7681865f265739cf1d071ed571a62deaf5b77a5eb6604bf303116164" +checksum = "6502fa0ba72fd1f782ccebba8f4c8b9a07c7591559e39d3d05b7ead94690a13f" dependencies = [ "proc-macro2", "quote", @@ -2389,16 +2391,16 @@ dependencies = [ [[package]] name = "deltalake" -version = "0.18.2" -source = "git+https://github.com/delta-io/delta-rs?rev=b8162c0fb967b3f3d9409d84f08605440dbad13b#b8162c0fb967b3f3d9409d84f08605440dbad13b" +version = "0.19.0" +source = "git+https://github.com/delta-io/delta-rs?rev=d3a796709a4bc9ee8a0fdc4ea16f8c607c0daf19#d3a796709a4bc9ee8a0fdc4ea16f8c607c0daf19" dependencies = [ "deltalake-core", ] [[package]] name = "deltalake-core" -version = "0.18.2" -source = "git+https://github.com/delta-io/delta-rs?rev=b8162c0fb967b3f3d9409d84f08605440dbad13b#b8162c0fb967b3f3d9409d84f08605440dbad13b" +version = "0.19.0" +source = "git+https://github.com/delta-io/delta-rs?rev=d3a796709a4bc9ee8a0fdc4ea16f8c607c0daf19#d3a796709a4bc9ee8a0fdc4ea16f8c607c0daf19" dependencies = [ "arrow", "arrow-arith", @@ -2419,8 +2421,8 @@ dependencies = [ "datafusion", "datafusion-common", "datafusion-expr", - "datafusion-functions 40.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "datafusion-functions-array 40.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "datafusion-functions", + "datafusion-functions-aggregate", "datafusion-physical-expr", "datafusion-proto", "datafusion-sql", @@ -5941,7 +5943,7 @@ dependencies = [ "serde_json", "serial_test", "sha2", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "sqlx", "strum", "strum_macros", @@ -6289,16 +6291,6 @@ dependencies = [ "log", ] -[[package]] -name = "sqlparser" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" -dependencies = [ - "log", - "sqlparser_derive", -] - [[package]] name = "sqlparser" version = "0.49.0" @@ -6306,6 +6298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", + "sqlparser_derive", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 00b872e8..8e556832 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,21 +2,21 @@ members = ["clade", "object_store_factory"] [workspace.dependencies] -arrow = { version = "52.1.0", features = ["test_utils"] } -arrow-buffer = "52.1.0" -arrow-csv = "52.1.0" -arrow-flight = "52.1.0" +arrow = { version = "52.2.0", features = ["test_utils"] } +arrow-buffer = "52.2.0" +arrow-csv = "52.2.0" +arrow-flight = "52.2.0" # For the JSON format support # https://github.com/apache/arrow-rs/pull/2868 # https://github.com/apache/arrow-rs/pull/2724 -arrow-integration-test = "52.1.0" -arrow-row = "52.1.0" -arrow-schema = "52.1.0" +arrow-integration-test = "52.2.0" +arrow-row = "52.2.0" +arrow-schema = "52.2.0" async-trait = "0.1.64" -datafusion = "40.0.0" -datafusion-common = "40.0.0" -datafusion-expr = "40.0.0" +datafusion = "41.0.0" +datafusion-common = "41.0.0" +datafusion-expr = "41.0.0" futures = "0.3" @@ -33,20 +33,6 @@ tracing-log = "0.2" tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] } url = "2.5" - - -[patch.crates-io] -# Pick up fix for https://github.com/apache/arrow-datafusion/pull/11386 and backport for https://github.com/apache/datafusion/pull/11765 -datafusion = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } -datafusion-common = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } -datafusion-execution = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } -datafusion-expr = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } -datafusion-optimizer = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } -datafusion-physical-expr = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } -datafusion-physical-plan = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } -datafusion-proto = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } -datafusion-sql = { git = "https://github.com/splitgraph/arrow-datafusion", branch = "backport-pr11765" } - [package] name = "seafowl" build = "build.rs" @@ -95,8 +81,8 @@ clap = { version = "3.2.19", features = [ "derive" ] } config = "0.14.0" # PG wire protocol support -convergence = { git = "https://github.com/splitgraph/convergence", branch = "datafusion-40-upgrade", optional = true } -convergence-arrow = { git = "https://github.com/splitgraph/convergence", branch = "datafusion-40-upgrade", optional = true } +convergence = { git = "https://github.com/splitgraph/convergence", branch = "datafusion-41-upgrade", optional = true } +convergence-arrow = { git = "https://github.com/splitgraph/convergence", branch = "datafusion-41-upgrade", optional = true } dashmap = "6.0.1" @@ -106,7 +92,7 @@ datafusion-expr = { workspace = true } datafusion-remote-tables = { path = "./datafusion_remote_tables", optional = true } -deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "b8162c0fb967b3f3d9409d84f08605440dbad13b", features = ["datafusion"] } +deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "d3a796709a4bc9ee8a0fdc4ea16f8c607c0daf19", features = ["datafusion"] } futures = "0.3" hex = ">=0.4.0" @@ -133,7 +119,7 @@ rustyline = "14.0" serde = { workspace = true } serde_json = { workspace = true } sha2 = ">=0.10.1" -sqlparser = { version = "0.47", features = ["visitor"] } +sqlparser = { version = "0.49", features = ["visitor"] } sqlx = { version = "0.7.1", features = [ "runtime-tokio-rustls", "sqlite", "any", "uuid" ] } strum = ">=0.24" strum_macros = ">=0.24" diff --git a/datafusion_remote_tables/Cargo.toml b/datafusion_remote_tables/Cargo.toml index 34e6053a..b99cfea5 100644 --- a/datafusion_remote_tables/Cargo.toml +++ b/datafusion_remote_tables/Cargo.toml @@ -19,7 +19,7 @@ arrow-schema = { workspace = true } async-trait = { workspace = true } # Remote query execution for a variety of DBs -connectorx = { git = "https://github.com/splitgraph/connector-x", branch = "datafusion-40-upgrade", features = [ "dst_arrow", "src_postgres", "src_mysql", "src_sqlite" ] } +connectorx = { git = "https://github.com/splitgraph/connector-x", branch = "datafusion-41-upgrade", features = [ "dst_arrow", "src_postgres", "src_mysql", "src_sqlite" ] } datafusion = { workspace = true } datafusion-common = { workspace = true } diff --git a/datafusion_remote_tables/src/factory.rs b/datafusion_remote_tables/src/factory.rs index a0d740a0..9662492d 100644 --- a/datafusion_remote_tables/src/factory.rs +++ b/datafusion_remote_tables/src/factory.rs @@ -1,10 +1,9 @@ use crate::provider::RemoteTable; use arrow_schema::SchemaRef; use async_trait::async_trait; -use datafusion::datasource::provider::TableProviderFactory; +use datafusion::catalog::{Session, TableProviderFactory}; use datafusion::datasource::TableProvider; use datafusion::error::{DataFusionError, Result}; -use datafusion::execution::context::SessionState; use datafusion_expr::CreateExternalTable; use std::ops::Deref; use std::sync::Arc; @@ -16,7 +15,7 @@ pub struct RemoteTableFactory {} impl TableProviderFactory for RemoteTableFactory { async fn create( &self, - _ctx: &SessionState, + _ctx: &dyn Session, cmd: &CreateExternalTable, ) -> Result> { let table = RemoteTable::new( diff --git a/datafusion_remote_tables/src/provider.rs b/datafusion_remote_tables/src/provider.rs index 092c6ce9..ec79ab12 100644 --- a/datafusion_remote_tables/src/provider.rs +++ b/datafusion_remote_tables/src/provider.rs @@ -5,10 +5,10 @@ use crate::filter_pushdown::{ use arrow::datatypes::SchemaRef; use async_trait::async_trait; use connectorx::prelude::{get_arrow, ArrowDestination, CXQuery, SourceConn, SourceType}; +use datafusion::catalog::Session; use datafusion::common::DataFusionError; use datafusion::datasource::TableProvider; use datafusion::error::Result; -use datafusion::execution::context::SessionState; use datafusion::physical_expr::expressions::{cast, col}; use datafusion::physical_expr::PhysicalExpr; use datafusion::physical_plan::memory::MemoryExec; @@ -119,7 +119,7 @@ impl TableProvider for RemoteTable { async fn scan( &self, - _ctx: &SessionState, + _ctx: &dyn Session, projection: Option<&Vec>, filters: &[Expr], limit: Option, diff --git a/src/catalog/metastore.rs b/src/catalog/metastore.rs index 6bc217d9..4059c7c7 100644 --- a/src/catalog/metastore.rs +++ b/src/catalog/metastore.rs @@ -15,7 +15,7 @@ use crate::wasm_udf::data_types::{ }; use clade::schema::{SchemaObject, TableObject}; use dashmap::DashMap; -use datafusion::catalog::schema::MemorySchemaProvider; +use datafusion::catalog_common::memory::MemorySchemaProvider; use datafusion::datasource::TableProvider; use crate::catalog::memory::MemoryStore; diff --git a/src/config/context.rs b/src/config/context.rs index 1ca28b4e..6e9d467f 100644 --- a/src/config/context.rs +++ b/src/config/context.rs @@ -11,6 +11,7 @@ use crate::{ use datafusion::execution::{ context::SessionState, memory_pool::{GreedyMemoryPool, MemoryPool, UnboundedMemoryPool}, + session_state::SessionStateBuilder, }; use datafusion::{ common::Result, @@ -96,7 +97,11 @@ pub fn build_state_with_table_factories( config: SessionConfig, runtime: Arc, ) -> SessionState { - let mut state = SessionState::new_with_config_rt(config, runtime); + let mut state = SessionStateBuilder::new() + .with_config(config) + .with_runtime_env(runtime) + .with_default_features() + .build(); state .table_factories_mut() diff --git a/src/context/logical.rs b/src/context/logical.rs index 1fb0649b..091c678f 100644 --- a/src/context/logical.rs +++ b/src/context/logical.rs @@ -25,8 +25,9 @@ use datafusion_expr::logical_plan::{Extension, LogicalPlan}; use deltalake::DeltaTable; use itertools::Itertools; use sqlparser::ast::{ - AlterTableOperation, CreateFunctionBody, Expr as SqlExpr, Expr, Insert, ObjectType, - Query, Statement, TableFactor, TableWithJoins, Value, VisitMut, + AlterTableOperation, CreateFunctionBody, CreateTable as CreateTableSql, + Expr as SqlExpr, Expr, Insert, ObjectType, Query, Statement, TableFactor, + TableWithJoins, Value, VisitMut, }; use std::sync::Arc; use tracing::debug; @@ -159,7 +160,7 @@ impl SeafowlContext { } Statement::Drop { object_type: ObjectType::Table | ObjectType::Schema, .. } => self.inner.state().statement_to_plan(stmt).await, // CREATE TABLE (create empty table with columns) - Statement::CreateTable { + Statement::CreateTable(CreateTableSql { query: None, name, columns, @@ -169,7 +170,7 @@ impl SeafowlContext { if_not_exists, or_replace: _, .. - } if constraints.is_empty() + }) if constraints.is_empty() && table_properties.is_empty() && with_options.is_empty() => { @@ -215,7 +216,8 @@ impl SeafowlContext { // Other CREATE TABLE: SqlToRel only allows CreateTableAs statements and makes // a CreateMemoryTable node. We're fine with that, but we'll execute it differently. - Statement::CreateTable { query: Some(ref mut input), .. } => { + Statement::CreateTable(CreateTableSql { query: Some(ref mut input), .. }) + => { let state = self.rewrite_time_travel_query(input).await?; state.statement_to_plan(stmt).await }, @@ -392,7 +394,7 @@ mod tests { .unwrap(); assert_eq!( - format!("{plan:?}"), + format!("{plan}"), "Dml: op=[Insert Into] table=[testcol.some_table]\ \n Projection: CAST(column1 AS Date32) AS date, CAST(column2 AS Float64) AS value\ \n Values: (Utf8(\"2022-01-01T12:00:00\"), Int64(42))" @@ -411,7 +413,7 @@ mod tests { .await .unwrap(); - assert_eq!(format!("{plan:?}"), "Dml: op=[Insert Into] table=[testcol.some_table]\ + assert_eq!(format!("{plan}"), "Dml: op=[Insert Into] table=[testcol.some_table]\ \n Projection: testdb.testcol.some_table.date AS date, testdb.testcol.some_table.value AS value\ \n TableScan: testdb.testcol.some_table projection=[date, value]"); } @@ -420,7 +422,7 @@ mod tests { let ctx = in_memory_context_with_test_db().await; let plan = ctx.create_logical_plan(query).await.unwrap(); - format!("{plan:?}") + format!("{plan}") } #[tokio::test] @@ -463,7 +465,7 @@ mod tests { .unwrap(); assert_eq!( - format!("{plan:?}"), + format!("{plan}"), "Dml: op=[Insert Into] table=[testcol.some_table]\ \n Projection: CAST(column1 AS Date32) AS date, CAST(column2 AS Float64) AS value\ \n Values: (Utf8(\"2022-01-01T12:00:00\"), Int64(42))" diff --git a/src/datafusion/parser.rs b/src/datafusion/parser.rs index 9e9ee31f..28f9d3ec 100644 --- a/src/datafusion/parser.rs +++ b/src/datafusion/parser.rs @@ -442,6 +442,7 @@ impl<'a> DFParser<'a> { expr, asc, nulls_first, + with_fill: None, }) } diff --git a/src/datafusion/utils.rs b/src/datafusion/utils.rs index a86ccf33..df2f3cf6 100644 --- a/src/datafusion/utils.rs +++ b/src/datafusion/utils.rs @@ -106,7 +106,7 @@ pub(crate) fn convert_simple_data_type(sql_type: &SQLDataType) -> Result Ok(DataType::Interval(IntervalUnit::MonthDayNano)), // Explicitly list all other types so that if sqlparser // adds/changes the `SQLDataType` the compiler will tell us on upgrade - // and avoid bugs like https://github.com/apache/arrow-datafusion/issues/3059 + // and avoid bugs like https://github.com/apache/datafusion/issues/3059 SQLDataType::Nvarchar(_) | SQLDataType::JSON | SQLDataType::Uuid @@ -140,6 +140,27 @@ pub(crate) fn convert_simple_data_type(sql_type: &SQLDataType) -> Result not_impl_err!( "Unsupported SQL type {sql_type:?}" ), diff --git a/src/frontend/flight/sync/utils.rs b/src/frontend/flight/sync/utils.rs index 1da29854..c9dcdf8a 100644 --- a/src/frontend/flight/sync/utils.rs +++ b/src/frontend/flight/sync/utils.rs @@ -4,7 +4,7 @@ use arrow::array::{new_null_array, Array, ArrayRef, RecordBatch, UInt64Array}; use arrow::compute::{concat_batches, take}; use arrow_row::{Row, RowConverter, SortField}; use clade::sync::ColumnRole; -use datafusion::physical_expr::expressions::{MaxAccumulator, MinAccumulator}; +use datafusion::functions_aggregate::min_max::{MaxAccumulator, MinAccumulator}; use datafusion_common::{DataFusionError, Result}; use datafusion_expr::{col, lit, Accumulator, Expr}; use std::collections::{HashMap, HashSet, VecDeque}; diff --git a/src/frontend/flight/sync/writer.rs b/src/frontend/flight/sync/writer.rs index 85814d1a..150d370e 100644 --- a/src/frontend/flight/sync/writer.rs +++ b/src/frontend/flight/sync/writer.rs @@ -2,6 +2,7 @@ use arrow::array::RecordBatch; use arrow_schema::{SchemaBuilder, SchemaRef}; use clade::sync::ColumnRole; use datafusion::datasource::{provider_as_source, TableProvider}; +use datafusion::execution::session_state::SessionStateBuilder; use datafusion::physical_expr::create_physical_expr; use datafusion::physical_optimizer::pruning::PruningPredicate; use datafusion::prelude::DataFrame; @@ -476,12 +477,10 @@ impl SeafowlDataSyncWriter { // Construct a state for physical planning; we omit all analyzer/optimizer rules to increase // the stack overflow threshold that occurs during recursive plan tree traversal in DF. - let state = self - .context - .inner - .state() + let state = SessionStateBuilder::new_from_existing(self.context.inner.state()) .with_analyzer_rules(vec![]) - .with_optimizer_rules(vec![]); + .with_optimizer_rules(vec![]) + .build(); let mut sync_df = DataFrame::new(state, base_plan); // Iterate through all syncs for this table and construct a full plan by applying each @@ -1265,7 +1264,7 @@ mod tests { .unwrap(); let expected = [ "+----------+--------------------+--------------------+", - "| count(*) | MIN(test_table.c1) | MAX(test_table.c1) |", + "| count(*) | min(test_table.c1) | max(test_table.c1) |", "+----------+--------------------+--------------------+", "| 1000 | 0 | 999 |", "+----------+--------------------+--------------------+", @@ -1319,7 +1318,7 @@ mod tests { .unwrap(); let expected = [ "+----------+--------------------+--------------------+", - "| count(*) | MIN(test_table.c1) | MAX(test_table.c1) |", + "| count(*) | min(test_table.c1) | max(test_table.c1) |", "+----------+--------------------+--------------------+", "| 1000 | 1000 | 1999 |", "+----------+--------------------+--------------------+", diff --git a/src/frontend/http.rs b/src/frontend/http.rs index 4a557e97..f5074c70 100644 --- a/src/frontend/http.rs +++ b/src/frontend/http.rs @@ -1002,7 +1002,9 @@ pub mod tests { assert_eq!(resp.status(), StatusCode::BAD_REQUEST); assert_eq!( resp.body(), - "SQL error: ParserError(\"Expected an SQL statement, found: 7\")" + &Bytes::from( + "SQL error: ParserError(\"Expected: an SQL statement, found: 7\")" + ), ); } @@ -1127,7 +1129,9 @@ pub mod tests { assert_eq!(resp.status(), StatusCode::BAD_REQUEST); assert_eq!( resp.body(), - "SQL error: ParserError(\"Expected an SQL statement, found: SLEECT\")" + &Bytes::from( + "SQL error: ParserError(\"Expected: an SQL statement, found: SLEECT\")" + ), ); } @@ -1149,7 +1153,7 @@ pub mod tests { assert_eq!(resp.status(), StatusCode::BAD_REQUEST); assert_eq!( resp.body(), - "SQL error: ParserError(\"Expected AS, found: EOF\")" + &Bytes::from("SQL error: ParserError(\"Expected: AS, found: EOF\")"), ); } diff --git a/src/provider.rs b/src/provider.rs index a5bdcf68..0abf4f4c 100644 --- a/src/provider.rs +++ b/src/provider.rs @@ -8,10 +8,8 @@ use datafusion::physical_expr::expressions::{case, cast, col}; use datafusion::physical_expr::{create_physical_expr, PhysicalExpr}; use datafusion::{ arrow::datatypes::Schema as ArrowSchema, - catalog::{ - schema::{MemorySchemaProvider, SchemaProvider}, - CatalogProvider, - }, + catalog::{CatalogProvider, SchemaProvider}, + catalog_common::memory::MemorySchemaProvider, common::{DataFusionError, Result}, datasource::TableProvider, }; diff --git a/src/system_tables.rs b/src/system_tables.rs index f78a9aaa..ffdb2a74 100644 --- a/src/system_tables.rs +++ b/src/system_tables.rs @@ -7,11 +7,10 @@ use arrow::array::{Int64Builder, StringBuilder, StructBuilder, TimestampSecondBu use arrow::datatypes::{DataType, Field, Schema, SchemaRef, TimeUnit}; use arrow::record_batch::RecordBatch; use async_trait::async_trait; -use datafusion::catalog::schema::SchemaProvider; +use datafusion::catalog::{SchemaProvider, Session}; use datafusion::common::DataFusionError; use datafusion::datasource::TableProvider; use datafusion::error::Result; -use datafusion::execution::context::SessionState; use datafusion::physical_plan::memory::MemoryExec; use datafusion::physical_plan::ExecutionPlan; use datafusion_expr::{Expr, TableType}; @@ -114,7 +113,7 @@ where // TODO: Investigate streaming from sqlx instead of loading all the results in memory async fn scan( &self, - _ctx: &SessionState, + _ctx: &dyn Session, projection: Option<&Vec>, _filters: &[Expr], _limit: Option, diff --git a/tests/flight/e2e.rs b/tests/flight/e2e.rs index 918103a1..33e09ec5 100644 --- a/tests/flight/e2e.rs +++ b/tests/flight/e2e.rs @@ -79,7 +79,7 @@ async fn test_interleaving_queries( let expected = [ "+----------------------+", - "| MIN(flight_table.c1) |", + "| min(flight_table.c1) |", "+----------------------+", "| 1 |", "+----------------------+", @@ -99,7 +99,7 @@ async fn test_interleaving_queries( let expected = [ "+----------------------+", - "| MAX(flight_table.c1) |", + "| max(flight_table.c1) |", "+----------------------+", "| 2 |", "+----------------------+", diff --git a/tests/statements/query.rs b/tests/statements/query.rs index da251f30..71180e96 100644 --- a/tests/statements/query.rs +++ b/tests/statements/query.rs @@ -95,7 +95,7 @@ async fn test_create_table_and_insert() { let expected = [ "+---------------------------+", - "| MAX(test_table.some_time) |", + "| max(test_table.some_time) |", "+---------------------------+", "| 2022-01-01T20:03:03 |", "+---------------------------+", @@ -110,7 +110,7 @@ async fn test_create_table_and_insert() { let results = context.collect(plan).await.unwrap(); let expected = ["+--------------------------------+--------------------------------------------+----------------------------+", - "| MAX(test_table.some_int_value) | count(DISTINCT test_table.some_bool_value) | MAX(test_table.some_value) |", + "| max(test_table.some_int_value) | count(DISTINCT test_table.some_bool_value) | max(test_table.some_value) |", "+--------------------------------+--------------------------------------------+----------------------------+", "| 3333 | 0 | 44.0 |", "+--------------------------------+--------------------------------------------+----------------------------+"]; From 0fa7d3e448dd103bb7d2548413e8f47ff50d6e51 Mon Sep 17 00:00:00 2001 From: Marko Grujic Date: Thu, 15 Aug 2024 13:02:59 +0200 Subject: [PATCH 2/2] Update the rest of the deps --- Cargo.lock | 415 ++++++++++++++++++++++++++--------------------------- 1 file changed, 202 insertions(+), 213 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e47b65d4..39004216 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -328,7 +328,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.2.6", + "indexmap 2.4.0", "lexical-core", "num", "serde", @@ -417,13 +417,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc65048dd435533bb1baf2ed9956b9a278fbfdcf90301b39ee117f06c0199d37" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" dependencies = [ "anstyle", "bstr", "doc-comment", + "libc", "predicates", "predicates-core", "predicates-tree", @@ -454,7 +455,7 @@ dependencies = [ "tokio", "xz2", "zstd 0.13.2", - "zstd-safe 7.2.0", + "zstd-safe 7.2.1", ] [[package]] @@ -487,7 +488,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -498,7 +499,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -544,9 +545,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-config" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf6cfe2881cb1fcbba9ae946fb9a6480d3b7a714ca84c74925014a89ef3387a" +checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" dependencies = [ "aws-credential-types", "aws-runtime", @@ -564,7 +565,6 @@ dependencies = [ "fastrand", "hex", "http 0.2.12", - "hyper 0.14.30", "ring", "time", "tokio", @@ -614,9 +614,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5f920ffd1e0526ec9e70e50bf444db50b204395a0fa7016bbf9e31ea1698f" +checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -629,6 +629,7 @@ dependencies = [ "fastrand", "http 0.2.12", "http-body 0.4.6", + "once_cell", "percent-encoding", "pin-project-lite", "tracing", @@ -637,9 +638,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acca681c53374bf1d9af0e317a41d12a44902ca0f2d1e10e5cb5bb98ed74f35" +checksum = "1074e818fbe4f9169242d78448b15be8916a79daa38ea1231f2e2e10d993fcd2" dependencies = [ "aws-credential-types", "aws-runtime", @@ -659,9 +660,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79c6bdfe612503a526059c05c9ccccbf6bd9530b003673cb863e547fd7c0c9a" +checksum = "29755c51e33fa3f678598f64324a169cf4b7d3c4865d2709d4308f53366a92a4" dependencies = [ "aws-credential-types", "aws-runtime", @@ -681,9 +682,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e6ecdb2bd756f3b2383e6f0588dc10a4e65f5d551e70a56e0bfe0c884673ce" +checksum = "6e52dc3fd7dfa6c01a69cf3903e00aa467261639138a05b06cd92314d2c8fb07" dependencies = [ "aws-credential-types", "aws-runtime", @@ -777,9 +778,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.2" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce87155eba55e11768b8c1afa607f3e864ae82f03caf63258b37455b0ad02537" +checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -804,9 +805,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30819352ed0a04ecf6a2f3477e344d2d1ba33d43e0f09ad9047c12e0d923616f" +checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -821,9 +822,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" +checksum = "f37570a4e8ce26bd3a69c7c011f13eee6b2a1135c4518cb57030f4257077ca36" dependencies = [ "base64-simd", "bytes", @@ -924,7 +925,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.36.2", + "object 0.36.3", "rustc-demangle", ] @@ -997,7 +998,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", ] @@ -1018,9 +1019,9 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", - "syn 2.0.72", + "syn 2.0.74", "which", ] @@ -1102,7 +1103,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "syn_derive", ] @@ -1189,7 +1190,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1200,9 +1201,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bytes-utils" @@ -1314,12 +1315,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -1457,9 +1459,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] @@ -1622,9 +1624,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpp_demangle" @@ -1637,9 +1639,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -1939,7 +1941,7 @@ dependencies = [ "glob", "half", "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.4.0", "itertools 0.12.1", "log", "num_cpus", @@ -2048,32 +2050,7 @@ dependencies = [ name = "datafusion-functions" version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -<<<<<<< HEAD -checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" -dependencies = [ - "arrow", - "base64 0.22.1", - "chrono", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "hashbrown 0.14.5", - "hex", - "itertools 0.12.1", - "log", - "rand", - "regex", - "unicode-segmentation", - "uuid 1.10.0", -] - -[[package]] -name = "datafusion-functions" -version = "40.0.0" -source = "git+https://github.com/splitgraph/arrow-datafusion?branch=backport-pr11765#16f8adc01fbd9a5d9500d2652d09b1605bbb5ada" -======= checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" ->>>>>>> d5113ab (DataFusion 41 upgrade) dependencies = [ "arrow", "arrow-buffer", @@ -2133,7 +2110,7 @@ dependencies = [ "itertools 0.12.1", "log", "paste", - "rand 0.8.5", + "rand", ] [[package]] @@ -2149,7 +2126,7 @@ dependencies = [ "datafusion-expr", "datafusion-physical-expr", "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.4.0", "itertools 0.12.1", "log", "paste", @@ -2178,7 +2155,7 @@ dependencies = [ "half", "hashbrown 0.14.5", "hex", - "indexmap 2.2.6", + "indexmap 2.4.0", "itertools 0.12.1", "log", "paste", @@ -2207,15 +2184,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" dependencies = [ "datafusion-common", -<<<<<<< HEAD - "datafusion-expr", - "hashbrown 0.14.5", - "rand", -======= "datafusion-execution", "datafusion-physical-expr", "datafusion-physical-plan", ->>>>>>> d5113ab (DataFusion 41 upgrade) ] [[package]] @@ -2242,7 +2213,7 @@ dependencies = [ "futures", "half", "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.4.0", "itertools 0.12.1", "log", "once_cell", @@ -2361,7 +2332,7 @@ dependencies = [ "delta_kernel_derive", "either", "fix-hidden-lifetime-bug", - "indexmap 2.2.6", + "indexmap 2.4.0", "itertools 0.13.0", "lazy_static", "parquet", @@ -2386,7 +2357,7 @@ checksum = "6502fa0ba72fd1f782ccebba8f4c8b9a07c7591559e39d3d05b7ead94690a13f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2432,7 +2403,7 @@ dependencies = [ "fix-hidden-lifetime-bug", "futures", "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.4.0", "itertools 0.13.0", "lazy_static", "libc", @@ -2489,7 +2460,7 @@ checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2619,7 +2590,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2739,18 +2710,18 @@ dependencies = [ [[package]] name = "fix-hidden-lifetime-bug" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40976db4d694ad47c9cdf86bd978cf4cfbe1c29469d5d1fc5b730a75e3d43a9b" +checksum = "ab7b4994e93dd63050356bdde7d417591d1b348523638dc1c1f539f16e338d55" dependencies = [ "fix-hidden-lifetime-bug-proc_macros", ] [[package]] name = "fix-hidden-lifetime-bug-proc_macros" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ab4fc77a21a7e7704c9ddbceaeb00ad8512b71b83738f3c0f17a0f44ee24a3" +checksum = "e8f0de9daf465d763422866d0538f07be1596e05623e120b37b4f715f5585200" dependencies = [ "proc-macro2", "quote", @@ -2775,9 +2746,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "libz-sys", @@ -2850,7 +2821,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2862,7 +2833,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2874,7 +2845,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2967,7 +2938,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -3068,7 +3039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator 0.3.0", - "indexmap 2.2.6", + "indexmap 2.4.0", "stable_deref_trait", ] @@ -3109,7 +3080,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.4.0", "slab", "tokio", "tokio-util", @@ -3128,7 +3099,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.4.0", "slab", "tokio", "tokio-util", @@ -3451,9 +3422,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -3520,9 +3491,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3651,9 +3622,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -3820,9 +3791,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" dependencies = [ "cc", "libc", @@ -3978,7 +3949,7 @@ dependencies = [ "hyper 1.4.1", "hyper-rustls 0.27.2", "hyper-util", - "indexmap 2.2.6", + "indexmap 2.4.0", "ipnet", "metrics", "metrics-util", @@ -4023,7 +3994,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4059,9 +4030,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", @@ -4378,15 +4349,15 @@ checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.4.0", "memchr", ] [[package]] name = "object" -version = "0.36.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -4412,7 +4383,7 @@ dependencies = [ "rand", "reqwest 0.12.5", "ring", - "rustls-pemfile 2.1.2", + "rustls-pemfile 2.1.3", "serde", "serde_json", "snafu", @@ -4468,7 +4439,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4692,7 +4663,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4713,7 +4684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.4.0", ] [[package]] @@ -4771,7 +4742,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4900,12 +4871,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2288c0e17cc8d342c712bb43a257a80ebffce59cdb33d5000d8348f3ec02528b" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ "zerocopy", - "zerocopy-derive", ] [[package]] @@ -4942,7 +4912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5014,7 +4984,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.72", + "syn 2.0.74", "tempfile", ] @@ -5028,7 +4998,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5096,16 +5066,17 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 2.0.0", "rustls 0.23.12", + "socket2 0.5.7", "thiserror", "tokio", "tracing", @@ -5113,14 +5084,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand", "ring", - "rustc-hash", + "rustc-hash 2.0.0", "rustls 0.23.12", "slab", "thiserror", @@ -5137,6 +5108,7 @@ dependencies = [ "libc", "once_cell", "socket2 0.5.7", + "tracing", "windows-sys 0.52.0", ] @@ -5303,16 +5275,16 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -5442,7 +5414,7 @@ dependencies = [ "quinn", "rustls 0.23.12", "rustls-native-certs 0.7.1", - "rustls-pemfile 2.1.2", + "rustls-pemfile 2.1.3", "rustls-pki-types", "serde", "serde_json", @@ -5582,9 +5554,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936" dependencies = [ "futures", "futures-timer", @@ -5594,9 +5566,9 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" +checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42" dependencies = [ "cfg-if", "glob", @@ -5606,7 +5578,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.72", + "syn 2.0.74", "unicode-ident", ] @@ -5674,6 +5646,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -5745,7 +5723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.2", + "rustls-pemfile 2.1.3", "rustls-pki-types", "schannel", "security-framework", @@ -5762,9 +5740,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -5772,9 +5750,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -5921,7 +5899,7 @@ dependencies = [ "deltalake", "futures", "hex", - "indexmap 2.2.6", + "indexmap 2.4.0", "itertools 0.13.0", "lazy_static", "metrics", @@ -6010,9 +5988,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" dependencies = [ "serde_derive", ] @@ -6028,20 +6006,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.121" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", "memchr", @@ -6092,7 +6070,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -6309,7 +6287,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -6346,7 +6324,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.2.6", + "indexmap 2.4.0", "log", "memchr", "once_cell", @@ -6561,7 +6539,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -6593,9 +6571,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -6611,7 +6589,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -6697,14 +6675,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6745,7 +6724,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -6877,7 +6856,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7021,7 +7000,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.4.0", "toml_datetime", "winnow 0.5.40", ] @@ -7032,7 +7011,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", @@ -7076,7 +7055,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7114,15 +7093,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -7144,7 +7123,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7403,13 +7382,13 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "visibility" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3fd98999db9227cf28e59d83e1f120f42bc233d4b152e8fab9bc87d5bb1e0f8" +checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7532,34 +7511,35 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -7569,9 +7549,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7579,22 +7559,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-encoder" @@ -7607,9 +7587,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.214.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff694f02a8d7a50b6922b197ae03883fbf18cdb2ae9fbee7b6148456f5f44041" +checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" dependencies = [ "leb128", ] @@ -7633,7 +7613,7 @@ version = "0.118.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77f1154f1ab868e2a01d9834a805faca7bf8b50d041b4ca714d005d0dab1c50c" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.4.0", "semver", ] @@ -7644,7 +7624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.6.0", - "indexmap 2.2.6", + "indexmap 2.4.0", "semver", ] @@ -7671,7 +7651,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", - "indexmap 2.2.6", + "indexmap 2.4.0", "libc", "log", "object 0.32.2", @@ -7735,7 +7715,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -7797,7 +7777,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli 0.28.1", - "indexmap 2.2.6", + "indexmap 2.4.0", "log", "object 0.32.2", "serde", @@ -7886,7 +7866,7 @@ dependencies = [ "cc", "cfg-if", "encoding_rs", - "indexmap 2.2.6", + "indexmap 2.4.0", "libc", "log", "mach", @@ -7927,7 +7907,7 @@ checksum = "e04682ce587aa8fa9311d3c95148381f08a1db274ad6bcd3553f7c97c8c2debb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7990,7 +7970,7 @@ checksum = "af5fbb1adaadad70271fe18a3f938741edb2b5178bf2fc164ab20544018626b8" dependencies = [ "anyhow", "heck 0.4.1", - "indexmap 2.2.6", + "indexmap 2.4.0", "wit-parser", ] @@ -8011,31 +7991,31 @@ dependencies = [ [[package]] name = "wast" -version = "214.0.0" +version = "215.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694bcdb24c49c8709bd8713768b71301a11e823923eee355d530f1d8d0a7f8e9" +checksum = "1ff1d00d893593249e60720be04a7c1f42f1c4dc3806a2869f4e66ab61eb54cb" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.214.0", + "wasm-encoder 0.215.0", ] [[package]] name = "wat" -version = "1.214.0" +version = "1.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347249eb56773fa728df2656cfe3a8c19437ded61a922a0b5e0839d9790e278e" +checksum = "670bf4d9c8cf76ae242d70ded47c546525b6dafaa6871f9bcb065344bf2b4e3d" dependencies = [ - "wast 214.0.0", + "wast 215.0.0", ] [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -8096,7 +8076,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn 2.0.72", + "syn 2.0.74", "witx", ] @@ -8108,7 +8088,7 @@ checksum = "4a781d29bfd788595f4a392a6f606699e59577b7f4b2858da2ae4068f4d757c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "wiggle-generate", ] @@ -8130,11 +8110,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8186,6 +8166,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -8387,7 +8376,7 @@ checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" dependencies = [ "anyhow", "id-arena", - "indexmap 2.2.6", + "indexmap 2.4.0", "log", "semver", "serde", @@ -8465,7 +8454,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -8485,7 +8474,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -8503,7 +8492,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 7.2.0", + "zstd-safe 7.2.1", ] [[package]] @@ -8518,9 +8507,9 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ]