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: bump reqwest and hyper as much as possible #16143

Merged
merged 1 commit into from
Apr 4, 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
10 changes: 6 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ aws-smithy-http = "0.60"
aws-smithy-runtime-api = "1"
aws-smithy-runtime = "1"
aws-smithy-types = { version = "1", default-features = false, features = [
"hyper-0-14-x",
"hyper-0-14-x", # required by aws sdk
] }
aws-endpoint = "0.60"
aws-types = "1"
Expand Down
2 changes: 1 addition & 1 deletion src/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ prometheus = { version = "0.13" }
prost = { workspace = true }
rand = "0.8"
regex = "1"
reqwest = { version = "0.11", features = ["json"] }
reqwest = { version = "0.12.2", features = ["json"] }
risingwave-fields-derive = { path = "./fields-derive" }
risingwave_common_estimate_size = { workspace = true }
risingwave_common_metrics = { path = "./metrics" }
Expand Down
2 changes: 1 addition & 1 deletion src/common/common_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ normal = ["workspace-hack"]
[dependencies]
async-trait = "0.1"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
hyper = "0.14"
hyper = "0.14" # required by tonic
prometheus = { version = "0.13" }
risingwave_common = { workspace = true }
risingwave_pb = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions src/common/common_service/src/metrics_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ impl MetricsManager {
GLOBAL_METRICS_REGISTRY.deref().clone(),
))
.service_fn(Self::metrics_service);
// TODO: use axum server
let serve_future =
hyper::Server::bind(&listen_socket_addr).serve(Shared::new(service));
if let Err(err) = serve_future.await {
Expand Down
2 changes: 1 addition & 1 deletion src/common/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ clap = { version = "4", features = ["derive"] }
easy-ext = "1"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
http = "0.2"
hyper = { version = "0.14", features = ["client"] }
hyper = { version = "0.14", features = ["client"] } # used by tonic
hytra = { workspace = true }
itertools = "0.12"
parking_lot = "0.12"
Expand Down
2 changes: 1 addition & 1 deletion src/compute/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ either = "1"
foyer = { workspace = true }
futures = { version = "0.3", default-features = false, features = ["alloc"] }
futures-async-stream = { workspace = true }
hyper = "0.14"
hyper = "0.14" # required by tonic
itertools = "0.12"
maplit = "1.0.2"
pprof = { version = "0.13", features = ["flamegraph"] }
Expand Down
4 changes: 2 additions & 2 deletions src/connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ hyper = { version = "0.14", features = [
"http1",
"http2",
"stream",
] }
] } # required by clickhouse client
hyper-tls = "0.5"
icelake = { workspace = true }
indexmap = { version = "1.9.3", features = ["serde"] }
Expand Down Expand Up @@ -111,7 +111,7 @@ rdkafka = { workspace = true, features = [
] }
redis = { version = "0.25", features = ["aio", "tokio-comp", "async-std-comp"] }
regex = "1.4"
reqwest = { version = "0.11", features = ["json"] }
reqwest = { version = "0.12.2", features = ["json"] }
risingwave_common = { workspace = true }
risingwave_common_estimate_size = { workspace = true }
risingwave_jni_core = { workspace = true }
Expand Down
2 changes: 2 additions & 0 deletions src/connector/src/sink/doris.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// TODO: use hyper 1 or reqwest 0.12.2

use std::collections::HashMap;
use std::sync::Arc;

Expand Down
1 change: 1 addition & 0 deletions src/connector/src/sink/doris_starrocks_connector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ impl InserterInnerBuilder {
})
}

// TODO: use hyper 1 or reqwest 0.12.2
fn build_request_and_client(
&self,
uri: String,
Expand Down
2 changes: 1 addition & 1 deletion src/meta/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fail = "0.5"
function_name = "0.3.0"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
hex = "0.4"
hyper = "0.14"
hyper = "0.14" # required by tonic
itertools = "0.12"
maplit = "1.0.2"
memcomparable = { version = "0.2" }
Expand Down
4 changes: 2 additions & 2 deletions src/object_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ crc32fast = "1"
either = "1"
fail = "0.5"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
hyper = { version = "0.14", features = ["tcp", "client"] }
hyper = { version = "0.14", features = ["tcp", "client"] } # required by aws sdk
hyper-rustls = { version = "0.24.2", features = ["webpki-roots"] }
hyper-tls = "0.5.0"
itertools = "0.12"
madsim = "0.2.22"
opendal = "0.45.1"
prometheus = { version = "0.13", features = ["process"] }
reqwest = "0.11"
reqwest = "0.11" # required by opendal
risingwave_common = { workspace = true }
rustls = "0.23.4"
spin = "0.9"
Expand Down
2 changes: 1 addition & 1 deletion src/risedevtool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ itertools = "0.12"
rdkafka = { workspace = true }
redis = "0.25"
regex = "1"
reqwest = "0.11"
reqwest = { version = "0.12.2", features = ["blocking"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_with = "3"
Expand Down
2 changes: 1 addition & 1 deletion src/rpc_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ easy-ext = "1"
either = "1.10.0"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
http = "0.2"
hyper = "0.14"
hyper = "0.14" # required by tonic
itertools = "0.12.0"
lru = { workspace = true }
moka = { version = "0.12", features = ["future"] }
Expand Down
2 changes: 1 addition & 1 deletion src/utils/pgwire/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jsonwebtoken = "9"
openssl = "0.10.60"
panic-message = "0.3"
parking_lot = "0.12"
reqwest = { version = "0.11" }
reqwest = "0.12.2"
risingwave_common = { workspace = true }
risingwave_sqlparser = { workspace = true }
serde = { version = "1", features = ["derive"] }
Expand Down
3 changes: 2 additions & 1 deletion src/workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ redis = { version = "0.25", features = ["async-std-comp", "tokio-comp"] }
regex = { version = "1" }
regex-automata = { version = "0.4", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
regex-syntax = { version = "0.8" }
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"] }
reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12", features = ["blocking", "json"] }
reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11", default-features = false, features = ["blocking", "default-tls", "json", "rustls-tls"] }
ring = { version = "0.16", features = ["std"] }
rust_decimal = { version = "1", features = ["db-postgres", "maths"] }
rustc-hash = { version = "1" }
Expand Down
Loading