Bump deps

Xuanwo · Xuanwo · commit c42326d97cef · 2023-03-15T13:41:42.000+08:00
Signed-off-by: Xuanwo &lt;github@xuanwo.io&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -186,5 +186,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" }
diff --git a/src/binaries/Cargo.toml b/src/binaries/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",
diff --git a/src/common/auth/Cargo.toml b/src/common/auth/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"
diff --git a/src/common/auth/src/auth.rs b/src/common/auth/src/auth.rs
@@ -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);
diff --git a/src/common/base/Cargo.toml b/src/common/base/Cargo.toml
@@ -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",
diff --git a/src/common/building/Cargo.toml b/src/common/building/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"] }
diff --git a/src/common/io/Cargo.toml b/src/common/io/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 }
 
diff --git a/src/common/metrics/Cargo.toml b/src/common/metrics/Cargo.toml
@@ -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 }
diff --git a/src/meta/service/Cargo.toml b/src/meta/service/Cargo.toml
@@ -63,14 +63,14 @@ serde_json = { workspace = true }
 serfig = "0.0.3"
 tokio-stream = "0.1.10"
 tonic = { version = "0.8.1", features = ["tls"] }
-tonic-reflection = "0.5.0"
+tonic-reflection = "0.6.0"
 tracing = "0.1.36"
 tracing-appender = "0.2.2"
 tracing-subscriber = { version = "0.3.15", features = ["env-filter", "ansi"] }
 
 [dev-dependencies]
 async-entry = "0.3.1"
-env_logger = "0.9.1"
+env_logger = "0.10.0"
 maplit = "1.0.2"
 pretty_assertions = "1.3.0"
 regex = "1.6.0"
diff --git a/src/query/expression/Cargo.toml b/src/query/expression/Cargo.toml
@@ -20,7 +20,7 @@ common-io = { path = "../../common/io" }
 # Github dependencies
 
 # Crates.io dependencies
-base64 = "0.13.0"
+base64 = "0.21.0"
 chrono = { workspace = true }
 chrono-tz = { workspace = true }
 comfy-table = "6"
@@ -34,7 +34,7 @@ itertools = "0.10"
 jsonb = { workspace = true }
 lexical-core = "0.8.5"
 match-template = "0.0.1"
-micromarshal = "0.2.1"
+micromarshal = "0.3.0"
 num-traits = "0.2.15"
 once_cell = "1.15.0"
 ordered-float = { workspace = true, features = ["serde", "rand"] }
diff --git a/src/query/expression/src/values.rs b/src/query/expression/src/values.rs
@@ -17,6 +17,8 @@ use std::hash::Hash;
 use std::io::Read;
 use std::ops::Range;
 
+use base64::engine::general_purpose;
+use base64::prelude::*;
 use common_arrow::arrow::bitmap::and;
 use common_arrow::arrow::bitmap::Bitmap;
 use common_arrow::arrow::bitmap::MutableBitmap;
@@ -1544,7 +1546,7 @@ impl Serialize for Column {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where S: Serializer {
         let bytes = serialize_column(self);
-        let base64_str = base64::encode(bytes);
+        let base64_str = general_purpose::STANDARD.encode(bytes);
         serializer.serialize_str(&base64_str)
     }
 }
