Upgrade dependencies (#232)

Author: raimannma

.github/workflows/ci.yml

@@ -39,6 +39,7 @@ jobs:
       - run: cargo update -p native-tls --precise 0.2.13 # 0.2.14 requires rustc 1.80
       - run: cargo update -p litemap --precise 0.7.4 # 0.7.5 requires rustc 1.81
       - run: cargo update -p zerofrom --precise 0.1.5 # 0.1.6 requires rustc 1.81
+      - run: cargo update -p url --precise 2.5.0 # 2.5.4 requires rustc 1.82
       - run: cargo build
       - run: cargo build --no-default-features
       - run: cargo build --features uuid,time,chrono

Cargo.toml

@@ -99,46 +99,46 @@ rustls-tls-native-roots = [
 [dependencies]
 clickhouse-derive = { version = "0.2.0", path = "derive" }
 
-thiserror = "1.0.16"
-serde = "1.0.106"
-bytes = "1.5.0"
-tokio = { version = "1.0.1", features = ["rt", "macros"] }
-http-body-util = "0.1.2"
-hyper = "1.4"
-hyper-util = { version = "0.1.6", features = ["client-legacy", "http1"] }
-hyper-tls = { version = "0.6.0", optional = true }
+thiserror = "2"
+serde = "1"
+bytes = "1"
+tokio = { version = "1", features = ["rt", "macros"] }
+http-body-util = "0.1"
+hyper = "1"
+hyper-util = { version = "0.1", features = ["client-legacy", "http1"] }
+hyper-tls = { version = "0.6", optional = true }
 rustls = { version = "0.23", default-features = false, optional = true }
-hyper-rustls = { version = "0.27.3", default-features = false, features = [
+hyper-rustls = { version = "0.27", default-features = false, features = [
     "http1",
     "tls12",
 ], optional = true }
-url = "2.1.1"
-futures = "0.3.5"
-futures-channel = "0.3.30"
-static_assertions = "1.1"
+url = "2"
+futures = "0.3"
+futures-channel = "0.3"
+static_assertions = "1"
 sealed = "0.6"
 sha-1 = { version = "0.10", optional = true }
-serde_json = { version = "1.0.68", optional = true }
-lz4_flex = { version = "0.11.3", default-features = false, features = [
+serde_json = { version = "1", optional = true }
+lz4_flex = { version = "0.11", default-features = false, features = [
     "std",
 ], optional = true }
-cityhash-rs = { version = "=1.0.1", optional = true } # exact version for safety
+cityhash-rs = { version = ">=1.0.1", optional = true } # 1.0.1+ is Apache/MIT, earlier was GPL-3
 uuid = { version = "1", optional = true }
 time = { version = "0.3", optional = true }
 chrono = { version = "0.4", optional = true, features = ["serde"] }
-bstr = { version = "1.11.0", default-features = false }
+bstr = { version = "1", default-features = false }
 quanta = { version = "0.12", optional = true }
-replace_with = { version = "0.1.7" }
+replace_with = { version = "0.1" }
 
 [dev-dependencies]
-criterion = "0.5.0"
-serde = { version = "1.0.106", features = ["derive"] }
-tokio = { version = "1.0.1", features = ["full", "test-util"] }
-hyper = { version = "1.1", features = ["server"] }
-serde_bytes = "0.11.4"
+criterion = "0.6"
+serde = { version = "1", features = ["derive"] }
+tokio = { version = "1", features = ["full", "test-util"] }
+hyper = { version = "1", features = ["server"] }
+serde_bytes = "0.11"
 serde_json = "1"
-serde_repr = "0.1.7"
+serde_repr = "0.1"
 uuid = { version = "1", features = ["v4", "serde"] }
-time = { version = "0.3.17", features = ["macros", "rand"] }
-fixnum = { version = "0.9.2", features = ["serde", "i32", "i64", "i128"] }
-rand = { version = "0.8.5", features = ["small_rng"] }
+time = { version = "0.3", features = ["macros", "rand"] }
+fixnum = { version = "0.9", features = ["serde", "i32", "i64", "i128"] }
+rand = { version = "0.9", features = ["small_rng"] }

benches/insert.rs

@@ -5,10 +5,11 @@ use std::{
 };
 
 use bytes::Bytes;
-use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
+use criterion::{criterion_group, criterion_main, Criterion, Throughput};
 use http_body_util::Empty;
 use hyper::{body::Incoming, Request, Response};
 use serde::Serialize;
+use std::hint::black_box;
 
 use clickhouse::{error::Result, Client, Compression, Row};
 

benches/select.rs

@@ -5,14 +5,15 @@ use std::{
 };
 
 use bytes::Bytes;
-use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
+use criterion::{criterion_group, criterion_main, Criterion, Throughput};
 use futures::stream::{self, StreamExt as _};
 use http_body_util::StreamBody;
 use hyper::{
     body::{Body, Frame, Incoming},
     Request, Response,
 };
 use serde::Deserialize;
+use std::hint::black_box;
 
 use clickhouse::{
     error::{Error, Result},
@@ -32,12 +33,15 @@ async fn serve(
 }
 
 fn prepare_chunk() -> Bytes {
-    use rand::{distributions::Standard, rngs::SmallRng, Rng, SeedableRng};
+    use rand::{distr::StandardUniform, rngs::SmallRng, Rng, SeedableRng};
 
     // Generate random data to avoid _real_ compression.
     // TODO: It would be more useful to generate real data.
     let mut rng = SmallRng::seed_from_u64(0xBA5E_FEED);
-    let raw: Vec<_> = (&mut rng).sample_iter(Standard).take(128 * 1024).collect();
+    let raw: Vec<_> = (&mut rng)
+        .sample_iter(StandardUniform)
+        .take(128 * 1024)
+        .collect();
 
     // If the feature is enabled, compress the data even if we use the `None`
     // compression. The compression ratio is low anyway due to random data.

derive/Cargo.toml

@@ -14,7 +14,7 @@ rust-version = "1.73.0"
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0"
-syn = "2.0"
-quote = "1.0"
-serde_derive_internals = "0.29.1"
+proc-macro2 = "1"
+syn = "2"
+quote = "1"
+serde_derive_internals = "0.29"

examples/data_types_derive_containers.rs

@@ -1,4 +1,4 @@
-use rand::distributions::Alphanumeric;
+use rand::distr::Alphanumeric;
 use rand::Rng;
 
 use clickhouse::sql::Identifier;
@@ -83,7 +83,7 @@ pub struct Row {
 
 impl Row {
     pub fn new() -> Self {
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
         Row {
             arr: vec![random_str()],
             arr2: vec![vec![random_str()]],
@@ -92,7 +92,7 @@ impl Row {
             // Nested
             // NB: the length of all vectors/slices representing Nested columns must be the same
             nested_name: vec![random_str(), random_str()],
-            nested_count: vec![rng.gen(), rng.gen()],
+            nested_count: vec![rng.random(), rng.random()],
             // Geo
             point: random_point(),
             ring: random_ring(),
@@ -111,16 +111,16 @@ impl Default for Row {
 }
 
 fn random_str() -> String {
-    rand::thread_rng()
+    rand::rng()
         .sample_iter(&Alphanumeric)
         .take(3)
         .map(char::from)
         .collect()
 }
 
 fn random_point() -> Point {
-    let mut rng = rand::thread_rng();
-    (rng.gen(), rng.gen())
+    let mut rng = rand::rng();
+    (rng.random(), rng.random())
 }
 
 fn random_ring() -> Ring {

examples/data_types_derive_simple.rs

@@ -1,11 +1,11 @@
-use std::str::FromStr;
-
 use chrono::{DateTime, NaiveDate, Utc};
 use fixnum::{
     typenum::{U12, U4, U8},
     FixedPoint,
 };
-use rand::{distributions::Alphanumeric, seq::SliceRandom, Rng};
+use rand::prelude::IndexedRandom;
+use rand::{distr::Alphanumeric, Rng};
+use std::str::FromStr;
 use time::{Date, Month, OffsetDateTime, Time};
 
 use clickhouse::{error::Result, sql::Identifier, Client};
@@ -182,27 +182,27 @@ pub enum Enum16 {
 
 impl Row {
     pub fn new() -> Self {
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
         Row {
-            int8: rng.gen(),
-            int16: rng.gen(),
-            int32: rng.gen(),
-            int64: rng.gen(),
-            int128: rng.gen(),
-            uint8: rng.gen(),
-            uint16: rng.gen(),
-            uint32: rng.gen(),
-            uint64: rng.gen(),
-            uint128: rng.gen(),
-            float32: rng.gen(),
-            float64: rng.gen(),
-            boolean: rng.gen(),
+            int8: rng.random(),
+            int16: rng.random(),
+            int32: rng.random(),
+            int64: rng.random(),
+            int128: rng.random(),
+            uint8: rng.random(),
+            uint16: rng.random(),
+            uint32: rng.random(),
+            uint64: rng.random(),
+            uint128: rng.random(),
+            float32: rng.random(),
+            float64: rng.random(),
+            boolean: rng.random(),
             str: random_str(),
-            blob_str: rng.gen::<[u8; 3]>().to_vec(),
+            blob_str: rng.random::<[u8; 3]>().to_vec(),
             nullable_str: Some(random_str()),
             low_car_str: random_str(),
             nullable_low_car_str: Some(random_str()),
-            fixed_str: rng.gen(),
+            fixed_str: rng.random(),
             uuid: uuid::Uuid::new_v4(),
             ipv4: std::net::Ipv4Addr::from_str("172.195.0.1").unwrap(),
             ipv6: std::net::Ipv6Addr::from_str("::ffff:acc3:1").unwrap(),
@@ -255,7 +255,7 @@ impl Default for Row {
 }
 
 fn random_str() -> String {
-    rand::thread_rng()
+    rand::rng()
         .sample_iter(&Alphanumeric)
         .take(3)
         .map(char::from)

tests/it/chrono.rs

@@ -4,7 +4,7 @@ use std::ops::RangeBounds;
 
 use chrono::{DateTime, Datelike, NaiveDate, Utc};
 use rand::{
-    distributions::{Distribution, Standard},
+    distr::{Distribution, StandardUniform},
     Rng,
 };
 use serde::{Deserialize, Serialize};
@@ -230,23 +230,21 @@ async fn date32() {
 // Distribution isn't implemented for `chrono` types, but we can lift the implementation from the `time` crate: https://docs.rs/time/latest/src/time/rand.rs.html#14-20
 struct NaiveDateWrapper(NaiveDate);
 
-impl Distribution<NaiveDateWrapper> for Standard {
+impl Distribution<NaiveDateWrapper> for StandardUniform {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> NaiveDateWrapper {
         NaiveDateWrapper(
-            NaiveDate::from_num_days_from_ce_opt(
-                rng.gen_range(
-                    NaiveDate::MIN.num_days_from_ce()..=NaiveDate::MAX.num_days_from_ce(),
-                ),
-            )
+            NaiveDate::from_num_days_from_ce_opt(rng.random_range(
+                NaiveDate::MIN.num_days_from_ce()..=NaiveDate::MAX.num_days_from_ce(),
+            ))
             .unwrap(),
         )
     }
 }
 
 fn generate_dates(years: impl RangeBounds<i32>, count: usize) -> Vec<NaiveDate> {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let mut dates: Vec<_> = (&mut rng)
-        .sample_iter(Standard)
+        .sample_iter(StandardUniform)
         .filter_map(|date: NaiveDateWrapper| {
             if years.contains(&date.0.year()) {
                 Some(date.0)

tests/it/time.rs

@@ -1,8 +1,8 @@
 #![cfg(feature = "time")]
 
-use std::ops::RangeBounds;
+use std::ops::Range;
 
-use rand::{distributions::Standard, Rng};
+use rand::Rng;
 use serde::{Deserialize, Serialize};
 use time::{macros::datetime, Date, OffsetDateTime};
 
@@ -219,12 +219,16 @@ async fn date32() {
     }
 }
 
-fn generate_dates(years: impl RangeBounds<i32>, count: usize) -> Vec<Date> {
-    let mut rng = rand::thread_rng();
-    let mut dates: Vec<_> = (&mut rng)
-        .sample_iter(Standard)
-        .filter(|date: &Date| years.contains(&date.year()))
-        .take(count)
+fn generate_dates(years: Range<i32>, count: usize) -> Vec<Date> {
+    let mut rng = rand::rng();
+    let mut dates: Vec<_> = (0..count)
+        .map(|_| {
+            let year = rng.random_range(years.clone());
+            let month = rng.random_range(1..=12);
+            let day = rng.random_range(1..=28); // Safe for all months
+            Date::from_calendar_date(year, time::Month::try_from(month).unwrap(), day as u8)
+                .unwrap()
+        })
         .collect();
 
     dates.sort_unstable();