From c69837f7489a1e8bc26a0d3890cea4be4e587bdc Mon Sep 17 00:00:00 2001 From: Renjie Liu Date: Wed, 30 Aug 2023 18:49:01 +0800 Subject: [PATCH] chore: Upgrade icelake version (#11962) --- Cargo.lock | 147 +++++++--------------------------- Cargo.toml | 7 +- src/common/Cargo.toml | 6 +- src/common/src/array/arrow.rs | 2 +- src/connector/Cargo.toml | 4 +- src/expr/Cargo.toml | 4 +- src/frontend/Cargo.toml | 2 +- src/udf/Cargo.toml | 8 +- 8 files changed, 50 insertions(+), 130 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73f2b07cadfc6..e84ca5be43c6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,33 +245,11 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "arrow" -version = "45.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7104b9e9761613ae92fe770c741d6bbf1dbc791a0fe204400aebdd429875741" -dependencies = [ - "ahash 0.8.3", - "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", -] - [[package]] name = "arrow-arith" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e597a8e8efb8ff52c50eaf8f4d85124ce3c1bf20fab82f476d73739d9ab1c2" +checksum = "895263144bd4a69751cbe6a34a53f26626e19770b313a9fa792c415cd0e78f11" dependencies = [ "arrow-array", "arrow-buffer", @@ -284,9 +262,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a86d9c1473db72896bd2345ebb6b8ad75b8553ba390875c76708e8dc5c5492d" +checksum = "226fdc6c3a4ae154a74c24091d36a90b514f0ed7112f5b8322c1d8f354d8e20d" dependencies = [ "ahash 0.8.3", "arrow-buffer", @@ -300,19 +278,20 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234b3b1c8ed00c874bf95972030ac4def6f58e02ea5a7884314388307fb3669b" +checksum = "fc4843af4dd679c2f35b69c572874da8fde33be53eb549a5fb128e7a4b763510" dependencies = [ + "bytes", "half 2.3.1", "num", ] [[package]] name = "arrow-cast" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22f61168b853c7faea8cea23a2169fdff9c82fb10ae5e2c07ad1cab8f6884931" +checksum = "35e8b9990733a9b635f656efda3c9b8308c7a19695c9ec2c7046dd154f9b144b" dependencies = [ "arrow-array", "arrow-buffer", @@ -325,30 +304,11 @@ dependencies = [ "num", ] -[[package]] -name = "arrow-csv" -version = "45.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b545c114d9bf8569c84d2fbe2020ac4eea8db462c0a37d0b65f41a90d066fe" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "chrono", - "csv", - "csv-core", - "lazy_static", - "lexical-core", - "regex", -] - [[package]] name = "arrow-data" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b6852635e7c43e5b242841c7470606ff0ee70eef323004cacc3ecedd33dd8f" +checksum = "da900f31ff01a0a84da0572209be72b2b6f980f3ea58803635de47913191c188" dependencies = [ "arrow-buffer", "arrow-schema", @@ -358,9 +318,9 @@ dependencies = [ [[package]] name = "arrow-flight" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0b5fad0d74d4292b46579e8238c7ba93520433e026d9fec6b7873d322bb3f3" +checksum = "e40372d37a860a742f248d4d7c137950cd793f1b46f2b99a5116c55efbe2699f" dependencies = [ "arrow-array", "arrow-buffer", @@ -378,9 +338,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66da9e16aecd9250af0ae9717ae8dd7ea0d8ca5a3e788fe3de9f4ee508da751" +checksum = "2707a8d7ee2d345d045283ece3ae43416175873483e5d96319c929da542a0b1f" dependencies = [ "arrow-array", "arrow-buffer", @@ -390,46 +350,11 @@ dependencies = [ "flatbuffers", ] -[[package]] -name = "arrow-json" -version = "45.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60ee0f9d8997f4be44a60ee5807443e396e025c23cf14d2b74ce56135cb04474" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-cast", - "arrow-data", - "arrow-schema", - "chrono", - "half 2.3.1", - "indexmap 2.0.0", - "lexical-core", - "num", - "serde", - "serde_json", -] - -[[package]] -name = "arrow-ord" -version = "45.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcab05410e6b241442abdab6e1035177dc082bdb6f17049a4db49faed986d63" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", - "half 2.3.1", - "num", -] - [[package]] name = "arrow-row" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a847dd9eb0bacd7836ac63b3475c68b2210c2c96d0ec1b808237b973bd5d73" +checksum = "0e32afc1329f7b372463b21c6ca502b07cf237e1ed420d87706c1770bb0ebd38" dependencies = [ "ahash 0.8.3", "arrow-array", @@ -442,15 +367,15 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54df8c47918eb634c20e29286e69494fdc20cafa5173eb6dad49c7f6acece733" +checksum = "b104f5daa730f00fde22adc03a12aa5a2ae9ccbbf99cbd53d284119ddc90e03d" [[package]] name = "arrow-select" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941dbe481da043c4bd40c805a19ec2fc008846080c4953171b62bcad5ee5f7fb" +checksum = "73b3ca55356d1eae07cf48808d8c462cea674393ae6ad1e0b120f40b422eb2b4" dependencies = [ "arrow-array", "arrow-buffer", @@ -459,22 +384,6 @@ dependencies = [ "num", ] -[[package]] -name = "arrow-string" -version = "45.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359b2cd9e071d5a3bcf44679f9d85830afebc5b9c98a08019a570a65ae933e0f" -dependencies = [ - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "arrow-select", - "num", - "regex", - "regex-syntax 0.7.4", -] - [[package]] name = "assert_matches" version = "1.5.0" @@ -3529,11 +3438,16 @@ dependencies = [ [[package]] name = "icelake" version = "0.0.9" -source = "git+https://github.com/icelake-io/icelake?rev=ec7d251e5e6db0673cea35edd62e6c7df81c4759#ec7d251e5e6db0673cea35edd62e6c7df81c4759" +source = "git+https://github.com/icelake-io/icelake?rev=a6790d17094754959e351fac1e11147e37643e97#a6790d17094754959e351fac1e11147e37643e97" dependencies = [ "anyhow", "apache-avro 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "arrow", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-row", + "arrow-schema", + "arrow-select", "async-trait", "bitvec", "bytes", @@ -3548,6 +3462,7 @@ dependencies = [ "regex", "rust_decimal", "serde", + "serde_bytes", "serde_json", "serde_with 3.3.0", "tokio", @@ -5019,9 +4934,9 @@ dependencies = [ [[package]] name = "parquet" -version = "45.0.0" +version = "46.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f9739b984380582bdb7749ae5b5d28839bce899212cf16465c1ac1f8b65d79" +checksum = "1ad2cba786ae07da4d73371a88b9e0f9d3ffac1a9badc83922e0e15814f5c5fa" dependencies = [ "ahash 0.8.3", "arrow-array", diff --git a/Cargo.toml b/Cargo.toml index 0dcd9e05ade9a..089af7f35629f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,7 +79,12 @@ hashbrown = { version = "0.14.0", features = ["ahash", "inline-more", "nightly"] criterion = { version = "0.5", features = ["async_futures"] } tonic = { package = "madsim-tonic", version = "0.3.1" } tonic-build = { package = "madsim-tonic-build", version = "0.3.1" } -icelake = { git = "https://github.com/icelake-io/icelake", rev = "ec7d251e5e6db0673cea35edd62e6c7df81c4759" } +icelake = { git = "https://github.com/icelake-io/icelake", rev = "a6790d17094754959e351fac1e11147e37643e97" } +arrow-array = "46" +arrow-schema = "46" +arrow-buffer = "46" +arrow-flight = "46" +arrow-select = "46" risingwave_backup = { path = "./src/storage/backup" } risingwave_batch = { path = "./src/batch" } diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index 112faa09e46ec..4a5903d7c4f43 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -16,9 +16,9 @@ normal = ["workspace-hack"] [dependencies] anyhow = "1" arc-swap = "1" -arrow-array = "45" -arrow-buffer = "45" -arrow-schema = "45" +arrow-array = { workspace = true } +arrow-buffer = { workspace = true } +arrow-schema = { workspace = true } async-trait = "0.1" auto_enums = "0.8" bitflags = "2" diff --git a/src/common/src/array/arrow.rs b/src/common/src/array/arrow.rs index 9aaec9acbf1fe..9b4165b608d98 100644 --- a/src/common/src/array/arrow.rs +++ b/src/common/src/array/arrow.rs @@ -184,7 +184,7 @@ impl TryFrom<&DataType> for arrow_schema::DataType { DataType::Timestamp => Ok(Self::Timestamp(arrow_schema::TimeUnit::Microsecond, None)), DataType::Timestamptz => Ok(Self::Timestamp( arrow_schema::TimeUnit::Microsecond, - Some("UTC".into()), + Some("+00:00".into()), )), DataType::Time => Ok(Self::Time64(arrow_schema::TimeUnit::Microsecond)), DataType::Interval => Ok(Self::Interval(arrow_schema::IntervalUnit::MonthDayNano)), diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index 5ab001cfe7a11..3d18b57e82b51 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -21,8 +21,8 @@ apache-avro = { git = "https://github.com/risingwavelabs/avro", branch = "idx0de "bzip", "xz", ] } -arrow-array = "45" -arrow-schema = "45" +arrow-array = { workspace = true } +arrow-schema = { workspace = true } async-trait = "0.1" auto_enums = { version = "0.8", features = ["futures03"] } auto_impl = "1" diff --git a/src/expr/Cargo.toml b/src/expr/Cargo.toml index e3928499dd685..7b3fccd17bffa 100644 --- a/src/expr/Cargo.toml +++ b/src/expr/Cargo.toml @@ -17,8 +17,8 @@ normal = ["workspace-hack", "ctor"] [dependencies] aho-corasick = "1" anyhow = "1" -arrow-array = "45" -arrow-schema = "45" +arrow-array = { workspace = true } +arrow-schema = { workspace = true } async-trait = "0.1" auto_enums = "0.8" await-tree = { workspace = true } diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml index 359230c0e47c5..436f671995c46 100644 --- a/src/frontend/Cargo.toml +++ b/src/frontend/Cargo.toml @@ -17,7 +17,7 @@ normal = ["workspace-hack"] [dependencies] anyhow = "1" arc-swap = "1" -arrow-schema = "45" +arrow-schema = { workspace = true } async-recursion = "1.0.4" async-trait = "0.1" auto_enums = { version = "0.8", features = ["futures03"] } diff --git a/src/udf/Cargo.toml b/src/udf/Cargo.toml index 34e3dbc3e922e..b82fad73cc60c 100644 --- a/src/udf/Cargo.toml +++ b/src/udf/Cargo.toml @@ -11,10 +11,10 @@ ignored = ["workspace-hack"] normal = ["workspace-hack"] [dependencies] -arrow-array = "45" -arrow-flight = "45" -arrow-schema = "45" -arrow-select = "45" +arrow-array = { workspace = true } +arrow-flight = { workspace = true } +arrow-schema = { workspace = true } +arrow-select = { workspace = true } futures-util = "0.3.28" static_assertions = "1" thiserror = "1"