todo: for runji

Signed-off-by: MrCroxx <[email protected]>

Cargo.toml

@@ -135,28 +135,25 @@ prost = { version = "0.12" }
 icelake = { git = "https://github.com/icelake-io/icelake", rev = "07d53893d7788b4e41fc11efad8a6be828405c31", features = [
     "prometheus",
 ] }
-arrow-array-iceberg = { package = "arrow-array", version = "52" }
-arrow-schema-iceberg = { package = "arrow-schema", version = "52" }
-arrow-buffer-iceberg = { package = "arrow-buffer", version = "52" }
-arrow-cast-iceberg = { package = "arrow-cast", version = "52" }
+
 # TODO
 # After apache/iceberg-rust#411 is merged, we move to the upstream version.
 iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "0c6e133e6f4655ff9ce4ad57b577dc7f692dd902" }
 iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "0c6e133e6f4655ff9ce4ad57b577dc7f692dd902" }
-arrow-array = "50"
-arrow-arith = "50"
-arrow-cast = "50"
-arrow-schema = "50"
-arrow-buffer = "50"
-arrow-flight = "50"
-arrow-select = "50"
-arrow-ord = "50"
-arrow-row = "50"
+arrow-array = "52"
+arrow-arith = "52"
+arrow-cast = "52"
+arrow-schema = "52"
+arrow-buffer = "52"
+arrow-flight = "52"
+arrow-select = "52"
+arrow-ord = "52"
+arrow-row = "52"
 arrow-udf-js = "0.3.1"
 arrow-udf-js-deno = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "fa36365" }
 arrow-udf-wasm = { version = "0.2.2", features = ["build"] }
 arrow-udf-python = "0.2"
-arrow-udf-flight = "0.1"
+arrow-udf-flight = "0.2"
 arrow-array-deltalake = { package = "arrow-array", version = "48.0.1" }
 arrow-buffer-deltalake = { package = "arrow-buffer", version = "48.0.1" }
 arrow-cast-deltalake = { package = "arrow-cast", version = "48.0.1" }
@@ -171,7 +168,7 @@ deltalake = { git = "https://github.com/risingwavelabs/delta-rs", rev = "5c2dccd
 itertools = "0.12.0"
 jsonbb = "0.1.4"
 lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "2682b85" }
-parquet = "50"
+parquet = "52"
 thiserror-ext = "0.1.2"
 tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }
 tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", features = [
@@ -346,7 +343,6 @@ deno_web = { git = "https://github.com/bakjos/deno", rev = "787a232" }
 deno_websocket = { git = "https://github.com/bakjos/deno", rev = "787a232" }
 # patch to remove preserve_order from serde_json
 bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" }
-arrow-udf-flight = { git = "https://github.com/risingwavelabs/arrow-udf", rev = "54f6d69" }
 
 [workspace.metadata.dylint]
 libraries = [{ path = "./lints" }]

src/batch/Cargo.toml

@@ -16,7 +16,6 @@ normal = ["workspace-hack"]
 [dependencies]
 anyhow = "1"
 arrow-array = { workspace = true }
-arrow-array-iceberg = { workspace = true }
 arrow-schema = { workspace = true }
 assert_matches = "1"
 async-recursion = "1"

src/batch/src/executor/iceberg_scan.rs

@@ -15,7 +15,7 @@
 use std::hash::{DefaultHasher, Hash, Hasher};
 
 use anyhow::anyhow;
-use arrow_array_iceberg::RecordBatch;
+use arrow_array::RecordBatch;
 use futures_async_stream::try_stream;
 use futures_util::stream::StreamExt;
 use icelake::io::{FileScan, TableScan};

src/common/Cargo.toml

@@ -19,16 +19,12 @@ anyhow = "1"
 arc-swap = "1"
 arrow-array = { workspace = true }
 arrow-array-deltalake = { workspace = true }
-arrow-array-iceberg = { workspace = true }
 arrow-buffer = { workspace = true }
 arrow-buffer-deltalake = { workspace = true }
-arrow-buffer-iceberg = { workspace = true }
 arrow-cast = { workspace = true }
 arrow-cast-deltalake = { workspace = true }
-arrow-cast-iceberg = { workspace = true }
 arrow-schema = { workspace = true }
 arrow-schema-deltalake = { workspace = true }
-arrow-schema-iceberg = { workspace = true }
 async-trait = "0.1"
 auto_enums = { workspace = true }
 auto_impl = "1"

src/common/src/array/arrow/arrow_iceberg.rs

@@ -15,13 +15,10 @@
 use std::ops::{Div, Mul};
 use std::sync::Arc;
 
-use arrow_array_iceberg::{self as arrow_array, ArrayRef};
-use arrow_buffer_iceberg::IntervalMonthDayNano as ArrowIntervalType;
+use arrow_array::{self, ArrayRef};
+use arrow_buffer::IntervalMonthDayNano as ArrowIntervalType;
 use num_traits::abs;
-use {
-    arrow_buffer_iceberg as arrow_buffer, arrow_cast_iceberg as arrow_cast,
-    arrow_schema_iceberg as arrow_schema,
-};
+use {arrow_buffer, arrow_cast, arrow_schema};
 
 use crate::array::{Array, ArrayError, ArrayImpl, DataChunk, DataType, DecimalArray};
 use crate::types::{Interval, StructType};
@@ -49,11 +46,7 @@ impl ArrowIntervalTypeTrait for ArrowIntervalType {
     }
 }
 
-#[path = "./arrow_impl.rs"]
-mod arrow_impl;
-
-use arrow_impl::{FromArrow, ToArrow};
-
+use super::arrow_udf::arrow_impl::{FromArrow, ToArrow};
 use crate::array::arrow::ArrowIntervalTypeTrait;
 
 pub struct IcebergArrowConvert;
@@ -175,11 +168,11 @@ impl FromArrow for IcebergArrowConvert {}
 mod test {
     use std::sync::Arc;
 
-    use arrow_array_iceberg::{ArrayRef, Decimal128Array};
-    use arrow_schema_iceberg::DataType;
+    use arrow_array::{ArrayRef, Decimal128Array};
+    use arrow_schema::DataType;
 
-    use super::arrow_impl::ToArrow;
     use super::IcebergArrowConvert;
+    use crate::array::arrow::ToArrow;
     use crate::array::{Decimal, DecimalArray};
 
     #[test]