@@ -1563,7 +1565,7 @@ impl<'de> Deserialize<'de> for Column {
 
             fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
             where E: serde::de::Error {
-                let bytes = base64::decode(v).unwrap();
+                let bytes = general_purpose::STANDARD.decode(v).unwrap();
                 let column = deserialize_column(&bytes)
                     .expect("expecting an arrow chunk with exactly one column");
                 Ok(column)
diff --git a/src/query/formats/Cargo.toml b/src/query/formats/Cargo.toml
@@ -15,7 +15,7 @@ bstr = "1.0.1"
 chrono-tz = { workspace = true }
 lexical-core = "0.8.5"
 match-template = "0.0.1"
-micromarshal = "0.2.1"
+micromarshal = "0.3.0"
 num = "0.4.0"
 ordered-float = { workspace = true }
 serde_json = { workspace = true }
diff --git a/src/query/functions/Cargo.toml b/src/query/functions/Cargo.toml
@@ -20,7 +20,7 @@ common-io = { path = "../../common/io" }
 jsonb = { workspace = true }
 
 # Crates.io dependencies
-base64 = "0.13.0"
+base64 = "0.21.0"
 blake3 = "1.3.1"
 bstr = "1.0.1"
 bumpalo = { workspace = true }
@@ -30,9 +30,9 @@ crc32fast = "1.3.2"
 criterion = "0.4"
 ctor = "0.1.26"
 ethnum = { version = "1.3" }
-geo = "0.23.1"
+geo = "0.24.0"
 geohash = "0.13.0"
-h3o = "0.1.0"
+h3o = "0.3.0"
 hex = "0.4.3"
 itertools = "0.10.5"
 lexical-core = "0.8.5"
diff --git a/src/query/functions/src/scalars/geo.rs b/src/query/functions/src/scalars/geo.rs
@@ -100,7 +100,7 @@ pub fn register(registry: &mut FunctionRegistry) {
         |_,_,_|FunctionDomain::Full,
         vectorize_with_builder_3_arg::<NumberType<F64>, NumberType<F64>, NumberType<u8>, NumberType<u64>>(
             |lon, lat, r, builder, ctx| {
-                match LatLng::from_degrees(lat.into(), lon.into()) {
+                match LatLng::new(lat.into(), lon.into()) {
                     Ok(coord) => {
                         let h3_cell =  coord.to_cell(Resolution::try_from(r).unwrap());
                         builder.push(h3_cell.into())
diff --git a/src/query/functions/src/scalars/string.rs b/src/query/functions/src/scalars/string.rs
@@ -15,6 +15,8 @@
 use std::cmp::Ordering;
 use std::io::Write;
 
+use base64::engine::general_purpose;
+use base64::prelude::*;
 use bstr::ByteSlice;
 use common_expression::types::number::SimpleDomain;
 use common_expression::types::number::UInt64Type;
@@ -318,7 +320,7 @@ pub fn register(registry: &mut FunctionRegistry) {
         vectorize_string_to_string(
             |col| col.data.len() * 4 / 3 + col.len() * 4,
             |val, output, _| {
-                base64::write::EncoderWriter::new(&mut output.data, base64::STANDARD)
+                base64::write::EncoderWriter::new(&mut output.data, &general_purpose::STANDARD)
                     .write_all(val)
                     .unwrap();
                 output.commit_row();
@@ -333,8 +335,7 @@ pub fn register(registry: &mut FunctionRegistry) {
         vectorize_string_to_string(
             |col| col.data.len() * 4 / 3 + col.len() * 4,
             |val, output, ctx| {
-                if let Err(err) = base64::decode_config_buf(val, base64::STANDARD, &mut output.data)
-                {
+                if let Err(err) = general_purpose::STANDARD.decode_slice(val, &mut output.data) {
                     ctx.set_error(output.len(), err.to_string());
                 }
                 output.commit_row();
diff --git a/src/query/service/Cargo.toml b/src/query/service/Cargo.toml
@@ -100,7 +100,7 @@ aho-corasick = { version = "0.7.20" }
 async-channel = "1.7.1"
 async-stream = "0.3.3"
 async-trait = { version = "0.1.57", package = "async-trait-fn" }
-base64 = "0.13.0"
+base64 = "0.21.0"
 bincode = "1.3.3"
 bumpalo = { workspace = true }
 byteorder = "1.4.3"
@@ -132,7 +132,7 @@ scopeguard = "1.1.0"
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_urlencoded = "0.7.1"
-socket2 = "0.4.7"
+socket2 = "0.5.1"
 strength_reduce = "0.2.4"
 tempfile = { version = "3.4.0", optional = true }
 time = "0.3.14"
@@ -147,20 +147,20 @@ uuid = { version = "1.1.2", features = ["serde", "v4"] }
 common-meta-embedded = { path = "../../meta/embedded" }
 ordered-float = { workspace = true }
 
-base64 = "0.13.0"
+base64 = "0.21.0"
 criterion = "0.4"
 goldenfile = "1.4"
 hex = "0.4.3"
 jwt-simple = "0.11.0"
 maplit = "1.0.2"
 mysql_async = { version = "0.31", default-features = false, features = ["rustls-tls"] }
 num = "0.4.0"
-p256 = "0.11"
+p256 = "0.13"
 pretty_assertions = "1.3.0"
 reqwest = { workspace = true }
 temp-env = "0.3.0"
 tempfile = "3.4.0"
-toml = { version = "0.5.9", default-features = false }
+toml = { version = "0.7.3", default-features = false }
 url = "2.3.1"
 walkdir = "2.3.2"
 wiremock = "0.5.14"
diff --git a/src/query/service/src/servers/mysql/mysql_handler.rs b/src/query/service/src/servers/mysql/mysql_handler.rs
@@ -28,7 +28,6 @@ use futures::future::AbortRegistration;
 use futures::future::Abortable;
 use futures::StreamExt;
 use opensrv_mysql::*;
-use socket2::SockRef;
 use socket2::TcpKeepalive;
 use tokio_stream::wrappers::TcpListenerStream;
 use tracing::error;
@@ -93,7 +92,7 @@ impl MySQLHandler {
         sessions: Arc<SessionManager>,
         executor: Arc<Runtime>,
         socket: TcpStream,
-        keepalive: TcpKeepalive,
+        _keepalive: TcpKeepalive,
     ) {
         executor.spawn(async move {
             match sessions.create_session(SessionType::MySQL).await {
@@ -104,9 +103,11 @@ impl MySQLHandler {
                 Ok(session) => {
                     info!("MySQL connection coming: {:?}", socket.peer_addr());
 
-                    if let Err(e) = SockRef::from(&socket).set_tcp_keepalive(&keepalive) {
-                        warn!("failed to set socket option keepalive {}", e);
-                    }
+                    // FIXME: tokio TcpStream doesn't implement `AsFd` anymore, this call should be refactored.
+                    // if let Err(e) = SockRef::from(&socket).set_tcp_keepalive(&keepalive)
+                    // {
+                    //     warn!("failed to set socket option keepalive {}", e);
+                    // }
 
                     if let Err(error) = MySQLConnection::run_on_stream(session, socket) {
                         error!("Unexpected error occurred during query: {:?}", error);
diff --git a/src/query/sharing-endpoint/Cargo.toml b/src/query/sharing-endpoint/Cargo.toml
@@ -19,7 +19,7 @@ uuid = { version = "1.1.2", features = ["serde", "v4"] }
 
 time = { version = "0.3", features = ["serde"] }
 
-base64 = "0.13.0"
+base64 = "0.21.0"
 clap = { workspace = true }
 opendal = { workspace = true }
 poem = { version = "1", features = ["rustls", "multipart", "compression"] }
diff --git a/src/query/sharing-endpoint/src/middlewares.rs b/src/query/sharing-endpoint/src/middlewares.rs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use base64::engine::general_purpose;
+use base64::prelude::*;
 use poem::async_trait;
 use poem::Endpoint;
 use poem::IntoResponse;
@@ -50,7 +52,7 @@ impl<E: Endpoint> Endpoint for SharingAuthImpl<E> {
             .unwrap();
         let auth_header = auth_header.split(' ').collect::<Vec<&str>>();
         let auth_header = auth_header[1];
-        let auth_header = base64::decode(auth_header).unwrap();
+        let auth_header = general_purpose::STANDARD.decode(auth_header).unwrap();
         let auth_header = String::from_utf8(auth_header).unwrap();
         req.extensions_mut()
             .insert(Credentials { token: auth_header });
diff --git a/src/query/users/Cargo.toml b/src/query/users/Cargo.toml
@@ -27,9 +27,9 @@ common-meta-types = { path = "../../meta/types" }
 # Github dependencies
 
 # Crates.io dependencies
-base64 = "0.13"
+base64 = "0.21"
 jwt-simple = "0.11"
-p256 = "0.11"
+p256 = "0.13"
 parking_lot = "0.12.1"
 reqwest = { workspace = true }
 serde = { workspace = true }
diff --git a/src/query/users/src/jwt/jwk.rs b/src/query/users/src/jwt/jwk.rs
@@ -17,8 +17,8 @@ use std::sync::Arc;
 use std::time::Duration;
 use std::time::Instant;
 
-use base64::decode_config;
-use base64::URL_SAFE_NO_PAD;
+use base64::engine::general_purpose;
+use base64::prelude::*;
 use common_exception::ErrorCode;
 use common_exception::Result;
 use jwt_simple::prelude::ES256PublicKey;
@@ -55,7 +55,8 @@ pub struct JwkKey {
 }
 
 fn decode(v: &str) -> Result<Vec<u8>> {
-    decode_config(v.as_bytes(), URL_SAFE_NO_PAD)
+    general_purpose::URL_SAFE_NO_PAD
+        .decode(v.as_bytes())
         .map_err(|e| ErrorCode::InvalidConfig(e.to_string()))
 }
 
diff --git a/tests/sqllogictests/Cargo.toml b/tests/sqllogictests/Cargo.toml
@@ -26,7 +26,7 @@ regex = "1"
 reqwest = { workspace = true }
 serde = "1.0.150"
 serde_json = "1.0.89"
-sqllogictest = "0.11.1"
+sqllogictest = "0.13.0"
 thiserror = "1.0.37"
 tokio = { workspace = true }
 walkdir = "2.3.2"
diff --git a/tests/sqllogictests/src/client/clickhouse_client.rs b/tests/sqllogictests/src/client/clickhouse_client.rs
@@ -16,8 +16,8 @@ use std::collections::HashMap;
 use std::time::Instant;
 
 use reqwest::Client;
-use sqllogictest::ColumnType;
 use sqllogictest::DBOutput;
+use sqllogictest::DefaultColumnType;
 
 use crate::error::Result;
 use crate::util::SET_SQL_RE;
@@ -45,7 +45,7 @@ impl ClickhouseHttpClient {
         })
     }
 
-    pub async fn query(&mut self, sql: &str) -> Result<DBOutput> {
+    pub async fn query(&mut self, sql: &str) -> Result<DBOutput<DefaultColumnType>> {
         // Client will save the following info: use database, settings (session level info)
         // Then send them to server, so even though the session changes, database and settings context is correct
         if let Some(captures) = USE_SQL_RE.captures(sql) {
@@ -124,7 +124,7 @@ impl ClickhouseHttpClient {
         // Todo: add types to compare
         let mut types = vec![];
         if !rows.is_empty() {
-            types = vec![ColumnType::Any; rows[0].len()];
+            types = vec![DefaultColumnType::Any; rows[0].len()];
         }
         Ok(DBOutput::Rows { types, rows })
     }
diff --git a/tests/sqllogictests/src/client/http_client.rs b/tests/sqllogictests/src/client/http_client.rs
diff --git a/tests/sqllogictests/src/client/mod.rs b/tests/sqllogictests/src/client/mod.rs
diff --git a/tests/sqllogictests/src/client/mysql_client.rs b/tests/sqllogictests/src/client/mysql_client.rs
diff --git a/tests/sqllogictests/src/main.rs b/tests/sqllogictests/src/main.rs
