From 02b452ae5c34f1f5921292ea76e23de2800bedf7 Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Sat, 30 Sep 2023 12:37:42 -0400 Subject: [PATCH 1/3] Bump arrow and parquet to 47 --- Cargo.lock | 294 ++++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 4 +- 2 files changed, 236 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 197b168f..6bad5620 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,17 +82,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04a8801ebb147ad240b2d978d3ab9f73c9ccd4557ba6a03e7800496770ed10e0" dependencies = [ "ahash", - "arrow-arith", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ipc", - "arrow-ord", - "arrow-row", - "arrow-schema", - "arrow-select", - "arrow-string", + "arrow-arith 46.0.0", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-cast 46.0.0", + "arrow-data 46.0.0", + "arrow-ipc 46.0.0", + "arrow-ord 46.0.0", + "arrow-row 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", + "arrow-string 46.0.0", +] + +[[package]] +name = "arrow" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fab9e93ba8ce88a37d5a30dce4b9913b75413dc1ac56cb5d72e5a840543f829" +dependencies = [ + "ahash", + "arrow-arith 47.0.0", + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-cast 47.0.0", + "arrow-data 47.0.0", + "arrow-ipc 47.0.0", + "arrow-ord 47.0.0", + "arrow-row 47.0.0", + "arrow-schema 47.0.0", + "arrow-select 47.0.0", + "arrow-string 47.0.0", ] [[package]] @@ -101,10 +121,25 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "895263144bd4a69751cbe6a34a53f26626e19770b313a9fa792c415cd0e78f11" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-arith" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc1d4e368e87ad9ee64f28b9577a3834ce10fe2703a26b28417d485bbbdff956" +dependencies = [ + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-data 47.0.0", + "arrow-schema 47.0.0", "chrono", "half", "num", @@ -117,9 +152,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "226fdc6c3a4ae154a74c24091d36a90b514f0ed7112f5b8322c1d8f354d8e20d" dependencies = [ "ahash", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "chrono", + "half", + "hashbrown 0.14.0", + "num", +] + +[[package]] +name = "arrow-array" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d02efa7253ede102d45a4e802a129e83bcc3f49884cab795b1ac223918e4318d" +dependencies = [ + "ahash", + "arrow-buffer 47.0.0", + "arrow-data 47.0.0", + "arrow-schema 47.0.0", "chrono", "half", "hashbrown 0.14.0", @@ -137,17 +188,45 @@ dependencies = [ "num", ] +[[package]] +name = "arrow-buffer" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda119225204141138cb0541c692fbfef0e875ba01bfdeaed09e9d354f9d6195" +dependencies = [ + "bytes", + "half", + "num", +] + [[package]] name = "arrow-cast" version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35e8b9990733a9b635f656efda3c9b8308c7a19695c9ec2c7046dd154f9b144b" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", + "chrono", + "half", + "lexical-core", + "num", +] + +[[package]] +name = "arrow-cast" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d825d51b9968868d50bc5af92388754056796dbc62a4e25307d588a1fc84dee" +dependencies = [ + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-data 47.0.0", + "arrow-schema 47.0.0", + "arrow-select 47.0.0", "chrono", "half", "lexical-core", @@ -160,8 +239,20 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da900f31ff01a0a84da0572209be72b2b6f980f3ea58803635de47913191c188" dependencies = [ - "arrow-buffer", - "arrow-schema", + "arrow-buffer 46.0.0", + "arrow-schema 46.0.0", + "half", + "num", +] + +[[package]] +name = "arrow-data" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "475a4c3699c8b4095ca61cecf15da6f67841847a5f5aac983ccb9a377d02f73a" +dependencies = [ + "arrow-buffer 47.0.0", + "arrow-schema 47.0.0", "half", "num", ] @@ -182,11 +273,25 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2707a8d7ee2d345d045283ece3ae43416175873483e5d96319c929da542a0b1f" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-cast 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "flatbuffers", +] + +[[package]] +name = "arrow-ipc" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1248005c8ac549f869b7a840859d942bf62471479c1a2d82659d453eebcd166a" +dependencies = [ + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-cast 47.0.0", + "arrow-data 47.0.0", + "arrow-schema 47.0.0", "flatbuffers", ] @@ -196,11 +301,26 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "584325c91293abbca7aaaabf8da9fe303245d641f5f4a18a6058dc68009c7ebf" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", + "half", + "num", +] + +[[package]] +name = "arrow-ord" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b87aa408ea6a6300e49eb2eba0c032c88ed9dc19e0a9948489c55efdca71f4" +dependencies = [ + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-data 47.0.0", + "arrow-schema 47.0.0", + "arrow-select 47.0.0", "half", "num", ] @@ -212,10 +332,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e32afc1329f7b372463b21c6ca502b07cf237e1ed420d87706c1770bb0ebd38" dependencies = [ "ahash", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "half", + "hashbrown 0.14.0", +] + +[[package]] +name = "arrow-row" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114a348ab581e7c9b6908fcab23cb39ff9f060eb19e72b13f8fb8eaa37f65d22" +dependencies = [ + "ahash", + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-data 47.0.0", + "arrow-schema 47.0.0", "half", "hashbrown 0.14.0", ] @@ -229,16 +364,39 @@ dependencies = [ "bitflags 2.4.0", ] +[[package]] +name = "arrow-schema" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1d179c117b158853e0101bfbed5615e86fe97ee356b4af901f1c5001e1ce4b" +dependencies = [ + "bitflags 2.4.0", +] + [[package]] name = "arrow-select" version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b3ca55356d1eae07cf48808d8c462cea674393ae6ad1e0b120f40b422eb2b4" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "num", +] + +[[package]] +name = "arrow-select" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5c71e003202e67e9db139e5278c79f5520bb79922261dfe140e4637ee8b6108" +dependencies = [ + "ahash", + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-data 47.0.0", + "arrow-schema 47.0.0", "num", ] @@ -248,11 +406,27 @@ version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1433ce02590cae68da0a18ed3a3ed868ffac2c6f24c533ddd2067f7ee04b4a" dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", + "arrow-array 46.0.0", + "arrow-buffer 46.0.0", + "arrow-data 46.0.0", + "arrow-schema 46.0.0", + "arrow-select 46.0.0", + "num", + "regex", + "regex-syntax", +] + +[[package]] +name = "arrow-string" +version = "47.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cebbb282d6b9244895f4a9a912e55e57bce112554c7fa91fcec5459cb421ab" +dependencies = [ + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-data 47.0.0", + "arrow-schema 47.0.0", + "arrow-select 47.0.0", "num", "regex", "regex-syntax", @@ -263,8 +437,8 @@ name = "arrow-wasm" version = "0.1.0" source = "git+https://github.com/kylebarron/arrow-wasm?rev=13f8ac39f4f78017f2d434b6bf2cb05e7996c1b0#13f8ac39f4f78017f2d434b6bf2cb05e7996c1b0" dependencies = [ - "arrow", - "arrow-schema", + "arrow 46.0.0", + "arrow-schema 46.0.0", "arrow2", "getrandom", "js-sys", @@ -1121,18 +1295,18 @@ dependencies = [ [[package]] name = "parquet" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad2cba786ae07da4d73371a88b9e0f9d3ffac1a9badc83922e0e15814f5c5fa" +checksum = "0463cc3b256d5f50408c49a4be3a16674f4c8ceef60941709620a062b1f6bf4d" dependencies = [ "ahash", - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-ipc", - "arrow-schema", - "arrow-select", + "arrow-array 47.0.0", + "arrow-buffer 47.0.0", + "arrow-cast 47.0.0", + "arrow-data 47.0.0", + "arrow-ipc 47.0.0", + "arrow-schema 47.0.0", + "arrow-select 47.0.0", "base64", "brotli", "bytes", @@ -1165,7 +1339,7 @@ dependencies = [ name = "parquet-wasm" version = "0.5.0-alpha.1" dependencies = [ - "arrow", + "arrow 47.0.0", "arrow-wasm", "arrow2", "async-compat", diff --git a/Cargo.toml b/Cargo.toml index 279f186f..407f4de5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,11 +85,11 @@ arrow2 = { version = "0.18", optional = true, features = [ ] } parquet2 = { version = "0.17", default_features = false, optional = true } -arrow = { version = "46.0", default-features = false, optional = true, features = [ +arrow = { version = "47.0", default-features = false, optional = true, features = [ "ipc", "ffi", ] } -parquet = { version = "46.0", default-features = false, optional = true, features = [ +parquet = { version = "47.0", default-features = false, optional = true, features = [ "arrow", "base64", ] } From a38f48ac43f95e9f7755b7e966f228ca18cbddc4 Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Sat, 30 Sep 2023 12:47:02 -0400 Subject: [PATCH 2/3] add arrow2 feature on arrow-wasm --- Cargo.lock | 291 +++++++++++------------------------------------------ Cargo.toml | 8 +- 2 files changed, 65 insertions(+), 234 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6bad5620..2a876496 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -75,26 +75,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" -[[package]] -name = "arrow" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a8801ebb147ad240b2d978d3ab9f73c9ccd4557ba6a03e7800496770ed10e0" -dependencies = [ - "ahash", - "arrow-arith 46.0.0", - "arrow-array 46.0.0", - "arrow-buffer 46.0.0", - "arrow-cast 46.0.0", - "arrow-data 46.0.0", - "arrow-ipc 46.0.0", - "arrow-ord 46.0.0", - "arrow-row 46.0.0", - "arrow-schema 46.0.0", - "arrow-select 46.0.0", - "arrow-string 46.0.0", -] - [[package]] name = "arrow" version = "47.0.0" @@ -102,32 +82,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fab9e93ba8ce88a37d5a30dce4b9913b75413dc1ac56cb5d72e5a840543f829" dependencies = [ "ahash", - "arrow-arith 47.0.0", - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-cast 47.0.0", - "arrow-data 47.0.0", - "arrow-ipc 47.0.0", - "arrow-ord 47.0.0", - "arrow-row 47.0.0", - "arrow-schema 47.0.0", - "arrow-select 47.0.0", - "arrow-string 47.0.0", -] - -[[package]] -name = "arrow-arith" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895263144bd4a69751cbe6a34a53f26626e19770b313a9fa792c415cd0e78f11" -dependencies = [ - "arrow-array 46.0.0", - "arrow-buffer 46.0.0", - "arrow-data 46.0.0", - "arrow-schema 46.0.0", - "chrono", - "half", - "num", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", ] [[package]] @@ -136,31 +101,15 @@ version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc1d4e368e87ad9ee64f28b9577a3834ce10fe2703a26b28417d485bbbdff956" dependencies = [ - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-data 47.0.0", - "arrow-schema 47.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "chrono", "half", "num", ] -[[package]] -name = "arrow-array" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226fdc6c3a4ae154a74c24091d36a90b514f0ed7112f5b8322c1d8f354d8e20d" -dependencies = [ - "ahash", - "arrow-buffer 46.0.0", - "arrow-data 46.0.0", - "arrow-schema 46.0.0", - "chrono", - "half", - "hashbrown 0.14.0", - "num", -] - [[package]] name = "arrow-array" version = "47.0.0" @@ -168,26 +117,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d02efa7253ede102d45a4e802a129e83bcc3f49884cab795b1ac223918e4318d" dependencies = [ "ahash", - "arrow-buffer 47.0.0", - "arrow-data 47.0.0", - "arrow-schema 47.0.0", + "arrow-buffer", + "arrow-data", + "arrow-schema", "chrono", "half", "hashbrown 0.14.0", "num", ] -[[package]] -name = "arrow-buffer" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4843af4dd679c2f35b69c572874da8fde33be53eb549a5fb128e7a4b763510" -dependencies = [ - "bytes", - "half", - "num", -] - [[package]] name = "arrow-buffer" version = "47.0.0" @@ -199,60 +137,31 @@ dependencies = [ "num", ] -[[package]] -name = "arrow-cast" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e8b9990733a9b635f656efda3c9b8308c7a19695c9ec2c7046dd154f9b144b" -dependencies = [ - "arrow-array 46.0.0", - "arrow-buffer 46.0.0", - "arrow-data 46.0.0", - "arrow-schema 46.0.0", - "arrow-select 46.0.0", - "chrono", - "half", - "lexical-core", - "num", -] - [[package]] name = "arrow-cast" version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d825d51b9968868d50bc5af92388754056796dbc62a4e25307d588a1fc84dee" dependencies = [ - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-data 47.0.0", - "arrow-schema 47.0.0", - "arrow-select 47.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "chrono", "half", "lexical-core", "num", ] -[[package]] -name = "arrow-data" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da900f31ff01a0a84da0572209be72b2b6f980f3ea58803635de47913191c188" -dependencies = [ - "arrow-buffer 46.0.0", - "arrow-schema 46.0.0", - "half", - "num", -] - [[package]] name = "arrow-data" version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "475a4c3699c8b4095ca61cecf15da6f67841847a5f5aac983ccb9a377d02f73a" dependencies = [ - "arrow-buffer 47.0.0", - "arrow-schema 47.0.0", + "arrow-buffer", + "arrow-schema", "half", "num", ] @@ -267,79 +176,35 @@ dependencies = [ "serde", ] -[[package]] -name = "arrow-ipc" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2707a8d7ee2d345d045283ece3ae43416175873483e5d96319c929da542a0b1f" -dependencies = [ - "arrow-array 46.0.0", - "arrow-buffer 46.0.0", - "arrow-cast 46.0.0", - "arrow-data 46.0.0", - "arrow-schema 46.0.0", - "flatbuffers", -] - [[package]] name = "arrow-ipc" version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1248005c8ac549f869b7a840859d942bf62471479c1a2d82659d453eebcd166a" dependencies = [ - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-cast 47.0.0", - "arrow-data 47.0.0", - "arrow-schema 47.0.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", "flatbuffers", ] -[[package]] -name = "arrow-ord" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584325c91293abbca7aaaabf8da9fe303245d641f5f4a18a6058dc68009c7ebf" -dependencies = [ - "arrow-array 46.0.0", - "arrow-buffer 46.0.0", - "arrow-data 46.0.0", - "arrow-schema 46.0.0", - "arrow-select 46.0.0", - "half", - "num", -] - [[package]] name = "arrow-ord" version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03b87aa408ea6a6300e49eb2eba0c032c88ed9dc19e0a9948489c55efdca71f4" dependencies = [ - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-data 47.0.0", - "arrow-schema 47.0.0", - "arrow-select 47.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "half", "num", ] -[[package]] -name = "arrow-row" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e32afc1329f7b372463b21c6ca502b07cf237e1ed420d87706c1770bb0ebd38" -dependencies = [ - "ahash", - "arrow-array 46.0.0", - "arrow-buffer 46.0.0", - "arrow-data 46.0.0", - "arrow-schema 46.0.0", - "half", - "hashbrown 0.14.0", -] - [[package]] name = "arrow-row" version = "47.0.0" @@ -347,23 +212,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "114a348ab581e7c9b6908fcab23cb39ff9f060eb19e72b13f8fb8eaa37f65d22" dependencies = [ "ahash", - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-data 47.0.0", - "arrow-schema 47.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "half", "hashbrown 0.14.0", ] -[[package]] -name = "arrow-schema" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b104f5daa730f00fde22adc03a12aa5a2ae9ccbbf99cbd53d284119ddc90e03d" -dependencies = [ - "bitflags 2.4.0", -] - [[package]] name = "arrow-schema" version = "47.0.0" @@ -373,19 +229,6 @@ dependencies = [ "bitflags 2.4.0", ] -[[package]] -name = "arrow-select" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b3ca55356d1eae07cf48808d8c462cea674393ae6ad1e0b120f40b422eb2b4" -dependencies = [ - "arrow-array 46.0.0", - "arrow-buffer 46.0.0", - "arrow-data 46.0.0", - "arrow-schema 46.0.0", - "num", -] - [[package]] name = "arrow-select" version = "47.0.0" @@ -393,27 +236,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5c71e003202e67e9db139e5278c79f5520bb79922261dfe140e4637ee8b6108" dependencies = [ "ahash", - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-data 47.0.0", - "arrow-schema 47.0.0", - "num", -] - -[[package]] -name = "arrow-string" -version = "46.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1433ce02590cae68da0a18ed3a3ed868ffac2c6f24c533ddd2067f7ee04b4a" -dependencies = [ - "arrow-array 46.0.0", - "arrow-buffer 46.0.0", - "arrow-data 46.0.0", - "arrow-schema 46.0.0", - "arrow-select 46.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "num", - "regex", - "regex-syntax", ] [[package]] @@ -422,11 +249,11 @@ version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cebbb282d6b9244895f4a9a912e55e57bce112554c7fa91fcec5459cb421ab" dependencies = [ - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-data 47.0.0", - "arrow-schema 47.0.0", - "arrow-select 47.0.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "num", "regex", "regex-syntax", @@ -435,10 +262,10 @@ dependencies = [ [[package]] name = "arrow-wasm" version = "0.1.0" -source = "git+https://github.com/kylebarron/arrow-wasm?rev=13f8ac39f4f78017f2d434b6bf2cb05e7996c1b0#13f8ac39f4f78017f2d434b6bf2cb05e7996c1b0" +source = "git+https://github.com/kylebarron/arrow-wasm?rev=84bcf954212306c5b25a5361fe2ae285e9859a48#84bcf954212306c5b25a5361fe2ae285e9859a48" dependencies = [ - "arrow 46.0.0", - "arrow-schema 46.0.0", + "arrow", + "arrow-schema", "arrow2", "getrandom", "js-sys", @@ -1300,13 +1127,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0463cc3b256d5f50408c49a4be3a16674f4c8ceef60941709620a062b1f6bf4d" dependencies = [ "ahash", - "arrow-array 47.0.0", - "arrow-buffer 47.0.0", - "arrow-cast 47.0.0", - "arrow-data 47.0.0", - "arrow-ipc 47.0.0", - "arrow-schema 47.0.0", - "arrow-select 47.0.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-schema", + "arrow-select", "base64", "brotli", "bytes", @@ -1339,7 +1166,7 @@ dependencies = [ name = "parquet-wasm" version = "0.5.0-alpha.1" dependencies = [ - "arrow 47.0.0", + "arrow", "arrow-wasm", "arrow2", "async-compat", diff --git a/Cargo.toml b/Cargo.toml index 407f4de5..7b539783 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,8 +76,12 @@ js-sys = "0.3.60" getrandom = { version = "0.2.6", features = ["js"] } thiserror = "1.0" -arrow-wasm = { git = "https://github.com/kylebarron/arrow-wasm", rev = "13f8ac39f4f78017f2d434b6bf2cb05e7996c1b0" } -# arrow-wasm = { path = "/Users/kyle/github/rust/arrow-wasm" } +arrow-wasm = { git = "https://github.com/kylebarron/arrow-wasm", rev = "84bcf954212306c5b25a5361fe2ae285e9859a48", features = [ + "arrow2", +] } +# arrow-wasm = { path = "/Users/kyle/github/rust/arrow-wasm", features = [ +# "arrow2", +# ] } arrow2 = { version = "0.18", optional = true, features = [ "io_ipc", From df9ae9efa108f782f67dc46fb5ab7e75c722112b Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Sat, 30 Sep 2023 12:49:09 -0400 Subject: [PATCH 3/3] revert manual featue --- Cargo.toml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7b539783..2d5a735b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,12 +76,8 @@ js-sys = "0.3.60" getrandom = { version = "0.2.6", features = ["js"] } thiserror = "1.0" -arrow-wasm = { git = "https://github.com/kylebarron/arrow-wasm", rev = "84bcf954212306c5b25a5361fe2ae285e9859a48", features = [ - "arrow2", -] } -# arrow-wasm = { path = "/Users/kyle/github/rust/arrow-wasm", features = [ -# "arrow2", -# ] } +arrow-wasm = { git = "https://github.com/kylebarron/arrow-wasm", rev = "84bcf954212306c5b25a5361fe2ae285e9859a48" } +# arrow-wasm = { path = "/Users/kyle/github/rust/arrow-wasm" } arrow2 = { version = "0.18", optional = true, features = [ "io_ipc",