Merge pull request #10578 from Xuanwo/bump-deps

chore: Bump all dependences

Author: mergify[bot]

Cargo.lock

@@ -118,11 +118,14 @@ clap = { version = "3.2.22", features = ["derive", "env"] }
 
 # serialization
 prost = { version = "0.11.0" }
-serde = { version = "1.0.145", features = ["derive", "rc"] }
+# 1.0.153 adds a new feature which will allow `serde(alias = "…")` inside a flattened struct.
+# This feature seems cool but will break our config parse.
+# @xuanwo will address this issue upon his return from Mars.
+serde = { version = "=1.0.152", features = ["derive", "rc"] }
 serde_json = { version = "1.0.85", default-features = false, features = ["preserve_order"] }
 
 # chrono
-chrono = { version = "0.4.22", features = ["serde"] }
+chrono = { version = "0.4.24", features = ["serde"] }
 chrono-tz = "0.6.3"
 
 # memory
@@ -186,5 +189,4 @@ rpath = false
 
 arrow2 = { git = "https://github.com/jorgecarleitao/arrow2", rev = "db87f71" }
 parquet2 = { git = "https://github.com/jorgecarleitao/parquet2", rev = "ed0e1ff" }
-limits-rs = { git = "https://github.com/datafuse-extras/limits-rs", rev = "abfcf7b" }
 metrics = { git = "https://github.com/datafuse-extras/metrics.git", rev = "fc2ecd1" }

Cargo.toml

@@ -59,7 +59,7 @@ anyerror = { workspace = true }
 anyhow = { workspace = true }
 clap = { workspace = true }
 comfy-table = "6.1.3"
