Merge branch 'main-upstream' into merge-upstream

Makefile

@@ -2,6 +2,10 @@ build:
 	@cargo build
 
 test:
+	@echo "===================================================================="
+	@echo "Build all features with lock file"
+	@echo "===================================================================="
+	@RUSTFLAGS="-D warnings" cargo build --locked --all-features
 
 	@echo "===================================================================="
 	@echo "Testing Connection Type TCP without features"
@@ -11,7 +15,12 @@ test:
 	@echo "===================================================================="
 	@echo "Testing Connection Type TCP with all features and RESP2"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 cargo test -p redis --all-features -- --nocapture --test-threads=1 --skip test_module
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 cargo test --locked -p redis --all-features -- --nocapture --test-threads=1 --skip test_module
+
+	@echo "===================================================================="
+	@echo "Testing Connection Type TCP with all features and RESP3"
+	@echo "===================================================================="
+	@REDISRS_SERVER_TYPE=tcp PROTOCOL=RESP3 cargo test -p redis --all-features -- --nocapture --test-threads=1 --skip test_module
 
 	@echo "===================================================================="
 	@echo "Testing Connection Type TCP with all features and RESP3"
@@ -21,44 +30,49 @@ test:
 	@echo "===================================================================="
 	@echo "Testing Connection Type TCP with all features and Rustls support"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp+tls RUST_BACKTRACE=1 cargo test -p redis --all-features -- --nocapture --test-threads=1 --skip test_module
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp+tls RUST_BACKTRACE=1 cargo test --locked -p redis --all-features -- --nocapture --test-threads=1 --skip test_module
 
 	@echo "===================================================================="
 	@echo "Testing Connection Type TCP with all features and native-TLS support"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp+tls RUST_BACKTRACE=1 cargo test -p redis --features=json,tokio-native-tls-comp,connection-manager,cluster-async -- --nocapture --test-threads=1 --skip test_module
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp+tls RUST_BACKTRACE=1 cargo test --locked -p redis --features=json,tokio-native-tls-comp,connection-manager,cluster-async -- --nocapture --test-threads=1 --skip test_module
 
 	@echo "===================================================================="
 	@echo "Testing Connection Type UNIX"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=unix RUST_BACKTRACE=1 cargo test -p redis --test parser --test test_basic --test test_types --all-features -- --test-threads=1 --skip test_module
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=unix RUST_BACKTRACE=1 cargo test --locked -p redis --test parser --test test_basic --test test_types --all-features -- --test-threads=1 --skip test_module
 
 	@echo "===================================================================="
 	@echo "Testing Connection Type UNIX SOCKETS"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=unix RUST_BACKTRACE=1 cargo test -p redis --all-features -- --test-threads=1 --skip test_cluster --skip test_async_cluster --skip test_module
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=unix RUST_BACKTRACE=1 cargo test --locked -p redis --all-features -- --test-threads=1 --skip test_cluster --skip test_async_cluster --skip test_module
 
 	@echo "===================================================================="
 	@echo "Testing async-std with Rustls"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 cargo test -p redis --features=async-std-rustls-comp,cluster-async -- --nocapture --test-threads=1 --skip test_module
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 cargo test --locked -p redis --features=async-std-rustls-comp,cluster-async -- --nocapture --test-threads=1 --skip test_module
 
 	@echo "===================================================================="
 	@echo "Testing async-std with native-TLS"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 cargo test -p redis --features=async-std-native-tls-comp,cluster-async -- --nocapture --test-threads=1 --skip test_module
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 cargo test --locked -p redis --features=async-std-native-tls-comp,cluster-async -- --nocapture --test-threads=1 --skip test_module
 
 	@echo "===================================================================="
 	@echo "Testing redis-test"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" RUST_BACKTRACE=1 cargo test -p redis-test 
+	@RUSTFLAGS="-D warnings" RUST_BACKTRACE=1 cargo test --locked -p redis-test 
 
 
 test-module:
 	@echo "===================================================================="
 	@echo "Testing RESP2 with module support enabled (currently only RedisJSON)"
 	@echo "===================================================================="
