diff --git a/native/Cargo.lock b/native/Cargo.lock index 7bc355b68eb..2b5594b0dfb 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -198,7 +198,7 @@ dependencies = [ "snap", "strum", "strum_macros", - "thiserror 2.0.20", + "thiserror", "uuid", "zstd 0.13.3", ] @@ -1311,12 +1311,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cfg-if" version = "1.0.4" @@ -2017,7 +2011,7 @@ dependencies = [ "iceberg", "iceberg-storage-opendal", "itertools 0.15.0", - "jni 0.22.4", + "jni", "lazy_static", "libloading", "log", @@ -2059,7 +2053,7 @@ dependencies = [ "serde", "serde_json", "simdutf8", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2070,7 +2064,7 @@ dependencies = [ "assertables", "datafusion", "datafusion-comet-common", - "jni 0.22.4", + "jni", "lazy_static", "once_cell", "parquet", @@ -2078,7 +2072,7 @@ dependencies = [ "prost", "regex", "serde_json", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -2122,7 +2116,7 @@ dependencies = [ "datafusion-comet-spark-expr", "futures", "itertools 0.15.0", - "jni 0.21.1", + "jni", "log", "lz4_flex", "parquet", @@ -2148,7 +2142,7 @@ dependencies = [ "datafusion-spark", "datasketches", "futures", - "jni 0.22.4", + "jni", "memchr", "num", "paste", @@ -2800,7 +2794,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -3958,22 +3952,6 @@ dependencies = [ "jiff-tzdb", ] -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys 0.3.1", - "log", - "thiserror 1.0.69", - "walkdir", - "windows-sys 0.45.0", -] - [[package]] name = "jni" version = "0.22.4" @@ -3984,11 +3962,11 @@ dependencies = [ "combine", "java-locator", "jni-macros", - "jni-sys 0.4.1", + "jni-sys", "libloading", "log", "simd_cesu8", - "thiserror 2.0.20", + "thiserror", "walkdir", "windows-link", ] @@ -4006,15 +3984,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "jni-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" -dependencies = [ - "jni-sys 0.4.1", -] - [[package]] name = "jni-sys" version = "0.4.1" @@ -4258,7 +4227,7 @@ dependencies = [ "serde-value", "serde_json", "serde_yaml", - "thiserror 2.0.20", + "thiserror", "thread-id", "typemap-ors", "unicode-segmentation", @@ -4569,7 +4538,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "thiserror 2.0.20", + "thiserror", "tokio", "tracing", "url", @@ -5257,7 +5226,7 @@ dependencies = [ "spin 0.10.1", "symbolic-demangle", "tempfile", - "thiserror 2.0.20", + "thiserror", ] [[package]] @@ -5422,7 +5391,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.20", + "thiserror", "tokio", "tracing", "web-time", @@ -5445,7 +5414,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.20", + "thiserror", "tinyvec", "tracing", "web-time", @@ -6006,7 +5975,7 @@ checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" dependencies = [ "core-foundation", "core-foundation-sys", - "jni 0.22.4", + "jni", "log", "once_cell", "rustls", @@ -6595,33 +6564,13 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" dependencies = [ - "thiserror-impl 2.0.20", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", + "thiserror-impl", ] [[package]] @@ -7318,22 +7267,13 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -7345,67 +7285,34 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-targets" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -7418,48 +7325,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" diff --git a/native/Cargo.toml b/native/Cargo.toml index defbf41ae27..237a99762b4 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -66,6 +66,9 @@ chrono-tz = "0.10" # change that re-checks those two tests. datasketches = { version = "=0.3.0", features = ["hll"] } futures = "0.3.32" +# Declared once so no crate can drift to another major. That would build a second copy of the +# binding, whose `JObject` and env types are not interchangeable with this one's. +jni = "0.22.4" num = "0.4" rand = "0.10" # Before upgrading `regex`, complete the Java-parity fixture gate tracked in diff --git a/native/core/Cargo.toml b/native/core/Cargo.toml index d52c6f96590..82241fd1028 100644 --- a/native/core/Cargo.toml +++ b/native/core/Cargo.toml @@ -52,7 +52,7 @@ async-trait = { workspace = true } log = "0.4" log4rs = "1.4.0" prost = "0.14.3" -jni = "0.22.4" +jni = { workspace = true } rand = { workspace = true } num = { workspace = true } tempfile = "3.26.0" @@ -110,7 +110,7 @@ hdrs = { version = "0.3.2", features = ["vendored"] } crc32fast = "1.3.2" pprof = { version = "0.15", features = ["flamegraph"] } criterion = { version = "0.7", features = ["async", "async_tokio", "async_std"] } -jni = { version = "0.22.4", features = ["invocation"] } +jni = { workspace = true, features = ["invocation"] } lazy_static = "1.4" assertables = "10" hex = "0.4.3" diff --git a/native/jni-bridge/Cargo.toml b/native/jni-bridge/Cargo.toml index 57f35e0aa7c..52a0141013a 100644 --- a/native/jni-bridge/Cargo.toml +++ b/native/jni-bridge/Cargo.toml @@ -32,7 +32,7 @@ publish = false arrow = { workspace = true } parquet = { workspace = true } datafusion = { workspace = true } -jni = "0.22.4" +jni = { workspace = true } thiserror = { workspace = true } regex = { workspace = true } lazy_static = "1.4.0" @@ -43,5 +43,5 @@ prost = "0.14.3" datafusion-comet-common = { workspace = true } [dev-dependencies] -jni = { version = "0.22.4", features = ["invocation"] } +jni = { workspace = true, features = ["invocation"] } assertables = "10" diff --git a/native/shuffle/Cargo.toml b/native/shuffle/Cargo.toml index f0ed22ad730..8106ef1fec2 100644 --- a/native/shuffle/Cargo.toml +++ b/native/shuffle/Cargo.toml @@ -43,7 +43,7 @@ datafusion-comet-jni-bridge = { workspace = true } datafusion-comet-spark-expr = { workspace = true } futures = { workspace = true } itertools = "0.15.0" -jni = "0.21" +jni = { workspace = true } log = "0.4" lz4_flex = { version = "0.14.0", default-features = false, features = ["frame"] } # parquet is only used by the shuffle_bench binary (shuffle-bench feature) diff --git a/native/spark-expr/Cargo.toml b/native/spark-expr/Cargo.toml index 3011f1c5c6f..8823cff5730 100644 --- a/native/spark-expr/Cargo.toml +++ b/native/spark-expr/Cargo.toml @@ -43,7 +43,7 @@ memchr = "2.8" smallvec = "1.16" datafusion-comet-common = { workspace = true } datafusion-comet-jni-bridge = { workspace = true } -jni = "0.22.4" +jni = { workspace = true } # jni-bridge's `jni_static_call!` expands to `paste::paste!`, so callers need `paste` directly paste = "1.0.14" futures = { workspace = true }