diff --git a/Cargo.lock b/Cargo.lock index a18b1b159..2e8a3eaff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2084,7 +2084,7 @@ version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ - "strum 0.26.2", + "strum 0.26.3", "strum_macros 0.26.4", "unicode-width", ] @@ -2555,6 +2555,20 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "dashmap" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "data-encoding" version = "2.5.0" @@ -2588,7 +2602,7 @@ dependencies = [ "bytes", "bzip2", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion-common", "datafusion-execution", "datafusion-expr", @@ -2653,7 +2667,7 @@ checksum = "3f9c93043081487e335399a21ebf8295626367a647ac5cb87d41d18afad7d0f7" dependencies = [ "arrow", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion-common", "datafusion-expr", "futures", @@ -2678,7 +2692,7 @@ dependencies = [ "datafusion-common", "paste", "sqlparser 0.43.1", - "strum 0.26.2", + "strum 0.26.3", "strum_macros 0.26.4", ] @@ -3029,7 +3043,7 @@ dependencies = [ "bytes", "cfg-if", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion", "datafusion-common", "datafusion-expr", @@ -4618,7 +4632,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion", "datafusion-physical-expr", "futures", @@ -5317,7 +5331,7 @@ dependencies = [ "async-trait", "bytes", "catalog", - "dashmap", + "dashmap 6.0.1", "datafusion", "futures", "ioutil", @@ -5615,9 +5629,9 @@ dependencies = [ [[package]] name = "napi" -version = "2.16.6" +version = "2.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc300228808a0e6aea5a58115c82889240bcf8dab16fc25ad675b33e454b368" +checksum = "a1bd081bbaef43600fd2c5dd4c525b8ecea7dfdacf40ebc674e87851dce6559e" dependencies = [ "bitflags 2.5.0", "chrono", @@ -5639,9 +5653,9 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" [[package]] name = "napi-derive" -version = "2.16.5" +version = "2.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e034ddf6155192cf83f267ede763fe6c164dfa9971585436b16173718d94c4" +checksum = "70a8a778fd367b13c64232e58632514b795514ece491ce136d96e976d34a3eb8" dependencies = [ "cfg-if", "convert_case 0.6.0", @@ -5653,9 +5667,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff2c00437f3b3266391eb5e6aa25d0029187daf5caf05b8e3271468fb5ae73e" +checksum = "35849e64596ecd467e1ac897153364a1ffd09b1d79b32ebad94ef8980ac73311" dependencies = [ "convert_case 0.6.0", "once_cell", @@ -6579,7 +6593,7 @@ dependencies = [ "serde_json", "sqlformat", "sqlparser 0.47.0", - "strum 0.26.2", + "strum 0.26.3", "strum_macros 0.26.4", ] @@ -6594,7 +6608,7 @@ dependencies = [ "semver 1.0.23", "serde", "stacker", - "strum 0.26.2", + "strum 0.26.3", ] [[package]] @@ -6902,7 +6916,7 @@ dependencies = [ "nu-ansi-term 0.50.0", "serde", "strip-ansi-escapes", - "strum 0.26.2", + "strum 0.26.3", "strum_macros 0.26.4", "thiserror", "unicode-segmentation", @@ -7202,7 +7216,7 @@ dependencies = [ "async-trait", "base64 0.22.1", "bytes", - "dashmap", + "dashmap 6.0.1", "datafusion", "datafusion-proto", "datafusion_ext", @@ -7622,7 +7636,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dashmap", + "dashmap 5.5.3", "futures", "hashbrown 0.14.3", "histogram", @@ -7810,9 +7824,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "indexmap 2.2.6", "itoa", @@ -8225,7 +8239,7 @@ dependencies = [ "protogen", "reqwest 0.12.4", "siphasher 1.0.1", - "strum 0.26.2", + "strum 0.26.3", "telemetry", "tempfile", "thiserror", @@ -8242,7 +8256,7 @@ dependencies = [ "async-trait", "bytes", "catalog", - "dashmap", + "dashmap 6.0.1", "datafusion", "datafusion-proto", "datafusion_ext", @@ -8291,9 +8305,9 @@ dependencies = [ [[package]] name = "sqllogictest" -version = "0.20.4" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f20de090b0fde4dcd53b330e7ad2772140304eb34f5e9a99c8963fc4c052f149" +checksum = "ff40a700928567c7303adc6f86cd17bfade5fa8c7dce1256f4691eca66e3ca42" dependencies = [ "async-trait", "educe", @@ -8464,9 +8478,9 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros 0.26.4", ] @@ -9449,9 +9463,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", "rand", @@ -9461,9 +9475,9 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" +checksum = "a3ff64d5cde1e2cb5268bdb497235b6bd255ba8244f910dbc3574e59593de68c" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 13145caf9..596981adb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ prost = "0.12" prost-build = "0.12" prost-types = "0.12" rustls = "0.23.10" -serde_json = "1.0.117" +serde_json = "1.0.118" tempfile = "3.10.1" thiserror = "1.0" tracing = "0.1" diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml index 15547abb2..43f017976 100644 --- a/bindings/nodejs/Cargo.toml +++ b/bindings/nodejs/Cargo.toml @@ -19,8 +19,8 @@ thiserror = { workspace = true } url = { workspace = true } async-trait = { workspace = true } lzma-sys = { version = "*", features = ["static"] } # Prevent dynamic linking of lzma, which comes from datafusion -napi = { version = "2.16.6", default-features = false, features = ["full"] } -napi-derive = "2.16.5" +napi = { version = "2.16.8", default-features = false, features = ["full"] } +napi-derive = "2.16.6" once_cell = "1.19.0" async-once-cell = "0.5.3" diff --git a/crates/catalog/Cargo.toml b/crates/catalog/Cargo.toml index b3adac727..b90b6350d 100644 --- a/crates/catalog/Cargo.toml +++ b/crates/catalog/Cargo.toml @@ -22,5 +22,5 @@ thiserror.workspace = true tokio = { workspace = true } tonic = { workspace = true } tracing = { workspace = true } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 097fb9e52..c7a553400 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -50,7 +50,7 @@ nu-ansi-term = "0.50.0" atty = "0.2.14" console-subscriber = "0.3.0" tokio-postgres = "0.7.8" -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } glob = "0.3.1" lzma-sys = { version = "*", features = ["static"] } # Prevent dynamic linking of lzma, which comes from datafusion diff --git a/crates/datafusion_ext/Cargo.toml b/crates/datafusion_ext/Cargo.toml index ea290ae6f..8a6339d97 100644 --- a/crates/datafusion_ext/Cargo.toml +++ b/crates/datafusion_ext/Cargo.toml @@ -26,7 +26,7 @@ object_store = { workspace = true } tracing = { workspace = true } thiserror.workspace = true futures = { workspace = true } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } async-recursion = "1.1.1" regex = "1.10" once_cell = "1.19.0" diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index 2dae07b04..b6cc2564f 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -57,7 +57,7 @@ serde_with = "3.8.1" tokio-postgres-rustls = "0.12.0" tokio-rustls = "0.26.0" tokio-util = "0.7.11" -uuid = "1.8.0" +uuid = "1.9.1" webpki-roots = "0.26.3" calamine = { version = "0.25.0", features = ["dates"] } klickhouse = { version = "0.13.0", features = ["tls"] } diff --git a/crates/metastore/Cargo.toml b/crates/metastore/Cargo.toml index f69a9cbe9..0e303bdcd 100644 --- a/crates/metastore/Cargo.toml +++ b/crates/metastore/Cargo.toml @@ -28,9 +28,9 @@ thiserror = { workspace = true } tokio = { workspace = true } tonic = { workspace = true } tracing = { workspace = true } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } bytes = { workspace = true } once_cell = "1.19.0" tower = "0.4" -dashmap = "5.5.0" +dashmap = "6.0.1" catalog = { path = "../catalog" } diff --git a/crates/object_store_util/Cargo.toml b/crates/object_store_util/Cargo.toml index f707fbd7d..d523dfb5c 100644 --- a/crates/object_store_util/Cargo.toml +++ b/crates/object_store_util/Cargo.toml @@ -22,4 +22,4 @@ tokio = { workspace = true } tempfile = "3" bytes = { workspace = true } moka = { version = "0.12.5", features = ["future"] } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } diff --git a/crates/pgsrv/Cargo.toml b/crates/pgsrv/Cargo.toml index 90ad83208..bdd3d6d40 100644 --- a/crates/pgsrv/Cargo.toml +++ b/crates/pgsrv/Cargo.toml @@ -31,7 +31,7 @@ rustls-pemfile = "2.1.2" tokio-postgres = "0.7.8" tokio-rustls = "0.26.0" tokio-util = { version = "0.7.11", features = ["codec"] } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } webpki-roots = "0.26.3" [dev-dependencies] diff --git a/crates/protogen/Cargo.toml b/crates/protogen/Cargo.toml index 1a58ac10a..57b4db337 100644 --- a/crates/protogen/Cargo.toml +++ b/crates/protogen/Cargo.toml @@ -18,7 +18,7 @@ thiserror.workspace = true tonic = { workspace = true } prost = { workspace = true } prost-types = { workspace = true } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } tracing = { workspace = true } serde_json = { workspace = true } serde = { workspace = true } diff --git a/crates/proxyutil/Cargo.toml b/crates/proxyutil/Cargo.toml index 6b4e71ddf..bd516e9ab 100644 --- a/crates/proxyutil/Cargo.toml +++ b/crates/proxyutil/Cargo.toml @@ -18,4 +18,4 @@ futures = { workspace = true } reqwest = { workspace = true } async-trait = { workspace = true } serde_json = { workspace = true } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } diff --git a/crates/rpcsrv/Cargo.toml b/crates/rpcsrv/Cargo.toml index d4231c2ca..a3ef418aa 100644 --- a/crates/rpcsrv/Cargo.toml +++ b/crates/rpcsrv/Cargo.toml @@ -31,6 +31,6 @@ telemetry = { path = "../telemetry" } base64 = "0.22.1" bytes = "1.6" -dashmap = "5.5.0" +dashmap = "6.0.1" once_cell = "1.19.0" -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } diff --git a/crates/slt/Cargo.toml b/crates/slt/Cargo.toml index 45cc5bcf0..b2d2e190e 100644 --- a/crates/slt/Cargo.toml +++ b/crates/slt/Cargo.toml @@ -9,7 +9,7 @@ workspace = true [lib] # no tests currently implemented in this package; skip, then doctest = false -test = false +test = false [dependencies] clap = { workspace = true } @@ -21,7 +21,7 @@ tempfile = { workspace = true } anyhow = { workspace = true } tracing = { workspace = true } tonic = { workspace = true } -datafusion = { workspace = true } +datafusion = { workspace = true } arrow-flight = { workspace = true } datafusion_ext = { path = "../datafusion_ext" } ioutil = { path = "../ioutil" } @@ -32,10 +32,10 @@ pgsrv = { path = "../pgsrv" } rpcsrv = { path = "../rpcsrv" } sqlexec = { path = "../sqlexec" } telemetry = { path = "../telemetry" } -tokio-postgres = "0.7.8" +uuid = { version = "1.9", features = ["v4", "fast-rng", "macro-diagnostics"] } glob = "0.3.1" +once_cell = "1.19.0" regex = "1.10.5" -sqllogictest = "0.20.4" -uuid = { version = "1.8", features = ["v4", "fast-rng", "macro-diagnostics"] } +sqllogictest = "0.20.6" +tokio-postgres = "0.7.8" walkdir = "2.5.0" -once_cell = "1.19.0" diff --git a/crates/snowflake_connector/Cargo.toml b/crates/snowflake_connector/Cargo.toml index 292c2abbc..969153fef 100644 --- a/crates/snowflake_connector/Cargo.toml +++ b/crates/snowflake_connector/Cargo.toml @@ -18,7 +18,7 @@ serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } chrono = { workspace = true } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } datafusion = { workspace = true } hex = "0.4.3" base64 = "0.22.1" diff --git a/crates/sqlbuiltins/Cargo.toml b/crates/sqlbuiltins/Cargo.toml index 8ad866917..a9c22739a 100644 --- a/crates/sqlbuiltins/Cargo.toml +++ b/crates/sqlbuiltins/Cargo.toml @@ -38,8 +38,8 @@ kdl = "5.0.0-alpha.1" num-traits = "0.2.19" once_cell = "1.19.0" siphasher = "1.0.1" -strum = "0.26.2" +strum = "0.26.3" memoize = { version = "0.4.2", features = ["full"] } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } arrow-cast = { version = "50.0.0" } # MUST synchronize sync with the datafusion::arrow version lance-linalg = { git = "https://github.com/GlareDB/lance", branch = "df36" } # omits duckdb submodule diff --git a/crates/sqlexec/Cargo.toml b/crates/sqlexec/Cargo.toml index e1cb7f39d..4462e1dac 100644 --- a/crates/sqlexec/Cargo.toml +++ b/crates/sqlexec/Cargo.toml @@ -42,12 +42,12 @@ reqwest = { workspace = true } rustls = { workspace = true } url = { workspace = true } bytes = { workspace = true } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } tokio-postgres = "0.7.8" once_cell = "1.19.0" parking_lot = "0.12.3" num_cpus = "1.16.0" -dashmap = "5.5.0" +dashmap = "6.0.1" [dev-dependencies] metastore = { path = "../metastore" } diff --git a/crates/telemetry/Cargo.toml b/crates/telemetry/Cargo.toml index d83bf98ca..ee03e300c 100644 --- a/crates/telemetry/Cargo.toml +++ b/crates/telemetry/Cargo.toml @@ -15,5 +15,5 @@ test = false tracing = { workspace = true } segment = "0.2.4" tokio = { workspace = true } -uuid = { version = "1.8.0", features = ["v4", "fast-rng", "macro-diagnostics"] } +uuid = { version = "1.9.1", features = ["v4", "fast-rng", "macro-diagnostics"] } serde_json = { workspace = true }