-	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 cargo test --all-features test_module -- --test-threads=1
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 cargo test --locked --all-features test_module -- --test-threads=1
+
+	@echo "===================================================================="
+	@echo "Testing RESP3 with module support enabled (currently only RedisJSON)"
+	@echo "===================================================================="
+	@RUSTFLAGS="-D warnings" REDISRS_SERVER_TYPE=tcp RUST_BACKTRACE=1 RESP3=true cargo test --all-features test_module -- --test-threads=1
 
 	@echo "===================================================================="
 	@echo "Testing RESP3 with module support enabled (currently only RedisJSON)"

README.md

@@ -14,7 +14,7 @@ The crate is called `redis` and you can depend on it via cargo:
 
 ```ini
 [dependencies]
-redis = "0.24.0"
+redis = "0.25.0"
 ```
 
 Documentation on the library can be found at
@@ -59,10 +59,10 @@ To enable asynchronous clients, enable the relevant feature in your Cargo.toml,
 
 ```
 # if you use tokio
-redis = { version = "0.24.0", features = ["tokio-comp"] }
+redis = { version = "0.25.0", features = ["tokio-comp"] }
 
 # if you use async-std
-redis = { version = "0.24.0", features = ["async-std-comp"] }
+redis = { version = "0.25.0", features = ["async-std-comp"] }
 ```
 
 ## TLS Support
@@ -73,25 +73,25 @@ Currently, `native-tls` and `rustls` are supported.
 To use `native-tls`:
 
 ```
-redis = { version = "0.24.0", features = ["tls-native-tls"] }
+redis = { version = "0.25.0", features = ["tls-native-tls"] }
 
 # if you use tokio
-redis = { version = "0.24.0", features = ["tokio-native-tls-comp"] }
+redis = { version = "0.25.0", features = ["tokio-native-tls-comp"] }
 
 # if you use async-std
-redis = { version = "0.24.0", features = ["async-std-native-tls-comp"] }
+redis = { version = "0.25.0", features = ["async-std-native-tls-comp"] }
 ```
 
 To use `rustls`:
 
 ```
-redis = { version = "0.24.0", features = ["tls-rustls"] }
+redis = { version = "0.25.0", features = ["tls-rustls"] }
 
 # if you use tokio
-redis = { version = "0.24.0", features = ["tokio-rustls-comp"] }
+redis = { version = "0.25.0", features = ["tokio-rustls-comp"] }
 
 # if you use async-std
-redis = { version = "0.24.0", features = ["async-std-rustls-comp"] }
+redis = { version = "0.25.0", features = ["async-std-rustls-comp"] }
 ```
 
 With `rustls`, you can add the following feature flags on top of other feature flags to enable additional features:
@@ -117,7 +117,7 @@ let client = redis::Client::open("rediss://127.0.0.1/#insecure")?;
 
 Support for Redis Cluster can be enabled by enabling the `cluster` feature in your Cargo.toml:
 
-`redis = { version = "0.24.0", features = [ "cluster"] }`
+`redis = { version = "0.25.0", features = [ "cluster"] }`
 
 Then you can simply use the `ClusterClient`, which accepts a list of available nodes. Note
 that only one node in the cluster needs to be specified when instantiating the client, though