-limits-rs = "0.1.0"
+limits-rs = "0.2.0"
 poem = { version = "1", features = ["rustls", "multipart", "compression"] }
 sentry = { version = "0.30", default-features = false, features = [
     "backtrace",

src/binaries/Cargo.toml

@@ -11,7 +11,7 @@ doctest = false
 test = false
 
 [dependencies]
-base64 = "0.13.0"
+base64 = "0.21.0"
 chrono = { workspace = true }
 common-base = { path = "../../common/base" }
 http = "0.2"

src/common/auth/Cargo.toml

@@ -18,8 +18,7 @@ use std::path::Path;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use base64::encode_config;
-use base64::URL_SAFE;
+use base64::prelude::*;
 use chrono::DateTime;
 use chrono::Duration;
 use chrono::Utc;
@@ -77,7 +76,7 @@ pub enum RefreshableToken {
 
 fn bearer_header(token: &str) -> Result<HeaderValue, Error> {
     // trim spaces and base 64
-    let token = encode_config(token.trim(), URL_SAFE);
+    let token = BASE64_URL_SAFE.encode(token.trim());
     let mut value = HeaderValue::try_from(format!("Bearer {}", token))
         .map_err(|err| Error::new(ErrorKind::InvalidInput, err))?;
     value.set_sensitive(true);

src/common/auth/src/auth.rs

@@ -37,7 +37,7 @@ num_cpus = "1.13.1"
 once_cell = "1.15.0"
 parking_lot = "0.12"
 pin-project-lite = "0.2.9"
-pprof = { version = "0.10.1", features = [
+pprof = { version = "0.11.1", features = [
     "flamegraph",
     "protobuf-codec",
     "protobuf",

src/common/base/Cargo.toml

@@ -14,7 +14,7 @@ test = false
 anyhow = { workspace = true }
 cargo-license = "0.5.1"
 cargo_metadata = "0.15.0"
-gix = "0.36.1"
+gix = "0.42.0"
 tracing = "0.1.36"
 # TODO(xuanwo): vergion > 8.0.0-beta.5 requires time > 0.3.17 which is not compatible with opendal
 vergen = { version = "<=8.0.0-beta.5", features = ["build", "cargo", "git", "rustc", "gix"] }

src/common/building/Cargo.toml

@@ -23,7 +23,7 @@ chrono = { workspace = true }
 chrono-tz = { workspace = true }
 ethnum = "1.3.2"
 lexical-core = "0.8.5"
-micromarshal = "0.2.1"
+micromarshal = "0.3.0"
 ordered-float = { workspace = true }
 serde = { workspace = true }
 

src/common/io/Cargo.toml

@@ -97,12 +97,19 @@ where T: AsRef<[u8]>
             .map_err_to_code(ErrorCode::BadBytes, || {
                 format!("Cannot parse value:{} to Date type", v)
             })?;
-        let mut dt = tz.from_local_datetime(&d.and_hms(0, 0, 0)).unwrap();
+        let mut dt = tz
+            .from_local_datetime(&d.and_hms_opt(0, 0, 0).unwrap())
+            .unwrap();
 
         let less_1000 = |dt: DateTime<Tz>| {
             // convert timestamp less than `1000-01-01 00:00:00` to `1000-01-01 00:00:00`
             if dt.year() < 1000 {
-                Ok(tz.from_utc_datetime(&NaiveDate::from_ymd(1000, 1, 1).and_hms(0, 0, 0)))
+                Ok(tz.from_utc_datetime(
+                    &NaiveDate::from_ymd_opt(1000, 1, 1)
+                        .unwrap()
+                        .and_hms_opt(0, 0, 0)
+                        .unwrap(),
+                ))
             } else {
                 Ok(dt)
             }
@@ -133,13 +140,13 @@ where T: AsRef<[u8]>
             if times.len() < 3 {
                 times.resize(3, 0);
                 dt = tz
-                    .from_local_datetime(&d.and_hms(times[0], times[1], times[2]))
+                    .from_local_datetime(&d.and_hms_opt(times[0], times[1], times[2]).unwrap())
                     .unwrap();
                 return less_1000(dt);
             }
 
             dt = tz
-                .from_local_datetime(&d.and_hms(times[0], times[1], times[2]))
+                .from_local_datetime(&d.and_hms_opt(times[0], times[1], times[2]).unwrap())
                 .unwrap();
 
             // ms .microseconds
@@ -187,7 +194,12 @@ where T: AsRef<[u8]>
             if self.ignore(|b| b == b'z' || b == b'Z') {
                 // ISO 8601 The Z on the end means UTC (that is, an offset-from-UTC of zero hours-minutes-seconds).
                 if dt.year() < 1000 {
-                    Ok(tz.from_utc_datetime(&NaiveDate::from_ymd(1000, 1, 1).and_hms(0, 0, 0)))
+                    Ok(tz.from_utc_datetime(
+                        &NaiveDate::from_ymd_opt(1000, 1, 1)
+                            .unwrap()
+                            .and_hms_opt(0, 0, 0)
+                            .unwrap(),
+                    ))
                 } else {
                     let current_tz = dt.offset().fix().local_minus_utc();
                     calc_offset(current_tz.into(), 0, &dt)
@@ -239,11 +251,18 @@ where T: AsRef<[u8]>
                 || ((0..60).contains(&minute_offset) && hour_offset < 14)
             {
                 if dt.year() < 1970 {
-                    Ok(tz.from_utc_datetime(&NaiveDate::from_ymd(1970, 1, 1).and_hms(0, 0, 0)))
+                    Ok(tz.from_utc_datetime(
+                        &NaiveDate::from_ymd_opt(1970, 1, 1)
+                            .unwrap()
+                            .and_hms_opt(0, 0, 0)
+                            .unwrap(),
+                    ))
                 } else {
                     let current_tz_sec = dt.offset().fix().local_minus_utc();
-                    let mut val_tz_sec = FixedOffset::east(hour_offset * 3600 + minute_offset * 60)
-                        .local_minus_utc();
+                    let mut val_tz_sec =
+                        FixedOffset::east_opt(hour_offset * 3600 + minute_offset * 60)
+                            .unwrap()
+                            .local_minus_utc();
                     if west_tz {
                         val_tz_sec = -val_tz_sec;
                     }

src/common/io/src/cursor_ext/cursor_read_datetime_ext.rs

@@ -27,7 +27,7 @@ serde = { workspace = true }
 tracing = "0.1.36"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-procfs = "0.12.0"
+procfs = "0.15.1"
 
 [dev-dependencies]
 anyhow = { workspace = true }