chore(deps): bump dependencies

Cargo.toml

@@ -44,6 +44,24 @@ members = [
   "src/workspace-hack",
 ]
 
+[workspace.package]
+version = "0.2.0-alpha"
+edition = "2021"
+homepage = "https://github.com/risingwavelabs/risingwave"
+keywords = ["sql", "database", "streaming"]
+license = "Apache-2.0"
+repository = "https://github.com/risingwavelabs/risingwave"
+
+[workspace.dependencies]
+aws-config = { version = "0.51", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-sdk-kinesis = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-sdk-s3 = { version = "0.21", default-features = false, features = ["rt-tokio","native-tls"] }
+aws-sdk-sqs = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-smithy-http = "0.51"
+aws-smithy-types = "0.51"
+aws-endpoint = "0.51"
+aws-types = { version = "0.51", features = ["hardcoded-credentials"] }
+
 [profile.dev]
 lto = 'off'
 

Makefile.toml

@@ -390,7 +390,7 @@ script = """
 
 set -e
 
-for tool in cargo-llvm-cov cargo-nextest cargo-udeps cargo-hakari cargo-sort cargo-make typos-cli
+for tool in cargo-llvm-cov cargo-nextest cargo-udeps cargo-hakari cargo-sort cargo-make cargo-upgrades typos-cli
 do
   echo "install: $(tput setaf 4)$tool$(tput sgr0)"
   cargo install $tool --locked

src/batch/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
-edition = "2021"
 name = "risingwave_batch"
-version = "0.2.0-alpha"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [dependencies]
 anyhow = "1"
@@ -11,7 +15,7 @@ async-stream = "0.3"
 async-trait = "0.1"
 byteorder = "1"
 bytes = "1"
-chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
+chrono = { version = "0.4.22", default-features = false, features = ["clock", "std"] }
 crc32fast = "1"
 either = "1"
 farmhash = "1"
@@ -60,10 +64,10 @@ url = "2"
 uuid = "1"
 
 [target.'cfg(not(madsim))'.dependencies]
-workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" }
+workspace-hack = { path = "../workspace-hack" }
 
 [dev-dependencies]
-criterion = { version = "0.3.5", features = ["async_tokio", "async"] }
+criterion = { version = "0.4", features = ["async_tokio", "async"] }
 rand = "0.8"
 tempfile = "3"
 tikv-jemallocator = "0.5"

src/bench/Cargo.toml

@@ -1,14 +1,17 @@
 [package]
 name = "risingwave_bench"
-version = "0.2.0-alpha"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [dependencies]
 async-trait = "0.1"
-aws-config = { version = "0.49", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-creds = "0.34"
-aws-sdk-s3 = { version = "0.19", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-smithy-http = "0.49"
+aws-config = { workspace = true }
+aws-sdk-s3 = { workspace = true }
+aws-smithy-http = { workspace = true }
 bcc = { version = "0.0.33", optional = true }
 bytes = "1"
 bytesize = { version = "1", features = ["serde"] }
@@ -21,7 +24,7 @@ libc = "0.2"
 minitrace = "0.4"
 minitrace-jaeger = "0.4"
 moka = { version = "0.9", features = ["future"] }
-nix = { version = "0.24.1", features = ["fs", "mman"] }
+nix = { version = "0.25", features = ["fs", "mman"] }
 opentelemetry = { version = "0.17", optional = true, features = ["rt-tokio"] }
 opentelemetry-jaeger = { version = "0.16", optional = true, features = [
     "rt-tokio",
@@ -55,7 +58,7 @@ tracing-opentelemetry = { version = "0.17", optional = true }
 tracing-subscriber = "0.3.16"
 
 [target.'cfg(not(madsim))'.dependencies]
-workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" }
+workspace-hack = { path = "../workspace-hack" }
 
 [[bin]]
 name = "file-cache-bench"

src/cmd/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
 name = "risingwave_cmd"
-version = "0.2.0-alpha"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [features]
 static-link = ["workspace-config/enable-static-link"]
@@ -33,7 +37,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
 ] }
 tracing = { version = "0.1" }
 workspace-config = { path = "../utils/workspace-config", optional = true }
-workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" }
+workspace-hack = { path = "../workspace-hack" }
 
 [[bin]]
 name = "frontend"

src/cmd_all/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
 name = "risingwave_cmd_all"
-version = "0.2.0-alpha"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [features]
 static-link = ["workspace-config/enable-static-link"]
@@ -34,7 +38,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
 ] }
 tracing = { version = "0.1" }
 workspace-config = { path = "../utils/workspace-config", optional = true }
-workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" }
+workspace-hack = { path = "../workspace-hack" }
 
 [[bin]]
 name = "risingwave"

src/common/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
 name = "risingwave_common"
-version = "0.2.0-alpha"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [dependencies]
 anyhow = "1"
@@ -54,7 +58,7 @@ twox-hash = "1"
 url = "2"
 
 [target.'cfg(not(madsim))'.dependencies]
-workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" }
+workspace-hack = { path = "../workspace-hack" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 procinfo = { git = "https://github.com/tikv/procinfo-rs", rev = "6599eb9dca74229b2c1fcc44118bef7eff127128" }

src/common/common_service/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
 name = "risingwave_common_service"
-version = "0.2.0-alpha"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -18,4 +22,4 @@ tower-http = { version = "0.3", features = ["add-extension", "cors"] }
 tracing = "0.1"
 
 [target.'cfg(not(madsim))'.dependencies]
-workspace-hack = { version = "0.2.0-alpha", path = "../../workspace-hack" }
+workspace-hack = { path = "../../workspace-hack" }

src/compute/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
-edition = "2021"
 name = "risingwave_compute"
-version = "0.2.0-alpha"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [dependencies]
 anyhow = "1"
@@ -62,7 +66,7 @@ twox-hash = "1"
 url = "2"
 
 [target.'cfg(not(madsim))'.dependencies]
-workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" }
+workspace-hack = { path = "../workspace-hack" }
 
 [dev-dependencies]
 futures-async-stream = "0.2"

src/connector/Cargo.toml

@@ -1,19 +1,23 @@
 [package]
-edition = "2021"
 name = "risingwave_connector"
-version = "0.2.0-alpha"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [dependencies]
 anyhow = "1"
 async-stream = "0.3"
 async-trait = "0.1"
-aws-config = { version = "0.49", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-sdk-kinesis = { version = "0.19", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-sdk-s3 = { version = "0.19", default-features = false, features = ["rt-tokio","native-tls"] }
-aws-sdk-sqs = { version = "0.19", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-smithy-http = "0.49"
-aws-smithy-types = "0.49"
-aws-types = { version = "0.49", features = ["hardcoded-credentials"] }
+aws-config = { workspace = true } 
+aws-sdk-kinesis = { workspace = true } 
+aws-sdk-s3 = { workspace = true } 
+aws-sdk-sqs = { workspace = true } 
+aws-smithy-http = { workspace = true }
+aws-smithy-types = { workspace = true }
+aws-types = { workspace = true }
 byteorder = "1"
 bytes = { version = "1", features = ["serde"] }
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
@@ -32,7 +36,7 @@ hyper = "0.14"
 itertools = "0.10"
 maplit = "1.0.2"
 memcomparable = { path = "../utils/memcomparable" }
-mysql_async = "0.30"
+mysql_async = "0.31"
 nexmark = { path = "../utils/nexmark", features = ["serde"] }
 num-traits = "0.2"
 paste = "1"
@@ -47,7 +51,7 @@ risingwave_storage = { path = "../storage" }
 serde = { version = "1", features = ["derive", "rc"] }
 serde_derive = "1"
 serde_json = "1"
-serde_with = "1"
+serde_with = "2"
 smallvec = "1"
 static_assertions = "1"
 strum = { version = "0.24", features = ["derive"] }
@@ -65,7 +69,7 @@ url = "2"
 urlencoding = "2"
 
 [target.'cfg(not(madsim))'.dependencies]
-workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" }
+workspace-hack = { path = "../workspace-hack" }
 
 [dev-dependencies]
 rand = "0.8"

src/connector/src/aws_utils.rs

@@ -20,10 +20,9 @@ use anyhow::anyhow;
 use aws_config::default_provider::credentials::DefaultCredentialsChain;
 use aws_config::default_provider::region::DefaultRegionChain;
 use aws_config::sts::AssumeRoleProvider;
+use aws_config::timeout::TimeoutConfig;
 use aws_sdk_s3::{client as s3_client, config as s3_config};
 use aws_smithy_http::endpoint::Endpoint;
-use aws_smithy_types::timeout::Http;
-use aws_smithy_types::tristate::TriState;
 use aws_types::credentials::SharedCredentialsProvider;
 use aws_types::region::Region;
 use http::Uri;
@@ -199,12 +198,11 @@ pub fn s3_client(
     let s3_config_obj = if let Some(config) = config_pairs {
         let s3_config = AwsCustomConfig::from(config);
         let retry_conf =
-            aws_config::RetryConfig::standard().with_max_attempts(s3_config.retry_times);
-        let timeout_conf = aws_config::timeout::Config::new().with_http_timeouts(
-            Http::new()
-                .with_connect_timeout(TriState::Set(s3_config.conn_timeout))
-                .with_read_timeout(TriState::Set(s3_config.read_timeout)),
-        );
+            aws_config::retry::RetryConfig::standard().with_max_attempts(s3_config.retry_times);
+        let timeout_conf = TimeoutConfig::builder()
+            .connect_timeout(s3_config.conn_timeout)
+            .read_timeout(s3_config.read_timeout)
+            .build();
 
         s3_config::Builder::from(&sdk_config.clone())
             .retry_config(retry_conf)

src/connector/src/source/filesystem/s3/s3_dir.rs

@@ -15,10 +15,9 @@ use std::time::Duration;
 
 use async_trait::async_trait;
 use aws_config::default_provider::credentials::DefaultCredentialsChain;
-use aws_config::timeout::Http;
+use aws_config::timeout::TimeoutConfig;
 use aws_sdk_s3::{client as s3_client, config as s3_config};
 use aws_sdk_sqs::client as sqs_client;
-use aws_smithy_types::tristate::TriState;
 use aws_types::credentials::SharedCredentialsProvider;
 use aws_types::region::Region;
 use sync::watch;
@@ -182,12 +181,11 @@ pub(crate) fn new_s3_client(s3_source_config: S3SourceConfig) -> s3_client::Clie
     let config_for_s3 = match s3_source_config.custom_config {
         Some(conf) => {
             let retry_conf =
-                aws_config::RetryConfig::standard().with_max_attempts(conf.max_retry_times);
-            let timeout_conf = aws_config::timeout::Config::new().with_http_timeouts(
-                Http::new()
-                    .with_connect_timeout(TriState::Set(conf.conn_time_out))
-                    .with_read_timeout(TriState::Set(conf.read_time_out)),
-            );
+                aws_config::retry::RetryConfig::standard().with_max_attempts(conf.max_retry_times);
+            let timeout_conf = TimeoutConfig::builder()
+                .connect_timeout(conf.conn_time_out)
+                .read_timeout(conf.read_time_out)
+                .build();
 
             s3_config::Builder::from(&s3_source_config.shared_config)
                 .retry_config(retry_conf)

src/ctl/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
 name = "risingwave_ctl"
-version = "0.2.0-alpha"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [dependencies]
 anyhow = "1"
@@ -23,7 +27,7 @@ risingwave_rpc_client = { path = "../rpc_client" }
 risingwave_storage = { path = "../storage" }
 risingwave_stream = { path = "../stream" }
 serde_json = "1"
-size = "0.2"
+size = "0.4"
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
     "rt-multi-thread",
@@ -36,4 +40,4 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
 tracing = "0.1"
 
 [target.'cfg(not(madsim))'.dependencies]
-workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" }
+workspace-hack = { path = "../workspace-hack" }

src/ctl/src/cmd_impl/bench.rs

@@ -63,8 +63,8 @@ impl InterestedMetrics {
         let iter_rate = (self.iter_cnt - metrics.iter_cnt) as f64 / elapsed;
         println!(
             "read_rate: {}/s\nwrite_rate:{}/s\nnext_rate:{}/s\niter_rate:{}/s\n",
-            Size::Bytes(read_rate),
-            Size::Bytes(write_rate),
+            Size::from_bytes(read_rate),
+            Size::from_bytes(write_rate),
             next_rate,
             iter_rate
         );