From 60168b9b2423438cc13a173180be11dd1720bb57 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski <github@robertk.io> Date: Thu, 2 May 2024 01:19:21 +0900 Subject: [PATCH] Remove unused dependencies (and bump lance) (#286) --- Cargo.lock | 1094 ++++++++++------------------ Cargo.toml | 1 - bench-vortex/Cargo.toml | 17 +- bench-vortex/src/data_downloads.rs | 3 +- bench-vortex/src/reader.rs | 5 +- pyvortex/Cargo.toml | 1 - vortex-alloc/Cargo.toml | 18 - vortex-alloc/src/alloc.rs | 68 -- vortex-alloc/src/lib.rs | 6 - vortex-alp/Cargo.toml | 2 - vortex-array/Cargo.toml | 4 - vortex-dict/Cargo.toml | 2 - vortex-dtype/Cargo.toml | 2 - vortex-fastlanes/Cargo.toml | 2 - vortex-flatbuffers/Cargo.toml | 1 - vortex-ipc/Cargo.toml | 2 - vortex-ree/Cargo.toml | 3 - vortex-roaring/Cargo.toml | 1 - vortex-zigzag/Cargo.toml | 5 +- vortex-zigzag/src/compress.rs | 5 +- 20 files changed, 416 insertions(+), 826 deletions(-) delete mode 100644 vortex-alloc/Cargo.toml delete mode 100644 vortex-alloc/src/alloc.rs delete mode 100644 vortex-alloc/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index fe71e3e830..b5f70f1d61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,93 +112,40 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "arrow" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa285343fba4d829d49985bdc541e3789cf6000ed0e84be7c039438df4a4e78c" -dependencies = [ - "arrow-arith 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-csv 50.0.0", - "arrow-data 50.0.0", - "arrow-ipc 50.0.0", - "arrow-json 50.0.0", - "arrow-ord 50.0.0", - "arrow-row 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", - "arrow-string 50.0.0", -] - [[package]] name = "arrow" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219d05930b81663fd3b32e3bde8ce5bff3c4d23052a99f11a8fa50a3b47b2658" dependencies = [ - "arrow-arith 51.0.0", - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-cast 51.0.0", - "arrow-csv 51.0.0", - "arrow-data 51.0.0", - "arrow-ipc 51.0.0", - "arrow-json 51.0.0", - "arrow-ord 51.0.0", - "arrow-row 51.0.0", - "arrow-schema 51.0.0", - "arrow-select 51.0.0", - "arrow-string 51.0.0", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-csv", + "arrow-data", + "arrow-ipc", + "arrow-json", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", "pyo3", ] -[[package]] -name = "arrow-arith" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753abd0a5290c1bcade7c6623a556f7d1659c5f4148b140b5b63ce7bd1a45705" -dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "chrono", - "half", - "num", -] - [[package]] name = "arrow-arith" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0272150200c07a86a390be651abdd320a2d12e84535f0837566ca87ecd8f95e0" dependencies = [ - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", - "chrono", - "half", - "num", -] - -[[package]] -name = "arrow-array" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609" -dependencies = [ - "ahash", - "arrow-buffer 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "chrono", - "chrono-tz", "half", - "hashbrown", "num", ] @@ -209,26 +156,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8010572cf8c745e242d1b632bd97bd6d4f40fefed5ed1290a8f433abaa686fea" dependencies = [ "ahash", - "arrow-buffer 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", + "arrow-buffer", + "arrow-data", + "arrow-schema", "chrono", + "chrono-tz", "half", "hashbrown", "num", ] -[[package]] -name = "arrow-buffer" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4" -dependencies = [ - "bytes", - "half", - "num", -] - [[package]] name = "arrow-buffer" version = "51.0.0" @@ -240,75 +177,38 @@ dependencies = [ "num", ] -[[package]] -name = "arrow-cast" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e448e5dd2f4113bf5b74a1f26531708f5edcacc77335b7066f9398f4bcf4cdef" -dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", - "base64 0.21.7", - "chrono", - "comfy-table", - "half", - "lexical-core", - "num", -] - [[package]] name = "arrow-cast" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9abc10cd7995e83505cc290df9384d6e5412b207b79ce6bdff89a10505ed2cba" dependencies = [ - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", - "arrow-select 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "atoi", - "base64 0.22.0", + "base64 0.22.1", "chrono", + "comfy-table", "half", "lexical-core", "num", "ryu", ] -[[package]] -name = "arrow-csv" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46af72211f0712612f5b18325530b9ad1bfbdc87290d5fbfd32a7da128983781" -dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "chrono", - "csv", - "csv-core", - "lazy_static", - "lexical-core", - "regex", -] - [[package]] name = "arrow-csv" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95cbcba196b862270bf2a5edb75927380a7f3a163622c61d40cbba416a6305f2" dependencies = [ - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-cast 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", "chrono", "csv", "csv-core", @@ -317,79 +217,32 @@ dependencies = [ "regex", ] -[[package]] -name = "arrow-data" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e" -dependencies = [ - "arrow-buffer 50.0.0", - "arrow-schema 50.0.0", - "half", - "num", -] - [[package]] name = "arrow-data" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2742ac1f6650696ab08c88f6dd3f0eb68ce10f8c253958a18c943a68cd04aec5" dependencies = [ - "arrow-buffer 51.0.0", - "arrow-schema 51.0.0", + "arrow-buffer", + "arrow-schema", "half", "num", ] -[[package]] -name = "arrow-ipc" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03dea5e79b48de6c2e04f03f62b0afea7105be7b77d134f6c5414868feefb80d" -dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "flatbuffers", - "lz4_flex", - "zstd", -] - [[package]] name = "arrow-ipc" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a42ea853130f7e78b9b9d178cb4cd01dee0f78e64d96c2949dc0a915d6d9e19d" dependencies = [ - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-cast 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", "flatbuffers", "lz4_flex", -] - -[[package]] -name = "arrow-json" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8950719280397a47d37ac01492e3506a8a724b3fb81001900b866637a829ee0f" -dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "chrono", - "half", - "indexmap", - "lexical-core", - "num", - "serde", - "serde_json", + "zstd", ] [[package]] @@ -398,11 +251,11 @@ version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaafb5714d4e59feae964714d724f880511500e3569cc2a94d02456b403a2a49" dependencies = [ - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-cast 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", "chrono", "half", "indexmap", @@ -412,51 +265,21 @@ dependencies = [ "serde_json", ] -[[package]] -name = "arrow-ord" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed9630979034077982d8e74a942b7ac228f33dd93a93b615b4d02ad60c260be" -dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", - "half", - "num", -] - [[package]] name = "arrow-ord" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e6b61e3dc468f503181dccc2fc705bdcc5f2f146755fa5b56d0a6c5943f412" dependencies = [ - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", - "arrow-select 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "half", "num", ] -[[package]] -name = "arrow-row" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "007035e17ae09c4e8993e4cb8b5b96edf0afb927cd38e2dff27189b274d83dcf" -dependencies = [ - "ahash", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "half", - "hashbrown", -] - [[package]] name = "arrow-row" version = "51.0.0" @@ -464,23 +287,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "848ee52bb92eb459b811fb471175ea3afcf620157674c8794f539838920f9228" dependencies = [ "ahash", - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "half", "hashbrown", ] -[[package]] -name = "arrow-schema" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029" -dependencies = [ - "bitflags 2.5.0", -] - [[package]] name = "arrow-schema" version = "51.0.0" @@ -490,20 +304,6 @@ dependencies = [ "bitflags 2.5.0", ] -[[package]] -name = "arrow-select" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce20973c1912de6514348e064829e50947e35977bb9d7fb637dc99ea9ffd78c" -dependencies = [ - "ahash", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "num", -] - [[package]] name = "arrow-select" version = "51.0.0" @@ -511,40 +311,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "849524fa70e0e3c5ab58394c770cb8f514d0122d20de08475f7b472ed8075830" dependencies = [ "ahash", - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "num", ] -[[package]] -name = "arrow-string" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f3b37f2aeece31a2636d1b037dabb69ef590e03bdc7eb68519b51ec86932a7" -dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", - "num", - "regex", - "regex-syntax", -] - [[package]] name = "arrow-string" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9373cb5a021aee58863498c37eb484998ef13377f69989c6c5ccfbd258236cdb" dependencies = [ - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-data 51.0.0", - "arrow-schema 51.0.0", - "arrow-select 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "memchr", "num", "regex", @@ -553,13 +337,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -570,7 +354,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -935,9 +719,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64-simd" @@ -953,12 +737,8 @@ dependencies = [ name = "bench-vortex" version = "0.1.0" dependencies = [ - "arrow 51.0.0", - "arrow-array 50.0.0", - "arrow-array 51.0.0", - "arrow-csv 51.0.0", - "arrow-data 51.0.0", - "arrow-select 51.0.0", + "arrow-array", + "arrow-select", "bzip2", "criterion", "csv", @@ -969,9 +749,8 @@ dependencies = [ "lance", "lazy_static", "log", - "parquet 50.0.0", - "parquet 51.0.0", - "reqwest 0.12.3", + "parquet", + "reqwest 0.12.4", "simplelog", "tokio", "uuid", @@ -985,7 +764,6 @@ dependencies = [ "vortex-ipc", "vortex-ree", "vortex-roaring", - "vortex-zigzag", ] [[package]] @@ -1007,7 +785,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.59", + "syn 2.0.60", "which", ] @@ -1083,9 +861,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecount" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" @@ -1175,12 +953,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -1524,23 +1303,25 @@ dependencies = [ [[package]] name = "datafusion" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b360b692bf6c6d6e6b6dbaf41a3be0020daeceac0f406aed54c75331e50dbb" +checksum = "85069782056753459dc47e386219aa1fdac5b731f26c28abb8c0ffd4b7c5ab11" dependencies = [ "ahash", - "arrow 50.0.0", - "arrow-array 50.0.0", - "arrow-ipc 50.0.0", - "arrow-schema 50.0.0", + "arrow", + "arrow-array", + "arrow-ipc", + "arrow-schema", "async-trait", "bytes", "chrono", "dashmap", "datafusion-common", + "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-functions", + "datafusion-functions-array", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-plan", @@ -1566,30 +1347,40 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37f343ccc298f440e25aa38ff82678291a7acc24061c7370ba6c0ff5cc811412" +checksum = "309d9040751f6dc9e33c85dce6abb55a46ef7ea3644577dd014611c379447ef3" dependencies = [ "ahash", - "arrow 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-schema 50.0.0", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-schema", "chrono", "half", + "instant", "libc", "num_cpus", "object_store", "sqlparser", ] +[[package]] +name = "datafusion-common-runtime" +version = "37.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e4a44d8ef1b1e85d32234e6012364c411c3787859bb3bba893b0332cb03dfd" +dependencies = [ + "tokio", +] + [[package]] name = "datafusion-execution" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9c93043081487e335399a21ebf8295626367a647ac5cb87d41d18afad7d0f7" +checksum = "06a3a29ae36bcde07d179cc33b45656a8e7e4d023623e320e48dcf1200eeee95" dependencies = [ - "arrow 50.0.0", + "arrow", "chrono", "dashmap", "datafusion-common", @@ -1606,13 +1397,14 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e204d89909e678846b6a95f156aafc1ee5b36cb6c9e37ec2e1449b078a38c818" +checksum = "2a3542aa322029c2121a671ce08000d4b274171070df13f697b14169ccf4f628" dependencies = [ "ahash", - "arrow 50.0.0", - "arrow-array 50.0.0", + "arrow", + "arrow-array", + "chrono", "datafusion-common", "paste", "sqlparser", @@ -1622,26 +1414,56 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f1c73f7801b2b8ba2297b3ad78ffcf6c1fc6b8171f502987eb9ad5cb244ee7" +checksum = "dd221792c666eac174ecc09e606312844772acc12cbec61a420c2fca1ee70959" dependencies = [ - "arrow 50.0.0", - "base64 0.21.7", + "arrow", + "base64 0.22.1", + "blake2", + "blake3", + "chrono", "datafusion-common", "datafusion-execution", "datafusion-expr", + "datafusion-physical-expr", "hex", + "itertools 0.12.1", "log", + "md-5", + "regex", + "sha2", + "unicode-segmentation", + "uuid", +] + +[[package]] +name = "datafusion-functions-array" +version = "37.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e501801e84d9c6ef54caaebcda1b18a6196a24176c12fb70e969bc0572e03c55" +dependencies = [ + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "itertools 0.12.1", + "log", + "paste", ] [[package]] name = "datafusion-optimizer" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae27e07bf1f04d327be5c2a293470879801ab5535204dc3b16b062fda195496" +checksum = "76bd7f5087817deb961764e8c973d243b54f8572db414a8f0a8f33a48f991e0a" dependencies = [ - "arrow 50.0.0", + "arrow", "async-trait", "chrono", "datafusion-common", @@ -1655,18 +1477,18 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde620cd9ef76a3bca9c754fb68854bd2349c49f55baf97e08001f9e967f6d6b" +checksum = "5cabc0d9aaa0f5eb1b472112f16223c9ffd2fb04e58cbf65c0a331ee6e993f96" dependencies = [ "ahash", - "arrow 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-ord 50.0.0", - "arrow-schema 50.0.0", - "arrow-string 50.0.0", - "base64 0.21.7", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "arrow-string", + "base64 0.22.1", "blake2", "blake3", "chrono", @@ -1686,23 +1508,23 @@ dependencies = [ "regex", "sha2", "unicode-segmentation", - "uuid", ] [[package]] name = "datafusion-physical-plan" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4c75fba9ea99d64b2246cbd2fcae2e6fc973e6616b1015237a616036506dd4" +checksum = "17c0523e9c8880f2492a88bbd857dde02bed1ed23f3e9211a89d3d7ec3b44af9" dependencies = [ "ahash", - "arrow 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-schema 50.0.0", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-schema", "async-trait", "chrono", "datafusion-common", + "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-physical-expr", @@ -1717,21 +1539,22 @@ dependencies = [ "pin-project-lite", "rand", "tokio", - "uuid", ] [[package]] name = "datafusion-sql" -version = "36.0.0" +version = "37.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21474a95c3a62d113599d21b439fa15091b538bac06bd20be0bb2e7d22903c09" +checksum = "49eb54b42227136f6287573f2434b1de249fe1b8e6cd6cc73a634e4a3ec29356" dependencies = [ - "arrow 50.0.0", - "arrow-schema 50.0.0", + "arrow", + "arrow-array", + "arrow-schema", "datafusion-common", "datafusion-expr", "log", "sqlparser", + "strum", ] [[package]] @@ -1797,7 +1620,7 @@ checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1823,22 +1646,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600536cfe9e2da0820aa498e570f6b2b9223eec3ce2f835c8ae4861304fa4794" +checksum = "c280b9e6b3ae19e152d8e31cf47f18389781e119d4013a2a2bb0180e5facc635" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1866,35 +1689,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ext-trait" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d772df1c1a777963712fb68e014235e80863d6a91a85c4e06ba2d16243a310e5" -dependencies = [ - "ext-trait-proc_macros", -] - -[[package]] -name = "ext-trait-proc_macros" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab7934152eaf26aa5aa9f7371408ad5af4c31357073c9e84c3b9d7f11ad639a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "extension-traits" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a296e5a895621edf9fa8329c83aa1cb69a964643e36cf54d8d7a69b789089537" -dependencies = [ - "ext-trait", -] - [[package]] name = "fastlanez" version = "0.1.0" @@ -1917,9 +1711,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fixedbitset" @@ -1948,9 +1742,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -2061,7 +1855,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2180,9 +1974,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -2339,9 +2133,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f24ce812868d86d19daa79bf3bf9175bc44ea323391147a5e3abde2a283871b" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -2381,7 +2175,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.3.0", + "hyper 1.3.1", "hyper-util", "native-tls", "tokio", @@ -2400,7 +2194,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.3.0", + "hyper 1.3.1", "pin-project-lite", "socket2", "tokio", @@ -2458,6 +2252,18 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "integer-encoding" version = "3.0.4" @@ -2507,9 +2313,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2525,18 +2331,18 @@ dependencies = [ [[package]] name = "lance" -version = "0.10.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa389ab3681069a870f0185c17e64a06735223917465592fb15df196b086cfb" -dependencies = [ - "arrow 50.0.0", - "arrow-arith 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-ord 50.0.0", - "arrow-row 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", +version = "0.10.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f65c831c2367f290c0c704db0f8a27d006b448001de266fe391bb136fedf4398" +dependencies = [ + "arrow", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", "async-recursion", "async-trait", "async_cell", @@ -2546,6 +2352,7 @@ dependencies = [ "chrono", "dashmap", "datafusion", + "datafusion-functions", "datafusion-physical-expr", "futures", "half", @@ -2583,16 +2390,16 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17e7fa583788b0d1a21c56b5de319b12e86d9dd229e44e64e13eb15dc260fe6" +checksum = "7a0261647477271b4c5a4e17c184c48a60df5fd3e2f7378270ade4ab13fe6353" dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "arrow-select", "getrandom", "half", "num-traits", @@ -2602,13 +2409,13 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128df4adeae4371bc42e1f679c4386f1f1f307435c3ec7bbf4eee6a66390600c" +checksum = "c8de18d3460c09860df3c02e97ff3142e1f81532720d50955d75d2545fb7b56c" dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-schema 50.0.0", + "arrow-array", + "arrow-buffer", + "arrow-schema", "async-trait", "byteorder", "bytes", @@ -2621,6 +2428,7 @@ dependencies = [ "libc", "mock_instant", "moka", + "num_cpus", "object_store", "pin-project", "prost", @@ -2637,17 +2445,18 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a8c151f6c0c4f4e7d42c15e28f823b197ce482b5da71091fd3a20c45adbba2" +checksum = "01a99c234ffb02922a073e35d2d814528b371dd9376b2d205108ce5cdfcfd233" dependencies = [ - "arrow 50.0.0", - "arrow-array 50.0.0", - "arrow-ord 50.0.0", - "arrow-schema 50.0.0", + "arrow", + "arrow-array", + "arrow-ord", + "arrow-schema", "async-trait", "datafusion", "datafusion-common", + "datafusion-functions", "datafusion-physical-expr", "futures", "lance-arrow", @@ -2660,14 +2469,14 @@ dependencies = [ [[package]] name = "lance-datagen" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb27ff596acf08fd1c43ddd9aa5860ff1877b0de8d87816b863f9c2f3f737b5" +checksum = "f72e133550f1a90dd9364d0f6d387371a97b3280a8db13adb2891535178d75bd" dependencies = [ - "arrow 50.0.0", - "arrow-array 50.0.0", - "arrow-cast 50.0.0", - "arrow-schema 50.0.0", + "arrow", + "arrow-array", + "arrow-cast", + "arrow-schema", "chrono", "futures", "hex", @@ -2677,16 +2486,16 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46923b38df52639c3e7c9ca5bd5a98b5d7efa6695dde88cba16cb811922abd8a" +checksum = "d6d0421c41d9da1ac5ac4f2e66ab8a63efeab2291ba10d7a5441893b5227c3c0" dependencies = [ - "arrow-arith 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-schema", + "arrow-select", "bytes", "futures", "lance-arrow", @@ -2699,19 +2508,21 @@ dependencies = [ "prost-types", "snafu", "tokio", + "tracing", ] [[package]] name = "lance-file" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42c8ff50c7f6981a07cd9ec1e370c5122167840377e55669cd4b56eedd9352f2" +checksum = "8b9439893d05ca544efce2d3555f2ee9ece2763fa4f966cd3af7b0bd46713dd0" dependencies = [ - "arrow-arith 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "async-recursion", "async-trait", "byteorder", @@ -2723,6 +2534,7 @@ dependencies = [ "lance-datagen", "lance-encoding", "lance-io", + "log", "num-traits", "num_cpus", "object_store", @@ -2737,15 +2549,15 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03931b8a5419878233b6abe30f398d8c3fbb9e0c54d3b186af74088130ca7d58" +checksum = "f552f3fffc64b97be3667fdf4b6161bc96fdb920e4317d84c4070baf10902804" dependencies = [ - "arrow 50.0.0", - "arrow-array 50.0.0", - "arrow-ord 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", + "arrow", + "arrow-array", + "arrow-ord", + "arrow-schema", + "arrow-select", "async-recursion", "async-trait", "datafusion", @@ -2783,18 +2595,18 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.10.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e76227d1b1c4e5f6de54b99b50e1ea4d51af62f894b370d17e1845fdb1c38e1" -dependencies = [ - "arrow 50.0.0", - "arrow-arith 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", +version = "0.10.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8387b17cb0c1f3c8b5c918a04e8ea67ec6c76a96e68f976caa1a851e2ae36fea" +dependencies = [ + "arrow", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "arrow-select", "async-recursion", "async-trait", "aws-config", @@ -2808,9 +2620,11 @@ dependencies = [ "lazy_static", "num_cpus", "object_store", + "path_abs", "pin-project", "prost", "prost-build", + "rand", "shellexpand", "snafu", "tokio", @@ -2821,13 +2635,13 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a7745db846a0446bf3dfaa8365709908d4a015f96b2b8885f9a5ce5e5c82e2" +checksum = "fd628dba9812f210c427faabf16b8de194ba1c3e68be2182e6759985b1f96c14" dependencies = [ - "arrow-array 50.0.0", - "arrow-ord 50.0.0", - "arrow-schema 50.0.0", + "arrow-array", + "arrow-ord", + "arrow-schema", "cc", "futures", "half", @@ -2844,15 +2658,15 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.10.13" +version = "0.10.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046f4d07c37ed8e56bfd4685b64289c7a5a4667f7df1f551c1e1fb8b05b01d" +checksum = "ce31ce988552ac4ef5da92138b8032227faea6f2b0c3445646654721b46428e6" dependencies = [ - "arrow 50.0.0", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-ipc 50.0.0", - "arrow-schema 50.0.0", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ipc", + "arrow-schema", "async-trait", "aws-credential-types", "byteorder", @@ -2892,37 +2706,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "lending-iterator" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc07588c853b50689205fb5c00498aa681d89828e0ce8cbd965ebc7a5d8ae260" -dependencies = [ - "extension-traits", - "lending-iterator-proc_macros", - "macro_rules_attribute", - "never-say-never", - "nougat", - "polonius-the-crab", -] - -[[package]] -name = "lending-iterator-proc_macros" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5445dd1c0deb1e97b8a16561d17fc686ca83e8411128fb036e9668a72d51b1d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "lexical-core" version = "0.8.5" @@ -2989,9 +2772,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -3036,7 +2819,7 @@ checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3047,9 +2830,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3213,12 +2996,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "never-say-never" -version = "6.6.666" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5a574dadd7941adeaa71823ecba5e28331b8313fb2e1c6a5c7e5981ea53ad6" - [[package]] name = "nom" version = "7.1.3" @@ -3366,7 +3143,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", @@ -3378,10 +3155,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3468,7 +3245,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3527,9 +3304,9 @@ checksum = "8fecab3723493c7851f292cb060f3ee1c42f19b8d749345d0d7eaf3fd19aa62d" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -3537,47 +3314,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "parquet" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "547b92ebf0c1177e3892f44c8f79757ee62e678d564a9834189725f2c5b7a750" -dependencies = [ - "ahash", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-data 50.0.0", - "arrow-ipc 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", - "base64 0.21.7", - "brotli", - "bytes", - "chrono", - "flate2", - "half", - "hashbrown", - "lz4_flex", - "num", - "num-bigint", - "paste", - "seq-macro", - "snap", - "thrift", - "twox-hash", - "zstd", + "windows-targets 0.52.5", ] [[package]] @@ -3587,14 +3332,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "096795d4f47f65fd3ee1ec5a98b77ab26d602f2cc785b0e4be5443add17ecc32" dependencies = [ "ahash", - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-cast 51.0.0", - "arrow-data 51.0.0", - "arrow-ipc 51.0.0", - "arrow-schema 51.0.0", - "arrow-select 51.0.0", - "base64 0.22.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-schema", + "arrow-select", + "base64 0.22.1", "brotli", "bytes", "chrono", @@ -3627,6 +3372,18 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "path_abs" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3" +dependencies = [ + "serde", + "serde_derive", + "std_prelude", + "stfu8", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -3698,7 +3455,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3747,12 +3504,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "polonius-the-crab" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a69ee997a6282f8462abf1e0d8c38c965e968799e912b3bed8c9e8a28c2f9f" - [[package]] name = "portable-atomic" version = "1.6.0" @@ -3778,7 +3529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ "proc-macro2", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3788,23 +3539,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -3836,7 +3578,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.59", + "syn 2.0.60", "tempfile", ] @@ -3850,7 +3592,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3931,7 +3673,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3944,15 +3686,14 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] name = "pyvortex" version = "0.1.0" dependencies = [ - "arrow 51.0.0", - "itertools 0.12.1", + "arrow", "log", "paste", "pyo3", @@ -4073,11 +3814,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -4171,11 +3912,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bytes", "encoding_rs", "futures-channel", @@ -4185,7 +3926,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.3.0", + "hyper 1.3.1", "hyper-tls", "hyper-util", "ipnet", @@ -4244,9 +3985,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" +checksum = "b26f4c25a604fcb3a1bcd96dd6ba37c93840de95de8198d94c0d571a74a804d1" dependencies = [ "bytemuck", "byteorder", @@ -4275,9 +4016,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -4288,9 +4029,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", @@ -4325,15 +4066,15 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" [[package]] name = "rustls-webpki" @@ -4440,22 +4181,22 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4585,9 +4326,9 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4607,9 +4348,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "sqlparser" -version = "0.43.1" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95c4bae5aba7cd30bd506f7140026ade63cff5afd778af8854026f9606bf5d4" +checksum = "aaf9c7ff146298ffda83a200f8d5084f08dcee1edfc135fcc1d646a45d50ffd6" dependencies = [ "log", "sqlparser_derive", @@ -4623,7 +4364,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4633,10 +4374,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "streaming-iterator" -version = "0.1.9" +name = "std_prelude" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" +checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe" + +[[package]] +name = "stfu8" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51f1e89f093f99e7432c491c382b88a6860a5adbe6bf02574bf0a08efff1978" [[package]] name = "strum" @@ -4657,7 +4404,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4679,9 +4426,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.59" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -4760,22 +4507,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4881,7 +4628,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4946,17 +4693,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - [[package]] name = "tower" version = "0.4.13" @@ -5005,7 +4741,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -5083,9 +4819,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unindent" @@ -5150,13 +4886,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "vortex-alloc" -version = "0.1.0" -dependencies = [ - "allocator-api2", -] - [[package]] name = "vortex-alp" version = "0.1.0" @@ -5164,9 +4893,7 @@ dependencies = [ "divan", "itertools 0.12.1", "linkme", - "log", "num-traits", - "paste", "serde", "vortex-array", "vortex-dtype", @@ -5178,10 +4905,9 @@ dependencies = [ name = "vortex-array" version = "0.1.0" dependencies = [ - "allocator-api2", - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-schema 51.0.0", + "arrow-array", + "arrow-buffer", + "arrow-schema", "criterion", "enum-iterator", "flatbuffers", @@ -5190,7 +4916,6 @@ dependencies = [ "humansize", "itertools 0.12.1", "lazy_static", - "leb128", "linkme", "log", "num-traits", @@ -5198,8 +4923,6 @@ dependencies = [ "paste", "rand", "serde", - "thiserror", - "vortex-alloc", "vortex-dtype", "vortex-error", "vortex-flatbuffers", @@ -5230,7 +4953,6 @@ dependencies = [ "linkme", "log", "num-traits", - "paste", "rand", "serde", "simplelog", @@ -5248,10 +4970,8 @@ dependencies = [ "flatc", "half", "itertools 0.12.1", - "linkme", "num-traits", "serde", - "thiserror", "vortex-error", "vortex-flatbuffers", "walkdir", @@ -5261,10 +4981,10 @@ dependencies = [ name = "vortex-error" version = "0.1.0" dependencies = [ - "arrow-schema 51.0.0", + "arrow-schema", "flatbuffers", "flexbuffers", - "parquet 51.0.0", + "parquet", "thiserror", ] @@ -5277,9 +4997,7 @@ dependencies = [ "fastlanez", "itertools 0.12.1", "linkme", - "log", "num-traits", - "paste", "rand", "serde", "simplelog", @@ -5294,28 +5012,25 @@ name = "vortex-flatbuffers" version = "0.1.0" dependencies = [ "flatbuffers", - "vortex-error", ] [[package]] name = "vortex-ipc" version = "0.1.0" dependencies = [ - "arrow 51.0.0", - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", - "arrow-ipc 51.0.0", - "arrow-schema 51.0.0", - "arrow-select 51.0.0", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ipc", + "arrow-schema", + "arrow-select", "criterion", "flatbuffers", "flatc", "itertools 0.12.1", - "lending-iterator", "nougat", "rand", "simplelog", - "streaming-iterator", "vortex-alp", "vortex-array", "vortex-dtype", @@ -5330,12 +5045,9 @@ dependencies = [ name = "vortex-ree" version = "0.1.0" dependencies = [ - "arrow-array 51.0.0", - "arrow-buffer 51.0.0", "itertools 0.12.1", "linkme", "num-traits", - "paste", "serde", "vortex-array", "vortex-dtype", @@ -5347,12 +5059,11 @@ dependencies = [ name = "vortex-roaring" version = "0.1.0" dependencies = [ - "arrow-buffer 51.0.0", + "arrow-buffer", "croaring", "linkme", "log", "num-traits", - "paste", "serde", "vortex-array", "vortex-dtype", @@ -5381,7 +5092,6 @@ version = "0.1.0" dependencies = [ "linkme", "serde", - "vortex-alloc", "vortex-array", "vortex-dtype", "vortex-error", @@ -5442,7 +5152,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -5476,7 +5186,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5540,11 +5250,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5753,7 +5463,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index cfe57d0abf..23d04b3205 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,6 @@ members = [ "fastlanez", "fastlanez-sys", "pyvortex", - "vortex-alloc", "vortex-alp", "vortex-array", "vortex-datetime-parts", diff --git a/bench-vortex/Cargo.toml b/bench-vortex/Cargo.toml index be0ccbc042..9a95771109 100644 --- a/bench-vortex/Cargo.toml +++ b/bench-vortex/Cargo.toml @@ -15,13 +15,7 @@ rust-version = { workspace = true } workspace = true [dependencies] -#vortex-alp = { path = "../vortex-alp" } -vortex-roaring = { path = "../vortex-roaring" } -#vortex-zigzag = { path = "../vortex-zigzag" } -arrow = { workspace = true } arrow-array = { workspace = true } -arrow-csv = { workspace = true } -arrow-data = { workspace = true } arrow-select = { workspace = true } bzip2 = { workspace = true } csv = { workspace = true } @@ -29,9 +23,10 @@ enum-iterator = { workspace = true } fs_extra = { workspace = true } humansize = { workspace = true } itertools = { workspace = true } -lance = { version = "0.10.5", features = [] } -lance-arrow-array = { package = "arrow-array", version = "50.0" } -lance-parquet = { package = "parquet", version = "50.0", features = [] } +lance = { version = "0.10.16", features = [] } +#TODO(robert): Add this back once lance is behind our version of arrow again +#lance-arrow-array = { package = "arrow-array", version = "51.0" } +#lance-parquet = { package = "parquet", version = "51.0", features = [] } lazy_static = { workspace = true } log = { workspace = true } parquet = { workspace = true, features = [] } @@ -43,12 +38,12 @@ vortex-alp = { path = "../vortex-alp" } vortex-array = { path = "../vortex-array" } vortex-datetime-parts = { path = "../vortex-datetime-parts" } vortex-dict = { path = "../vortex-dict" } +vortex-dtype = { path = "../vortex-dtype" } vortex-error = { path = "../vortex-error", features = ["parquet"] } vortex-fastlanes = { path = "../vortex-fastlanes" } vortex-ipc = { path = "../vortex-ipc" } vortex-ree = { path = "../vortex-ree" } -vortex-dtype = { path = "../vortex-dtype" } -vortex-zigzag = { path = "../vortex-zigzag" } +vortex-roaring = { path = "../vortex-roaring" } [dev-dependencies] criterion = { workspace = true } diff --git a/bench-vortex/src/data_downloads.rs b/bench-vortex/src/data_downloads.rs index 38dfb5e2c7..8554739e0a 100644 --- a/bench-vortex/src/data_downloads.rs +++ b/bench-vortex/src/data_downloads.rs @@ -7,7 +7,6 @@ use arrow_array::RecordBatchReader; use bzip2::read::BzDecoder; use lance::dataset::WriteParams; use lance::Dataset; -use lance_parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder as LanceParquetRecordBatchReaderBuilder; use log::info; use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder; use tokio::runtime::Runtime; @@ -36,7 +35,7 @@ pub fn download_data(fname: PathBuf, data_url: &str) -> PathBuf { pub fn parquet_to_lance(lance_fname: &Path, parquet_file: &Path) -> VortexResult<PathBuf> { let write_params = WriteParams::default(); let read = File::open(parquet_file)?; - let reader = LanceParquetRecordBatchReaderBuilder::try_new(read) + let reader = ParquetRecordBatchReaderBuilder::try_new(read) .unwrap() .build() .unwrap(); diff --git a/bench-vortex/src/reader.rs b/bench-vortex/src/reader.rs index 479fe3598c..e1687dd1d5 100644 --- a/bench-vortex/src/reader.rs +++ b/bench-vortex/src/reader.rs @@ -14,7 +14,6 @@ use arrow_select::concat::concat_batches; use arrow_select::take::take_record_batch; use itertools::Itertools; use lance::Dataset; -use lance_arrow_array::RecordBatch as LanceRecordBatch; use log::info; use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder; use tokio::runtime::Runtime; @@ -160,13 +159,13 @@ pub fn take_parquet(path: &Path, indices: &[u64]) -> VortexResult<RecordBatch> { Ok(concat_batches(&schema, &batches)?) } -pub fn take_lance(path: &Path, indices: &[u64]) -> LanceRecordBatch { +pub fn take_lance(path: &Path, indices: &[u64]) -> RecordBatch { Runtime::new() .unwrap() .block_on(async_take_lance(path, indices)) } -async fn async_take_lance(path: &Path, indices: &[u64]) -> LanceRecordBatch { +async fn async_take_lance(path: &Path, indices: &[u64]) -> RecordBatch { let dataset = Dataset::open(path.to_str().unwrap()).await.unwrap(); dataset.take(indices, dataset.schema()).await.unwrap() } diff --git a/pyvortex/Cargo.toml b/pyvortex/Cargo.toml index 3f123d1d32..9702d8bc70 100644 --- a/pyvortex/Cargo.toml +++ b/pyvortex/Cargo.toml @@ -29,7 +29,6 @@ vortex-ree = { path = "../vortex-ree" } vortex-roaring = { path = "../vortex-roaring" } vortex-dtype = { path = "../vortex-dtype" } vortex-zigzag = { path = "../vortex-zigzag" } -itertools = { workspace = true } log = { workspace = true } paste = { workspace = true } pyo3 = { workspace = true } diff --git a/vortex-alloc/Cargo.toml b/vortex-alloc/Cargo.toml deleted file mode 100644 index c419058834..0000000000 --- a/vortex-alloc/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "vortex-alloc" -version = { workspace = true } -description = "Vortex allocator" -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 } - -[dependencies] -allocator-api2 = { workspace = true } - -[lints] -workspace = true diff --git a/vortex-alloc/src/alloc.rs b/vortex-alloc/src/alloc.rs deleted file mode 100644 index 21bd33855f..0000000000 --- a/vortex-alloc/src/alloc.rs +++ /dev/null @@ -1,68 +0,0 @@ -use core::ptr::NonNull; - -use allocator_api2::alloc::*; -use allocator_api2::vec::Vec; - -use super::VORTEX_ALIGNMENT; - -#[derive(Copy, Clone, Debug)] -pub struct AlignedAllocator { - min_alignment: usize, -} - -impl AlignedAllocator { - pub const fn with_default_alignment() -> Self { - assert!(VORTEX_ALIGNMENT.is_power_of_two()); - Self { - min_alignment: VORTEX_ALIGNMENT, - } - } - - pub fn min_alignment(&self) -> usize { - self.min_alignment - } - - pub fn is_aligned_to<T>(&self, ptr: *const T) -> bool { - ptr.align_offset(self.min_alignment) == 0 - } - - fn ensure_min_alignment(&self, layout: Layout) -> Result<Layout, LayoutError> { - layout.align_to(self.min_alignment) - } -} - -impl Default for AlignedAllocator { - fn default() -> Self { - Self::with_default_alignment() - } -} - -unsafe impl Allocator for AlignedAllocator { - fn allocate(&self, layout: Layout) -> Result<NonNull<[u8]>, AllocError> { - Global.allocate(self.ensure_min_alignment(layout).map_err(|_| AllocError)?) - } - - unsafe fn deallocate(&self, ptr: NonNull<u8>, layout: Layout) { - Global.deallocate(ptr, self.ensure_min_alignment(layout).unwrap()) - } -} - -pub type AlignedVec<T> = Vec<T, AlignedAllocator>; - -#[cfg(test)] -mod test { - use super::*; - - #[test] - fn test_alignment() { - let alloc = AlignedAllocator::with_default_alignment(); - assert_eq!(VORTEX_ALIGNMENT, 128); - assert_eq!(alloc.min_alignment, VORTEX_ALIGNMENT); - - let ptr = alloc - .allocate(core::alloc::Layout::new::<u8>()) - .unwrap() - .as_ptr() as *const u8; // Cast to thin pointer - assert_eq!(ptr.align_offset(alloc.min_alignment), 0_usize); - } -} diff --git a/vortex-alloc/src/lib.rs b/vortex-alloc/src/lib.rs deleted file mode 100644 index 623d7a7ec5..0000000000 --- a/vortex-alloc/src/lib.rs +++ /dev/null @@ -1,6 +0,0 @@ -mod alloc; - -pub use alloc::*; - -pub const VORTEX_ALIGNMENT: usize = 128; -pub const ALIGNED_ALLOCATOR: AlignedAllocator = AlignedAllocator::with_default_alignment(); diff --git a/vortex-alp/Cargo.toml b/vortex-alp/Cargo.toml index 9e57fd10da..db1060e3e9 100644 --- a/vortex-alp/Cargo.toml +++ b/vortex-alp/Cargo.toml @@ -17,9 +17,7 @@ workspace = true [dependencies] itertools = { workspace = true } linkme = { workspace = true } -log = { workspace = true } num-traits = { workspace = true } -paste = { workspace = true } serde = { workspace = true, features = ["derive"] } vortex-array = { path = "../vortex-array" } vortex-error = { path = "../vortex-error" } diff --git a/vortex-array/Cargo.toml b/vortex-array/Cargo.toml index 154106e1d4..a2ed8ebf1f 100644 --- a/vortex-array/Cargo.toml +++ b/vortex-array/Cargo.toml @@ -19,7 +19,6 @@ path = "src/lib.rs" workspace = true [dependencies] -allocator-api2 = { workspace = true } arrow-array = { workspace = true } arrow-buffer = { workspace = true } arrow-schema = { workspace = true } @@ -29,15 +28,12 @@ flexbuffers = { workspace = true } humansize = { workspace = true } itertools = { workspace = true } lazy_static = { workspace = true } -leb128 = { workspace = true } linkme = { workspace = true } log = { workspace = true } num-traits = { workspace = true } num_enum = { workspace = true } paste = { workspace = true } rand = { workspace = true } -thiserror = { workspace = true } -vortex-alloc = { path = "../vortex-alloc" } vortex-dtype = { path = "../vortex-dtype", features = ["serde"] } vortex-error = { path = "../vortex-error", features = ["flexbuffers"] } vortex-flatbuffers = { path = "../vortex-flatbuffers" } diff --git a/vortex-dict/Cargo.toml b/vortex-dict/Cargo.toml index 3db1d3b95e..b9857b82a1 100644 --- a/vortex-dict/Cargo.toml +++ b/vortex-dict/Cargo.toml @@ -15,9 +15,7 @@ rust-version = { workspace = true } ahash = { workspace = true } hashbrown = { workspace = true } linkme = { workspace = true } -log = { workspace = true } num-traits = { workspace = true } -paste = { workspace = true } serde = { workspace = true } vortex-array = { path = "../vortex-array" } vortex-error = { path = "../vortex-error" } diff --git a/vortex-dtype/Cargo.toml b/vortex-dtype/Cargo.toml index 21effb90f6..2ba80e1064 100644 --- a/vortex-dtype/Cargo.toml +++ b/vortex-dtype/Cargo.toml @@ -19,10 +19,8 @@ path = "src/lib.rs" flatbuffers = { workspace = true } half = { workspace = true } itertools = { workspace = true } -linkme = { workspace = true } num-traits = { workspace = true } serde = { workspace = true, optional = true, features = ["rc"] } -thiserror = { workspace = true } vortex-error = { path = "../vortex-error" } vortex-flatbuffers = { path = "../vortex-flatbuffers" } diff --git a/vortex-fastlanes/Cargo.toml b/vortex-fastlanes/Cargo.toml index 6b286967ef..0187225dd5 100644 --- a/vortex-fastlanes/Cargo.toml +++ b/vortex-fastlanes/Cargo.toml @@ -19,9 +19,7 @@ arrayref = { workspace = true } fastlanez = { path = "../fastlanez" } itertools = { workspace = true } linkme = { workspace = true } -log = { workspace = true } num-traits = { workspace = true } -paste = { workspace = true } serde = { workspace = true } vortex-array = { path = "../vortex-array" } vortex-error = { path = "../vortex-error" } diff --git a/vortex-flatbuffers/Cargo.toml b/vortex-flatbuffers/Cargo.toml index f77c4f287a..85f3eb334b 100644 --- a/vortex-flatbuffers/Cargo.toml +++ b/vortex-flatbuffers/Cargo.toml @@ -12,7 +12,6 @@ rust-version.workspace = true [dependencies] flatbuffers = { workspace = true } -vortex-error = { path = "../vortex-error" } [lints] workspace = true diff --git a/vortex-ipc/Cargo.toml b/vortex-ipc/Cargo.toml index d6c30b2a7b..0a4a337a2c 100644 --- a/vortex-ipc/Cargo.toml +++ b/vortex-ipc/Cargo.toml @@ -15,9 +15,7 @@ rust-version = { workspace = true } arrow-buffer = { workspace = true } flatbuffers = { workspace = true } itertools = { workspace = true } -lending-iterator = "0.1.7" nougat = "0.2.4" -streaming-iterator = "0.1.9" vortex-array = { path = "../vortex-array" } vortex-error = { path = "../vortex-error" } vortex-flatbuffers = { path = "../vortex-flatbuffers" } diff --git a/vortex-ree/Cargo.toml b/vortex-ree/Cargo.toml index 2e8d54ba06..4996bfa468 100644 --- a/vortex-ree/Cargo.toml +++ b/vortex-ree/Cargo.toml @@ -12,12 +12,9 @@ edition = { workspace = true } rust-version = { workspace = true } [dependencies] -arrow-array = { workspace = true } -arrow-buffer = { workspace = true } itertools = { workspace = true } linkme = { workspace = true } num-traits = { workspace = true } -paste = { workspace = true } serde = { workspace = true } vortex-array = { path = "../vortex-array" } vortex-error = { path = "../vortex-error" } diff --git a/vortex-roaring/Cargo.toml b/vortex-roaring/Cargo.toml index 5f609b9346..a31d9015a1 100644 --- a/vortex-roaring/Cargo.toml +++ b/vortex-roaring/Cargo.toml @@ -22,7 +22,6 @@ croaring = { workspace = true } num-traits = { workspace = true } log = { workspace = true } serde = { workspace = true } -paste = { workspace = true } [lints] workspace = true diff --git a/vortex-zigzag/Cargo.toml b/vortex-zigzag/Cargo.toml index ce25f8b38a..43f5d3930a 100644 --- a/vortex-zigzag/Cargo.toml +++ b/vortex-zigzag/Cargo.toml @@ -13,14 +13,15 @@ rust-version = { workspace = true } [dependencies] linkme = { workspace = true } -vortex-alloc = { path = "../vortex-alloc" } vortex-array = { path = "../vortex-array" } vortex-error = { path = "../vortex-error" } -vortex-fastlanes = { path = "../vortex-fastlanes" } vortex-dtype = { path = "../vortex-dtype" } vortex-scalar = { path = "../vortex-scalar" } zigzag = { workspace = true } serde = { workspace = true, features = ["derive"] } +[dev-dependencies] +vortex-fastlanes = { path = "../vortex-fastlanes" } + [lints] workspace = true diff --git a/vortex-zigzag/src/compress.rs b/vortex-zigzag/src/compress.rs index 43d7d0bc77..090effd1b1 100644 --- a/vortex-zigzag/src/compress.rs +++ b/vortex-zigzag/src/compress.rs @@ -3,7 +3,6 @@ use vortex::compress::{CompressConfig, CompressCtx, EncodingCompression}; use vortex::stats::{ArrayStatistics, Stat}; use vortex::validity::Validity; use vortex::{Array, IntoArray, OwnedArray}; -use vortex_alloc::{AlignedVec, ALIGNED_ALLOCATOR}; use vortex_dtype::{NativePType, PType}; use vortex_error::VortexResult; use zigzag::ZigZag as ExternalZigZag; @@ -99,9 +98,9 @@ fn zigzag_decode_primitive<'a, T: ExternalZigZag + NativePType>( where <T as ExternalZigZag>::UInt: NativePType, { - let mut encoded: AlignedVec<T> = AlignedVec::with_capacity_in(values.len(), ALIGNED_ALLOCATOR); + let mut encoded = Vec::with_capacity(values.len()); encoded.extend(values.iter().map(|v| T::decode(*v))); - PrimitiveArray::from_vec(encoded.to_vec(), validity) + PrimitiveArray::from_vec(encoded, validity) } #[cfg(test)]