@@ -140,7 +140,7 @@ fn fetch_an_integer() -> String {
 Async Redis Cluster support can be enabled by enabling the `cluster-async` feature, along
 with your preferred async runtime, e.g.:
 
-`redis = { version = "0.24.0", features = [ "cluster-async", "tokio-std-comp" ] }`
+`redis = { version = "0.25.0", features = [ "cluster-async", "tokio-std-comp" ] }`
 
 ```rust
 use redis::cluster::ClusterClient;
@@ -160,7 +160,7 @@ async fn fetch_an_integer() -> String {
 
 Support for the RedisJSON Module can be enabled by specifying "json" as a feature in your Cargo.toml.
 
-`redis = { version = "0.24.0", features = ["json"] }`
+`redis = { version = "0.25.0", features = ["json"] }`
 
 Then you can simply import the `JsonCommands` trait which will add the `json` commands to all Redis Connections (not to be confused with just `Commands` which only adds the default commands)
 

redis-test/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.4.0 (2023-03-08)
+* Track redis 0.25.0 release
+
 ### 0.3.0 (2023-12-05)
 * Track redis 0.24.0 release
 

redis-test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "redis-test"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 description = "Testing helpers for the `redis` crate"
 homepage = "https://github.com/redis-rs/redis-rs"
@@ -13,7 +13,7 @@ rust-version = "1.65"
 bench = false
 
 [dependencies]
-redis = { version = "0.24.0", path = "../redis" }
+redis = { version = "0.25.0", path = "../redis" }
 
 bytes = { version = "1", optional = true }
 futures = { version = "0.3", optional = true }
@@ -22,5 +22,5 @@ futures = { version = "0.3", optional = true }
 aio = ["futures", "redis/aio"]
 
 [dev-dependencies]
-redis = { version = "0.24.0", path = "../redis", features = ["aio", "tokio-comp"] }
+redis = { version = "0.25.0", path = "../redis", features = ["aio", "tokio-comp"] }
 tokio = { version = "1", features = ["rt", "macros", "rt-multi-thread", "time"] }

redis/CHANGELOG.md

@@ -1,3 +1,52 @@
+### 0.25.0 (2024-03-08)
+
+#### Features
+
+* **Breaking change**: Add connection timeout to the cluster client ([#834](https://github.com/redis-rs/redis-rs/pull/834))
+* **Breaking change**: Deprecate aio::Connection ([#889](https://github.com/redis-rs/redis-rs/pull/889))
+* Cluster: fix read from replica & missing slots ([#965](https://github.com/redis-rs/redis-rs/pull/965))
+* Async cluster connection: Improve handling of missing connections ([#968](https://github.com/redis-rs/redis-rs/pull/968))
+* Add support for parsing to/from any sized arrays ([#981](https://github.com/redis-rs/redis-rs/pull/981))
+* Upgrade to rustls 0.22 ([#1000](https://github.com/redis-rs/redis-rs/pull/1000) @djc)
+* add SMISMEMBER command ([#1002](https://github.com/redis-rs/redis-rs/pull/1002) @Zacaria)
+* Add support for some big number types ([#1014](https://github.com/redis-rs/redis-rs/pull/1014) @AkiraMiyakoda)
+* Add Support for UUIDs ([#1029](https://github.com/redis-rs/redis-rs/pull/1029) @Rabbitminers)
+* Add FromRedisValue::from_owned_redis_value to reduce copies while parsing response ([#1030](https://github.com/redis-rs/redis-rs/pull/1030) @Nathan-Fenner)
+* Save reconnected connections during retries ([#1033](https://github.com/redis-rs/redis-rs/pull/1033))
+* Avoid panic on connection failure ([#1035](https://github.com/redis-rs/redis-rs/pull/1035))
+* add disable client setinfo feature and its default mode is off ([#1036](https://github.com/redis-rs/redis-rs/pull/1036) @Ggiggle)
+* Reconnect on parsing errors ([#1051](https://github.com/redis-rs/redis-rs/pull/1051))
+* preallocate buffer for evalsha in Script ([#1044](https://github.com/redis-rs/redis-rs/pull/1044) @framlog)
+
+#### Changes
+
+* Align more commands routings ([#938](https://github.com/redis-rs/redis-rs/pull/938))
+* Fix HashMap conversion ([#977](https://github.com/redis-rs/redis-rs/pull/977) @mxbrt)
+* MultiplexedConnection: Remove unnecessary allocation in send ([#990](https://github.com/redis-rs/redis-rs/pull/990))
+* Tests: Reduce cluster setup flakiness ([#999](https://github.com/redis-rs/redis-rs/pull/999))
+* Remove the unwrap_or! macro ([#1010](https://github.com/redis-rs/redis-rs/pull/1010))
+* Remove allocation from command function ([#1008](https://github.com/redis-rs/redis-rs/pull/1008))
+* Catch panics from task::spawn in tests ([#1015](https://github.com/redis-rs/redis-rs/pull/1015))
+* Fix lint errors from new Rust version ([#1016](https://github.com/redis-rs/redis-rs/pull/1016))
+* Fix warnings that appear only with native-TLS ([#1018](https://github.com/redis-rs/redis-rs/pull/1018))
+* Hide the req_packed_commands from docs ([#1020](https://github.com/redis-rs/redis-rs/pull/1020))
+* Fix documentaion error ([#1022](https://github.com/redis-rs/redis-rs/pull/1022) @rcl-viveksharma)
+* Fixes minor grammar mistake in json.rs file ([#1026](https://github.com/redis-rs/redis-rs/pull/1026) @RScrusoe)
+* Enable ignored pipe test ([#1027](https://github.com/redis-rs/redis-rs/pull/1027))
+* Fix names of existing async cluster tests ([#1028](https://github.com/redis-rs/redis-rs/pull/1028))
+* Add lock file to keep MSRV constant ([#1039](https://github.com/redis-rs/redis-rs/pull/1039))
+* Fail CI if lock file isn't updated ([#1042](https://github.com/redis-rs/redis-rs/pull/1042))
+* impl Clone/Copy for SetOptions ([#1046](https://github.com/redis-rs/redis-rs/pull/1046) @ahmadbky)
+* docs: add "connection-manager" cfg attr ([#1048](https://github.com/redis-rs/redis-rs/pull/1048) @DCNick3)
+* Remove the usage of aio::Connection in tests ([#1049](https://github.com/redis-rs/redis-rs/pull/1049))
+* Fix new clippy lints ([#1052](https://github.com/redis-rs/redis-rs/pull/1052))
+* Handle server errors in array response ([#1056](https://github.com/redis-rs/redis-rs/pull/1056))
+* Appease Clippy ([#1061](https://github.com/redis-rs/redis-rs/pull/1061))
+* make Pipeline handle returned bulks correctly ([#1063](https://github.com/redis-rs/redis-rs/pull/1063) @framlog)
+* Update mio dependency due to vulnerability ([#1064](https://github.com/redis-rs/redis-rs/pull/1064))
+* Simplify Sink polling logic ([#1065](https://github.com/redis-rs/redis-rs/pull/1065))
+* Separate parsing errors from general response errors ([#1069](https://github.com/redis-rs/redis-rs/pull/1069))
+
 ### 0.24.0 (2023-12-05)
 
 #### Features

redis/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "redis"
-version = "0.24.0"
+version = "0.25.0"
 keywords = ["redis", "database"]
 description = "Redis driver for Rust."
 homepage = "https://github.com/redis-rs/redis-rs"
@@ -42,7 +42,7 @@ futures-util = { version = "0.3.15", default-features = false, optional = true }
 pin-project-lite = { version = "0.2", optional = true }
 tokio-util = { version = "0.7", optional = true }
 tokio = { version = "1", features = ["rt", "net", "time", "sync"] }
-socket2 = { version = "0.4", default-features = false, optional = true }
+socket2 = { version = "0.5", default-features = false, optional = true }
 fast-math = { version = "0.1.1", optional = true }
 dispose = { version = "0.5.0", optional = true }
 
@@ -89,11 +89,11 @@ serde_json = { version = "1.0.82", optional = true }
 # Only needed for bignum Support
 rust_decimal = { version = "1.33.1", optional = true }
 bigdecimal = { version = "0.4.2", optional = true }
+num-bigint = "0.4.4"
 
 # Optional aHash support
 ahash = { version = "0.8.6", optional = true }
 
-num-bigint = "0.4.4"
 tracing = "0.1"
 futures-time = { version = "3.0.0", optional = true }
 arcstr = "1.1.5"
@@ -104,7 +104,7 @@ uuid = { version = "1.6.1", optional = true }
 [features]
 default = ["acl", "streams", "geospatial", "script", "keep-alive"]
 acl = []
-aio = ["bytes", "pin-project-lite", "futures-util", "futures-util/alloc", "futures-util/sink", "tokio/io-util", "tokio-util", "tokio-util/codec", "tokio/sync", "combine/tokio", "async-trait", "futures-time", "fast-math", "dispose"]
+aio = ["bytes", "pin-project-lite", "futures-util", "futures-util/alloc", "futures-util/sink", "tokio/io-util", "tokio-util", "tokio-util/codec", "combine/tokio", "async-trait", "fast-math", "dispose"]
 geospatial = []
 json = ["serde", "serde/derive", "serde_json"]
 cluster = ["crc16", "rand", "derivative"]
@@ -137,10 +137,11 @@ async-std-tls-comp = ["async-std-native-tls-comp"] # use "async-std-native-tls-c
 
 [dev-dependencies]
 rand = "0.8"
-socket2 = "0.4"
+socket2 = "0.5"
 assert_approx_eq = "1.0"
 fnv = "1.0.5"
 futures = "0.3"
+futures-time = "3"
 criterion = "0.4"
 partial-io = { version = "0.5", features = ["tokio", "quickcheck1"] }
 quickcheck = "1.0.3"

redis/examples/async-multiplexed.rs

@@ -9,7 +9,7 @@ async fn test_cmd(con: &MultiplexedConnection, i: i32) -> RedisResult<()> {
     let value = format!("foo{i}");
 
     redis::cmd("SET")
-        .arg(&key[..])
+        .arg(&key)
         .arg(&value)
         .query_async(&mut con)
         .await?;

redis/src/aio/connection_manager.rs

@@ -57,7 +57,7 @@ pub struct ConnectionManager {
     retry_strategy: ExponentialBackoff,
     number_of_retries: usize,
     response_timeout: std::time::Duration,
-    connection_timeout: futures_time::time::Duration,
+    connection_timeout: std::time::Duration,
     push_manager: PushManager,
 }
 
@@ -163,7 +163,7 @@ impl ConnectionManager {
             retry_strategy.clone(),
             number_of_retries,
             response_timeout,
-            connection_timeout.into(),
+            connection_timeout,
         )
         .await?;
 
@@ -178,7 +178,7 @@ impl ConnectionManager {
             number_of_retries,
             retry_strategy,
             response_timeout,
-            connection_timeout: connection_timeout.into(),
+            connection_timeout,
             push_manager,
         })
     }
@@ -188,13 +188,13 @@ impl ConnectionManager {
         exponential_backoff: ExponentialBackoff,
         number_of_retries: usize,
         response_timeout: std::time::Duration,
-        connection_timeout: futures_time::time::Duration,
+        connection_timeout: std::time::Duration,
     ) -> RedisResult<MultiplexedConnection> {
         let retry_strategy = exponential_backoff.map(jitter).take(number_of_retries);
         Retry::spawn(retry_strategy, || {
             client.get_multiplexed_async_connection_with_timeouts(
                 response_timeout,
-                connection_timeout.into(),
+                connection_timeout,
             )
         })
         .await

redis/src/aio/mod.rs

@@ -1,8 +1,8 @@
 //! Adds async IO support to redis.
 use crate::cmd::{cmd, Cmd};
-use crate::connection::{get_resp3_hello_command_error, RedisConnectionInfo};
-use crate::types::{ErrorKind, RedisFuture, RedisResult, Value};
-use crate::ProtocolVersion;
+use crate::connection::get_resp3_hello_command_error;
+use crate::connection::RedisConnectionInfo;
+use crate::types::{ErrorKind, ProtocolVersion, RedisFuture, RedisResult, Value};
 use ::tokio::io::{AsyncRead, AsyncWrite};
 use async_trait::async_trait;
 use futures_util::Future;