build(deps): bump arrow-udf to use arrow 52 (#18609)

Signed-off-by: xxchan <[email protected]>
risingwavelabs · Sep 20, 2024 · 5652a1f · 5652a1f
1 parent 3c94345
commit 5652a1f
Show file tree

Hide file tree

Showing 8 changed files with 202 additions and 218 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -136,22 +136,21 @@ tonic-build = { package = "madsim-tonic-build", version = "0.5" }
 otlp-embedded = { git = "https://github.com/risingwavelabs/otlp-embedded", rev = "e6cd165b9bc85783b42c106e99186b86b73e3507" }
 prost = { version = "0.13" }
 prost-build = { version = "0.13" }
-# branch dylan/fix_parquet_nested_type_field_id
-icelake = { git = "https://github.com/risingwavelabs/icelake.git", rev = "3f4724158acee37a4785f56670a1427993a58739", features = [
+# branch rw_patch
+icelake = { git = "https://github.com/risingwavelabs/icelake.git", rev = "db4868f9a5de8ff8f6c04ec4c203bcbe59564cbe", features = [
     "prometheus",
 ] }
-
 # branch dev
 iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
 iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
 iceberg-catalog-glue = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
 opendal = "0.47"
 # used only by arrow-udf-flight
-arrow-flight = "50"
-arrow-udf-js = "0.3.1"
-arrow-udf-wasm = { version = "0.2.2", features = ["build"] }
-arrow-udf-python = "0.2"
-arrow-udf-flight = "0.1"
+arrow-flight = "52"
+arrow-udf-js = "0.4"
+arrow-udf-wasm = { version = "0.3", features = ["build"] }
+arrow-udf-python = "0.3"
+arrow-udf-flight = "0.3"
 clap = { version = "4", features = ["cargo", "derive", "env"] }
 # Use a forked version which removes the dependencies on dynamo db to reduce
 # compile time and binary size.

diff --git a/e2e_test/udf/wasm/Cargo.toml b/e2e_test/udf/wasm/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-arrow-udf = "0.3"
+arrow-udf = "0.4"
 genawaiter = "0.99"
 rust_decimal = "1"
 serde_json = "1"
diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml
@@ -21,10 +21,6 @@ arrow-48-array = { package = "arrow-array", version = "48" }
 arrow-48-buffer = { package = "arrow-buffer", version = "48" }
 arrow-48-cast = { package = "arrow-cast", version = "48" }
 arrow-48-schema = { package = "arrow-schema", version = "48" }
-arrow-50-array = { package = "arrow-array", version = "50" }
-arrow-50-buffer = { package = "arrow-buffer", version = "50" }
-arrow-50-cast = { package = "arrow-cast", version = "50" }
-arrow-50-schema = { package = "arrow-schema", version = "50" }
 arrow-52-array = { package = "arrow-array", version = "52" }
 arrow-52-buffer = { package = "arrow-buffer", version = "52" }
 arrow-52-cast = { package = "arrow-cast", version = "52" }

diff --git a/src/common/src/array/arrow/arrow_50.rs b/src/common/src/array/arrow/arrow_50.rs
diff --git a/src/common/src/array/arrow/arrow_udf.rs b/src/common/src/array/arrow/arrow_udf.rs
@@ -20,7 +20,7 @@
 
 use std::sync::Arc;
 
-pub use super::arrow_50::{
+pub use super::arrow_52::{
     arrow_array, arrow_buffer, arrow_cast, arrow_schema, FromArrow, ToArrow,
 };
 use crate::array::{ArrayError, ArrayImpl, DataType, DecimalArray, JsonbArray};

diff --git a/src/common/src/array/arrow/mod.rs b/src/common/src/array/arrow/mod.rs
@@ -15,7 +15,6 @@
 // These mods imports arrow_impl.rs to provide FromArrow, ToArrow traits for corresponding arrow versions,
 // and the default From/To implementations.
 mod arrow_48;
-mod arrow_50;
 mod arrow_52;
 // These mods import mods above and may override some methods.
 mod arrow_deltalake;

diff --git a/src/expr/impl/Cargo.toml b/src/expr/impl/Cargo.toml
@@ -68,7 +68,9 @@ sql-json-path = { version = "0.1", features = ["jsonbb"] }
 thiserror = "1"
 thiserror-ext = { workspace = true }
 tokio = { version = "0.2", package = "madsim-tokio", features = ["time"] }
-tonic = { version = "0.10", optional = true } # TODO(http-bump): bump once arrow-udf switches to tonic 0.12
+# For arrow-udf-flight
+# TODO(http-bump): bump once arrow-udf switches to tonic 0.12
+tonic = { version = "0.11", optional = true }
 tracing = "0.1"
 zstd = { version = "0.13", default-features = false, optional = true }