Browse Source

deps: upgrade pyo3 and arrow deps

Arrow needs to be upgraded alongside pyo3 because they both link to python.

NOTE: Arrow marked `ffi::from_ffi` unsafe.
https://github.com/apache/arrow-rs/pull/5080
tags/v0.3.5-rc0
Michael-J-Ward 1 year ago
parent
commit
cd8ed19620
6 changed files with 92 additions and 68 deletions
  1. +82
    -58
      Cargo.lock
  2. +6
    -6
      Cargo.toml
  3. +1
    -1
      apis/rust/operator/src/raw.rs
  4. +1
    -1
      apis/rust/operator/types/src/lib.rs
  5. +1
    -1
      binaries/runtime/src/operator/shared_lib.rs
  6. +1
    -1
      tool_nodes/dora-record/Cargo.toml

+ 82
- 58
Cargo.lock View File

@@ -317,11 +317,10 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"

[[package]]
name = "arrow"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8919668503a4f2d8b6da96fa7c16e93046bfb3412ffcfa1e5dc7d2e3adcb378"
checksum = "7ae9728f104939be6d8d9b368a354b4929b0569160ea1641f0721b55a861ce38"
dependencies = [
"ahash",
"arrow-arith",
"arrow-array",
"arrow-buffer",
@@ -340,9 +339,9 @@ dependencies = [

[[package]]
name = "arrow-arith"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef983914f477d4278b068f13b3224b7d19eb2b807ac9048544d3bfebdf2554c4"
checksum = "a7029a5b3efbeafbf4a12d12dc16b8f9e9bff20a410b8c25c5d28acc089e1043"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -355,9 +354,9 @@ dependencies = [

[[package]]
name = "arrow-array"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6eaf89041fa5937940ae390294ece29e1db584f46d995608d6e5fe65a2e0e9b"
checksum = "d33238427c60271710695f17742f45b1a5dc5bcfc5c15331c25ddfe7abf70d97"
dependencies = [
"ahash",
"arrow-buffer",
@@ -371,9 +370,9 @@ dependencies = [

[[package]]
name = "arrow-buffer"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55512d988c6fbd76e514fd3ff537ac50b0a675da5a245e4fdad77ecfd654205f"
checksum = "fe9b95e825ae838efaf77e366c00d3fc8cca78134c9db497d6bda425f2e7b7c1"
dependencies = [
"bytes",
"half",
@@ -382,26 +381,29 @@ dependencies = [

[[package]]
name = "arrow-cast"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "655ee51a2156ba5375931ce21c1b2494b1d9260e6dcdc6d4db9060c37dc3325b"
checksum = "87cf8385a9d5b5fcde771661dd07652b79b9139fea66193eda6a88664400ccab"
dependencies = [
"arrow-array",
"arrow-buffer",
"arrow-data",
"arrow-schema",
"arrow-select",
"atoi",
"base64 0.22.1",
"chrono",
"half",
"lexical-core",
"num",
"ryu",
]

[[package]]
name = "arrow-csv"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "258bb689997ad5b6660b3ce3638bd6b383d668ec555ed41ad7c6559cbb2e4f91"
checksum = "cea5068bef430a86690059665e40034625ec323ffa4dd21972048eebb0127adc"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -418,9 +420,9 @@ dependencies = [

[[package]]
name = "arrow-data"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6dc2b9fec74763427e2e5575b8cc31ce96ba4c9b4eb05ce40e0616d9fad12461"
checksum = "cb29be98f987bcf217b070512bb7afba2f65180858bca462edf4a39d84a23e10"
dependencies = [
"arrow-buffer",
"arrow-schema",
@@ -440,23 +442,23 @@ dependencies = [

[[package]]
name = "arrow-ipc"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6eaa6ab203cc6d89b7eaa1ac781c1dfeef325454c5d5a0419017f95e6bafc03c"
checksum = "ffc68f6523970aa6f7ce1dc9a33a7d9284cfb9af77d4ad3e617dbe5d79cc6ec8"
dependencies = [
"arrow-array",
"arrow-buffer",
"arrow-cast",
"arrow-data",
"arrow-schema",
"flatbuffers",
"flatbuffers 24.3.25",
]

[[package]]
name = "arrow-json"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb64e30d9b73f66fdc5c52d5f4cf69bbf03d62f64ffeafa0715590a5320baed7"
checksum = "2041380f94bd6437ab648e6c2085a045e45a0c44f91a1b9a4fe3fed3d379bfb1"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -474,9 +476,9 @@ dependencies = [

[[package]]
name = "arrow-ord"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9a818951c0d11c428dda03e908175969c262629dd20bd0850bd6c7a8c3bfe48"
checksum = "fcb56ed1547004e12203652f12fe12e824161ff9d1e5cf2a7dc4ff02ba94f413"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -489,9 +491,9 @@ dependencies = [

[[package]]
name = "arrow-row"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5d664318bc05f930559fc088888f0f7174d3c5bc888c0f4f9ae8f23aa398ba3"
checksum = "575b42f1fc588f2da6977b94a5ca565459f5ab07b60545e17243fb9a7ed6d43e"
dependencies = [
"ahash",
"arrow-array",
@@ -504,9 +506,9 @@ dependencies = [

[[package]]
name = "arrow-schema"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaf4d737bba93da59f16129bec21e087aed0be84ff840e74146d4703879436cb"
checksum = "32aae6a60458a2389c0da89c9de0b7932427776127da1a738e2efc21d32f3393"
dependencies = [
"bitflags 2.5.0",
"serde",
@@ -514,9 +516,9 @@ dependencies = [

[[package]]
name = "arrow-select"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374c4c3b812ecc2118727b892252a4a4308f87a8aca1dbf09f3ce4bc578e668a"
checksum = "de36abaef8767b4220d7b4a8c2fe5ffc78b47db81b03d77e2136091c3ba39102"
dependencies = [
"ahash",
"arrow-array",
@@ -528,15 +530,16 @@ dependencies = [

[[package]]
name = "arrow-string"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15aed5624bb23da09142f58502b59c23f5bea607393298bb81dab1ce60fc769"
checksum = "e435ada8409bcafc910bc3e0077f532a4daa20e99060a496685c0e3e53cc2597"
dependencies = [
"arrow-array",
"arrow-buffer",
"arrow-data",
"arrow-schema",
"arrow-select",
"memchr",
"num",
"regex",
"regex-syntax 0.8.3",
@@ -871,6 +874,15 @@ dependencies = [
"syn 2.0.65",
]

[[package]]
name = "atoi"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
dependencies = [
"num-traits",
]

[[package]]
name = "atomic"
version = "0.5.3"
@@ -1228,9 +1240,9 @@ dependencies = [

[[package]]
name = "brotli"
version = "3.5.0"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -1239,9 +1251,9 @@ dependencies = [

[[package]]
name = "brotli-decompressor"
version = "2.5.1"
version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -3197,6 +3209,16 @@ dependencies = [
"rustc_version",
]

[[package]]
name = "flatbuffers"
version = "24.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
dependencies = [
"bitflags 1.3.2",
"rustc_version",
]

[[package]]
name = "flate2"
version = "1.0.30"
@@ -3924,7 +3946,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
"socket2 0.4.10",
"socket2 0.5.7",
"tokio",
"tower-service",
"tracing",
@@ -5855,9 +5877,9 @@ dependencies = [

[[package]]
name = "parquet"
version = "48.0.1"
version = "52.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bfe55df96e3f02f11bf197ae37d91bb79801631f82f6195dd196ef521df3597"
checksum = "29c3b5322cc1bbf67f11c079c42be41a55949099b78732f7dba9e15edde40eab"
dependencies = [
"ahash",
"arrow-array",
@@ -5867,12 +5889,13 @@ dependencies = [
"arrow-ipc",
"arrow-schema",
"arrow-select",
"base64 0.21.7",
"base64 0.22.1",
"brotli",
"bytes",
"chrono",
"flate2",
"futures",
"half",
"hashbrown 0.14.5",
"lz4_flex",
"num",
@@ -5884,6 +5907,7 @@ dependencies = [
"tokio",
"twox-hash",
"zstd",
"zstd-sys",
]

[[package]]
@@ -6453,9 +6477,9 @@ dependencies = [

[[package]]
name = "pyo3"
version = "0.20.3"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
dependencies = [
"cfg-if 1.0.0",
"eyre",
@@ -6473,9 +6497,9 @@ dependencies = [

[[package]]
name = "pyo3-build-config"
version = "0.20.3"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
dependencies = [
"once_cell",
"target-lexicon",
@@ -6483,9 +6507,9 @@ dependencies = [

[[package]]
name = "pyo3-ffi"
version = "0.20.3"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
dependencies = [
"libc",
"pyo3-build-config",
@@ -6493,9 +6517,9 @@ dependencies = [

[[package]]
name = "pyo3-macros"
version = "0.20.3"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
@@ -6505,9 +6529,9 @@ dependencies = [

[[package]]
name = "pyo3-macros-backend"
version = "0.20.3"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
dependencies = [
"heck 0.4.1",
"proc-macro2",
@@ -6518,9 +6542,9 @@ dependencies = [

[[package]]
name = "pythonize"
version = "0.20.0"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffd1c3ef39c725d63db5f9bc455461bafd80540cb7824c61afb823501921a850"
checksum = "9d0664248812c38cc55a4ed07f88e4df516ce82604b93b1ffdc041aa77a6cb3c"
dependencies = [
"pyo3",
"serde",
@@ -7453,7 +7477,7 @@ dependencies = [
"camino",
"clang-format",
"convert_case",
"flatbuffers",
"flatbuffers 23.5.26",
"indent",
"itertools 0.12.1",
"prettyplease 0.2.20",
@@ -9559,7 +9583,7 @@ version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
"cfg-if 0.1.10",
"cfg-if 1.0.0",
"static_assertions",
]

@@ -11326,27 +11350,27 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"

[[package]]
name = "zstd"
version = "0.13.1"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
dependencies = [
"zstd-safe",
]

[[package]]
name = "zstd-safe"
version = "7.1.0"
version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
dependencies = [
"zstd-sys",
]

[[package]]
name = "zstd-sys"
version = "2.0.10+zstd.1.5.6"
version = "2.0.9+zstd.1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
dependencies = [
"cc",
"pkg-config",


+ 6
- 6
Cargo.toml View File

@@ -66,12 +66,12 @@ dora-coordinator = { version = "0.3.4", path = "binaries/coordinator" }
dora-ros2-bridge = { path = "libraries/extensions/ros2-bridge" }
dora-ros2-bridge-msg-gen = { path = "libraries/extensions/ros2-bridge/msg-gen" }
dora-ros2-bridge-python = { path = "libraries/extensions/ros2-bridge/python" }
arrow = "48.0.0"
arrow-schema = "48.0.0"
arrow-data = "48.0.0"
arrow-array = "48.0.0"
pyo3 = "0.20.0"
pythonize = "0.20.0"
arrow = { version = "52" }
arrow-schema = { version = "52" }
arrow-data = { version = "52" }
arrow-array = { version = "52" }
pyo3 = "0.21"
pythonize = "0.21"

[package]
name = "dora-examples"


+ 1
- 1
apis/rust/operator/src/raw.rs View File

@@ -44,7 +44,7 @@ pub unsafe fn dora_on_event<O: DoraOperator>(
status: DoraStatus::Continue,
};
};
let data = arrow::ffi::from_ffi(data_array, &input.schema);
let data = unsafe { arrow::ffi::from_ffi(data_array, &input.schema) };

match data {
Ok(data) => Event::Input {


+ 1
- 1
apis/rust/operator/types/src/lib.rs View File

@@ -166,7 +166,7 @@ pub fn dora_free_input_id(_input_id: char_p_boxed) {}
#[ffi_export]
pub fn dora_read_data(input: &mut Input) -> Option<safer_ffi::Vec<u8>> {
let data_array = input.data_array.take()?;
let data = arrow::ffi::from_ffi(data_array, &input.schema).ok()?;
let data = unsafe {arrow::ffi::from_ffi(data_array, &input.schema).ok()? };
let array = ArrowData(arrow::array::make_array(data));
let bytes: &[u8] = TryFrom::try_from(&array).ok()?;
Some(bytes.to_owned().into())


+ 1
- 1
binaries/runtime/src/operator/shared_lib.rs View File

@@ -124,7 +124,7 @@ impl<'lib> SharedLibraryOperator<'lib> {
..Default::default()
};

let arrow_array = match arrow::ffi::from_ffi(data_array, &schema) {
let arrow_array = match unsafe { arrow::ffi::from_ffi(data_array, &schema) } {
Ok(a) => a,
Err(err) => return DoraResult::from_error(err.to_string()),
};


+ 1
- 1
tool_nodes/dora-record/Cargo.toml View File

@@ -14,4 +14,4 @@ dora-node-api = { workspace = true, features = ["tracing"] }
eyre = "0.6.8"
chrono = "0.4.31"
dora-tracing = { workspace = true }
parquet = { version = "48.0.0", features = ["async"] }
parquet = { version = "52", features = ["async"] }

Loading…
Cancel
Save