diff --git a/.cargo/config.toml b/.cargo/config.toml index 24ea45fbbc6..450d3616e59 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -6,6 +6,8 @@ rustflags = ["-C", "force-frame-pointers=yes"] rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"] [target.x86_64-apple-darwin] rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"] +[target.wasm32-unknown-unknown] +rustflags = ['--cfg', 'getrandom_backend="wasm_js"'] [alias] xtask = "run -p xtask --" diff --git a/Cargo.lock b/Cargo.lock index ba1f7b34bf9..ad4a2d449b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2164,9 +2164,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" dependencies = [ "atomic-waker", "bytes", @@ -3710,9 +3710,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" +checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944" dependencies = [ "cfg_aliases", "libc", @@ -5108,7 +5108,6 @@ dependencies = [ "flatbuffers 25.2.10", "flexbuffers", "futures-util", - "getrandom 0.2.15", "goldenfile", "hashbrown 0.15.2", "humansize", @@ -5140,6 +5139,7 @@ dependencies = [ "arrow-buffer", "codspeed-divan-compat", "env_logger", + "getrandom 0.2.15", "itertools 0.14.0", "log", "num-traits", @@ -5245,6 +5245,7 @@ dependencies = [ name = "vortex-datetime-parts" version = "0.24.0" dependencies = [ + "getrandom 0.2.15", "rstest", "serde", "vortex-array", @@ -5578,6 +5579,7 @@ dependencies = [ "datafusion-common", "flatbuffers 25.2.10", "flexbuffers", + "getrandom 0.2.15", "itertools 0.14.0", "num-traits", "paste", diff --git a/Cargo.toml b/Cargo.toml index cabc44f5f8f..0abd72e9c12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,15 +53,15 @@ categories = ["database-implementations", "data-structures", "compression"] anyhow = "1.0.95" arbitrary = "1.3.2" arrayref = "0.3.7" -arrow = "54.1" -arrow-arith = "54.1" -arrow-array = "54.1" -arrow-buffer = "54.1" -arrow-cast = "54.1" -arrow-ord = "54.1" -arrow-schema = "54.1" -arrow-select = "54.1" -arrow-string = "54.1" +arrow = "54.2" +arrow-arith = "54.2" +arrow-array = "54.2" +arrow-buffer = "54.2" +arrow-cast = "54.2" +arrow-ord = "54.2" +arrow-schema = "54.2" +arrow-select = "54.2" +arrow-string = "54.2" async-once-cell = "0.5.4" async-trait = "0.1.86" backtrace = "0.3.74" @@ -91,7 +91,7 @@ fsst-rs = "0.5.0" futures = { version = "0.3.31", default-features = false } futures-executor = "0.3.31" futures-util = "0.3.31" -getrandom = "0.2.14" +getrandom = "0.3" goldenfile = "1" half = { version = "2.2.1", features = ["std", "num-traits"] } hashbrown = "0.15.1" @@ -109,7 +109,7 @@ num-traits = "0.2.19" num_enum = "0.7.2" object_store = "0.11.0" oneshot = "0.1.10" -parquet = "54.1" +parquet = "54.2" paste = "1.0.15" pin-project = "1.1.5" pin-project-lite = "0.2.15" @@ -155,7 +155,7 @@ tracing-chrome = "0.7.2" tracing-futures = "0.2.5" tracing-subscriber = "0.3.19" url = "2.5.4" -uuid = { version = "1.14.0", features = ["js", "v4"] } +uuid = { version = "1.14", features = ["js"] } wasm-bindgen-futures = "0.4.39" witchcraft-metrics = "1.0.1" @@ -194,6 +194,16 @@ worker = "0.5.0" xshell = "0.2.6" zigzag = "0.1.0" +[workspace.dependencies.getrandom_v03] +package = "getrandom" +version = "0.3.1" +features = ["wasm_js"] + +[workspace.dependencies.getrandom_v02] +package = "getrandom" +version = "0.2.15" +features = ["js"] + [workspace.lints.rust] macro_use_extern_crate = "deny" redundant_lifetimes = "deny" diff --git a/bench-vortex/Cargo.toml b/bench-vortex/Cargo.toml index 4c07e7c42f7..0328da5ad50 100644 --- a/bench-vortex/Cargo.toml +++ b/bench-vortex/Cargo.toml @@ -67,7 +67,7 @@ tracing-subscriber = { workspace = true, features = [ "tracing-log", ] } url = { workspace = true } -uuid = { workspace = true } +uuid = { workspace = true, features = ["v4"] } vortex = { workspace = true, features = ["object_store", "parquet"] } vortex-datafusion = { workspace = true } xshell = { workspace = true } diff --git a/encodings/datetime-parts/Cargo.toml b/encodings/datetime-parts/Cargo.toml index b31a1c7c785..9c4950f6af9 100644 --- a/encodings/datetime-parts/Cargo.toml +++ b/encodings/datetime-parts/Cargo.toml @@ -17,6 +17,7 @@ readme = { workspace = true } workspace = true [dependencies] +getrandom_v02 = { workspace = true } serde = { workspace = true, features = ["derive"] } vortex-array = { workspace = true } vortex-buffer = { workspace = true } diff --git a/encodings/dict/Cargo.toml b/encodings/dict/Cargo.toml index 4333470a84e..c2d53261709 100644 --- a/encodings/dict/Cargo.toml +++ b/encodings/dict/Cargo.toml @@ -19,17 +19,17 @@ test-harness = ["rand", "vortex-fsst"] [dependencies] arrow-buffer = { workspace = true } num-traits = { workspace = true } +# test-harness +rand = { workspace = true, optional = true } rustc-hash = { workspace = true } serde = { workspace = true } vortex-array = { workspace = true } vortex-buffer = { workspace = true } vortex-dtype = { workspace = true } vortex-error = { workspace = true } +vortex-fsst = { workspace = true, optional = true } vortex-mask = { workspace = true } vortex-scalar = { workspace = true } -# test-harness -rand = { workspace = true, optional = true } -vortex-fsst = { workspace = true, optional = true } [lints] workspace = true diff --git a/encodings/fastlanes/Cargo.toml b/encodings/fastlanes/Cargo.toml index b06a5ac0089..dcd27e4252f 100644 --- a/encodings/fastlanes/Cargo.toml +++ b/encodings/fastlanes/Cargo.toml @@ -35,9 +35,9 @@ vortex-scalar = { workspace = true } [dev-dependencies] divan = { workspace = true } rand = { workspace = true } +vortex-alp = { workspace = true } vortex-array = { workspace = true, features = ["test-harness"] } vortex-fastlanes = { path = ".", features = ["test-harness"] } -vortex-alp = { workspace = true } [features] test-harness = ["dep:rand"] diff --git a/vortex-array/Cargo.toml b/vortex-array/Cargo.toml index 80f499db496..826b7aaabe1 100644 --- a/vortex-array/Cargo.toml +++ b/vortex-array/Cargo.toml @@ -70,10 +70,6 @@ arbitrary = [ test-harness = ["dep:goldenfile"] canonical_counter = [] -[target.'cfg(target_arch = "wasm32")'.dependencies] -# Enable the JS feature of getrandom (via rand) to supprt wasm32 target -getrandom = { workspace = true, features = ["js"] } - [dev-dependencies] divan = { workspace = true } rstest = { workspace = true } diff --git a/vortex-btrblocks/Cargo.toml b/vortex-btrblocks/Cargo.toml index f00ce3cd7af..5d0c71df66b 100644 --- a/vortex-btrblocks/Cargo.toml +++ b/vortex-btrblocks/Cargo.toml @@ -1,19 +1,20 @@ [package] name = "vortex-btrblocks" description = "BtrBlocks style compressor" -version.workspace = true -homepage.workspace = true -repository.workspace = true -authors.workspace = true -license.workspace = true -keywords.workspace = true -include.workspace = true -edition.workspace = true -rust-version.workspace = true -readme.workspace = true -categories.workspace = true +version = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +keywords = { workspace = true } +include = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +readme = { workspace = true } +categories = { workspace = true } [dependencies] +getrandom_v02 = { workspace = true } arrow-buffer = { workspace = true } itertools = { workspace = true } log = { workspace = true } diff --git a/vortex-datetime-dtype/Cargo.toml b/vortex-datetime-dtype/Cargo.toml index 975d832b18a..a21309ed9c4 100644 --- a/vortex-datetime-dtype/Cargo.toml +++ b/vortex-datetime-dtype/Cargo.toml @@ -21,6 +21,7 @@ serde = { workspace = true, features = ["derive"] } vortex-dtype = { workspace = true, features = ["serde"] } vortex-error = { workspace = true } + [features] default = ["arrow"] arrow = ["dep:arrow-schema"] diff --git a/vortex-metrics/Cargo.toml b/vortex-metrics/Cargo.toml index 18714b1e1a2..d250c4e7ff8 100644 --- a/vortex-metrics/Cargo.toml +++ b/vortex-metrics/Cargo.toml @@ -16,10 +16,7 @@ categories = { workspace = true } [dependencies] vortex-error = { workspace = true } witchcraft-metrics = { workspace = true } - -[target.'cfg(target_arch = "wasm32")'.dependencies] -# Enable the JS feature of getrandom (via rand) to supprt wasm32 target -getrandom = { workspace = true, features = ["js"] } +getrandom_v02 = { workspace = true } [lints] workspace = true diff --git a/vortex-scalar/Cargo.toml b/vortex-scalar/Cargo.toml index 1cb75e8c335..c873b93faa4 100644 --- a/vortex-scalar/Cargo.toml +++ b/vortex-scalar/Cargo.toml @@ -31,6 +31,7 @@ vortex-dtype = { workspace = true } vortex-error = { workspace = true } vortex-flatbuffers = { workspace = true, optional = true } vortex-proto = { workspace = true, optional = true } +getrandom_v02 = { workspace = true } [dev-dependencies] flexbuffers = { workspace = true }