Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump the tonic group with 2 updates #18682

Merged
merged 7 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
345 changes: 60 additions & 285 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.g
iceberg-catalog-glue = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "f8b7bff7bd7853be7733fc1db1203862878f92c1" }
opendal = "0.49"
# used only by arrow-udf-flight
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"
arrow-flight = "53"
arrow-udf-js = "0.5"
arrow-udf-wasm = { version = "0.4", features = ["build"] }
arrow-udf-python = "0.4"
arrow-udf-flight = "0.4"
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.
Expand Down
4 changes: 0 additions & 4 deletions src/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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-52-array = { package = "arrow-array", version = "52" }
arrow-52-buffer = { package = "arrow-buffer", version = "52" }
arrow-52-cast = { package = "arrow-cast", version = "52" }
arrow-52-schema = { package = "arrow-schema", version = "52" }
arrow-53-array = { package = "arrow-array", version = "53" }
arrow-53-buffer = { package = "arrow-buffer", version = "53" }
arrow-53-cast = { package = "arrow-cast", version = "53" }
Expand Down
48 changes: 0 additions & 48 deletions src/common/src/array/arrow/arrow_52.rs

This file was deleted.

2 changes: 1 addition & 1 deletion src/common/src/array/arrow/arrow_udf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

use std::sync::Arc;

pub use super::arrow_52::{
pub use super::arrow_53::{
arrow_array, arrow_buffer, arrow_cast, arrow_schema, FromArrow, ToArrow,
};
use crate::array::{ArrayError, ArrayImpl, DataType, DecimalArray, JsonbArray};
Expand Down
1 change: 0 additions & 1 deletion src/common/src/array/arrow/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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_52;
mod arrow_53;
// These mods import mods above and may override some methods.
mod arrow_deltalake;
Expand Down
2 changes: 1 addition & 1 deletion src/connector/codec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ hex = "0.4"
tokio = { version = "0.2", package = "madsim-tokio" }

[build-dependencies]
prost-build = "0.12"
prost-build = "0.13"

[target.'cfg(not(madsim))'.dependencies]
workspace-hack = { path = "../../workspace-hack" }
Expand Down
4 changes: 2 additions & 2 deletions src/expr/impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ educe = "0.6"
fancy-regex = "0.13"
futures-async-stream = { workspace = true }
futures-util = "0.3"
ginepro = "0.7" # TODO(http-bump): bump to 0.8 once arrow-udf switches to tonic 0.12
ginepro = "0.8"
hex = "0.4"
icelake = { workspace = true }
itertools = { workspace = true }
Expand Down Expand Up @@ -70,7 +70,7 @@ thiserror-ext = { workspace = true }
tokio = { version = "0.2", package = "madsim-tokio", features = ["time"] }
# For arrow-udf-flight
# TODO(http-bump): bump once arrow-udf switches to tonic 0.12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we remove this TODO?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, too late to see this.

tonic = { version = "0.11", optional = true }
tonic = { version = "0.12", optional = true }
tracing = "0.1"
zstd = { version = "0.13", default-features = false, optional = true }

Expand Down
3 changes: 2 additions & 1 deletion src/expr/impl/src/udf/external.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use std::sync::{Arc, LazyLock, Weak};
use std::time::Duration;

use anyhow::bail;
use arrow_flight::flight_service_client::FlightServiceClient;
use arrow_udf_flight::Client;
use futures_util::{StreamExt, TryStreamExt};
use ginepro::{LoadBalancedChannel, ResolutionStrategy};
Expand Down Expand Up @@ -186,7 +187,7 @@ fn get_or_create_flight_client(link: &str) -> Result<Arc<Client>> {
let client = Arc::new(tokio::task::block_in_place(|| {
RUNTIME.block_on(async {
let channel = connect_tonic(link).await?;
Ok(Client::new(channel).await?) as Result<_>
Ok(Client::new(FlightServiceClient::new(channel)).await?) as Result<_>
})
})?);
clients.insert(link.to_owned(), Arc::downgrade(&client));
Expand Down
Loading