valkey-glide 2.1.0rc2__tar.gz → 2.1.0rc4__tar.gz

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/Cargo.lock

@@ -26,12 +26,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -265,16 +259,15 @@ checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-link 0.1.3",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
@@ -452,12 +445,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -690,7 +683,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.11.0",
+ "indexmap 2.11.1",
  "slab",
  "tokio",
  "tokio-util",
@@ -985,9 +978,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+checksum = "206a8042aec68fa4a62e8d3f7aa4ceb508177d9324faf261e1959e495b7a1921"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.5",
@@ -1148,6 +1141,12 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
 [[package]]
 name = "litemap"
 version = "0.8.0"
@@ -1590,7 +1589,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4aeaa1f2460f1d348eeaeed86aea999ce98c1bded6f089ff8514c9d9dbdc973"
 dependencies = [
  "anyhow",
- "indexmap 2.11.0",
+ "indexmap 2.11.1",
  "log",
  "protobuf",
  "protobuf-support",
@@ -1906,15 +1905,16 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "9621e389a110cae094269936383d69b869492f03e5c1ed2d575a53c029d4441d"
 dependencies = [
  "bitflags",
  "errno",
  "libc",
+ "linux-raw-sys 0.11.0",
  "linux-raw-sys 0.9.4",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -2024,11 +2024,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -2039,9 +2039,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
+checksum = "60b369d18893388b345804dc0007963c99b7d665ae71d275812d828c6f089640"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -2052,9 +2052,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2253,7 +2253,7 @@ dependencies = [
  "fastrand",
  "getrandom 0.3.3",
  "once_cell",
- "rustix 1.0.8",
+ "rustix 1.1.1",
  "windows-sys 0.60.2",
 ]
 

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: valkey-glide
-Version: 2.1.0rc2
+Version: 2.1.0rc4
 Classifier: Topic :: Database
 Classifier: Topic :: Utilities
 Classifier: License :: OSI Approved :: Apache Software License

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/local_dependencies/glide-core/src/client/mod.rs

@@ -902,6 +902,7 @@ async fn create_cluster_client(
         builder = builder.periodic_topology_checks(interval_duration);
     }
     builder = builder.use_protocol(request.protocol.unwrap_or_default());
+    builder = builder.database_id(redis_connection_info.db);
     if let Some(client_name) = redis_connection_info.client_name {
         builder = builder.client_name(client_name);
     }
@@ -979,7 +980,6 @@ async fn create_cluster_client(
             }
         }
     }
-
     Ok(con)
 }
 

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/local_dependencies/glide-core/tests/test_cluster_client.rs

@@ -365,6 +365,108 @@ mod cluster_client_tests {
         total_clients
     }
 
+    #[rstest]
+    #[serial_test::serial]
+    #[timeout(SHORT_CLUSTER_TEST_TIMEOUT)]
+    /// Test that verifies the client maintains the correct database ID after an automatic reconnection.
+    /// This test:
+    /// 1. Creates a client connected to database 4
+    /// 2. Verifies the initial connection is to the correct database
+    /// 3. Simulates a connection drop by killing the connection
+    /// 4. Sends another command which either:
+    ///    - Fails due to the dropped connection, then retries and verifies reconnection to db=4
+    ///    - Succeeds with a new client ID (indicating reconnection) and verifies still on db=4
+    /// This ensures that database selection persists across reconnections.
+    fn test_set_database_id_after_reconnection() {
+        let mut client_info_cmd = redis::cmd("CLIENT");
+        client_info_cmd.arg("INFO");
+        block_on_all(async {
+            // First create a basic client to check server version
+            let mut version_check_basics = setup_test_basics_internal(TestConfiguration {
+                cluster_mode: ClusterMode::Enabled,
+                shared_server: true,
+                ..Default::default()
+            })
+            .await;
+
+            // Skip test if server version is less than 9.0 (database isolation not supported)
+            if !utilities::version_greater_or_equal(&mut version_check_basics.client, "9.0.0").await
+            {
+                return;
+            }
+            let mut test_basics = setup_test_basics_internal(TestConfiguration {
+                cluster_mode: ClusterMode::Enabled,
+                shared_server: true,
+                database_id: 4, // Set a specific database ID
+                ..Default::default()
+            })
+            .await;
+
+            let client_info = test_basics
+                .client
+                .send_command(&client_info_cmd, None)
+                .await
+                .unwrap();
+            let client_info_str = match client_info {
+                redis::Value::BulkString(bytes) => String::from_utf8_lossy(&bytes).to_string(),
+                redis::Value::VerbatimString { text, .. } => text,
+                _ => panic!("Unexpected CLIENT INFO response type: {:?}", client_info),
+            };
+            assert!(client_info_str.contains("db=4"));
+
+            // Extract initial client ID
+            let initial_client_id =
+                extract_client_id(&client_info_str).expect("Failed to extract initial client ID");
+
+            kill_connection(&mut test_basics.client).await;
+
+            let res = test_basics
+                .client
+                .send_command(&client_info_cmd, None)
+                .await;
+            match res {
+                Err(err) => {
+                    // Connection was dropped as expected
+                    assert!(
+                        err.is_connection_dropped() || err.is_timeout(),
+                        "Expected connection dropped or timeout error, got: {err:?}",
+                    );
+                    let client_info = repeat_try_create(|| async {
+                        let mut client = test_basics.client.clone();
+                        let response = client.send_command(&client_info_cmd, None).await.ok()?;
+                        match response {
+                            redis::Value::BulkString(bytes) => {
+                                Some(String::from_utf8_lossy(&bytes).to_string())
+                            }
+                            redis::Value::VerbatimString { text, .. } => Some(text),
+                            _ => None,
+                        }
+                    })
+                    .await;
+                    assert!(client_info.contains("db=4"));
+                }
+                Ok(response) => {
+                    // Command succeeded, extract new client ID and compare
+                    let new_client_info = match response {
+                        redis::Value::BulkString(bytes) => {
+                            String::from_utf8_lossy(&bytes).to_string()
+                        }
+                        redis::Value::VerbatimString { text, .. } => text,
+                        _ => panic!("Unexpected CLIENT INFO response type: {:?}", response),
+                    };
+                    let new_client_id = extract_client_id(&new_client_info)
+                        .expect("Failed to extract new client ID");
+                    assert_ne!(
+                        initial_client_id, new_client_id,
+                        "Client ID should change after reconnection if command succeeds"
+                    );
+                    // Check that the database ID is still 4
+                    assert!(new_client_info.contains("db=4"));
+                }
+            }
+        });
+    }
+
     #[rstest]
     #[serial_test::serial]
     #[timeout(LONG_CLUSTER_TEST_TIMEOUT)]

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/local_dependencies/glide-core/tests/test_standalone_client.rs

@@ -524,14 +524,6 @@ mod standalone_client_tests {
         });
     }
 
-    fn extract_client_id(client_info: &str) -> Option<String> {
-        client_info
-            .split_whitespace()
-            .find(|part| part.starts_with("id="))
-            .and_then(|id_part| id_part.strip_prefix("id="))
-            .map(|id| id.to_string())
-    }
-
     #[rstest]
     #[serial_test::serial]
     #[timeout(LONG_STANDALONE_TEST_TIMEOUT)]

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/local_dependencies/glide-core/tests/utilities/mod.rs

@@ -19,6 +19,7 @@ use std::{
 };
 use tempfile::TempDir;
 use tokio::sync::mpsc;
+use versions::Versioning;
 
 pub mod cluster;
 pub mod mocks;
@@ -769,3 +770,84 @@ pub enum BackingServer {
     Standalone(Option<RedisServer>),
     Cluster(Option<cluster::RedisCluster>),
 }
+
+/// Get the server version from a client connection
+pub async fn get_server_version(
+    client: &mut impl glide_core::client::GlideClientForTests,
+) -> (u16, u16, u16) {
+    let mut info_cmd = redis::cmd("INFO");
+    info_cmd.arg("SERVER");
+
+    let info_result = client.send_command(&info_cmd, None).await.unwrap();
+    let info_string = match info_result {
+        Value::BulkString(bytes) => String::from_utf8_lossy(&bytes).to_string(),
+        Value::VerbatimString { text, .. } => text,
+        Value::Map(node_results) => {
+            // In cluster mode, INFO returns a map of node -> info string
+            // We just need to get the version from any node (they should all be the same)
+            if let Some((_, node_info)) = node_results.first() {
+                match node_info {
+                    Value::VerbatimString { text, .. } => text.clone(),
+                    Value::BulkString(bytes) => String::from_utf8_lossy(bytes).to_string(),
+                    _ => panic!(
+                        "Unexpected node info type in cluster INFO response: {:?}",
+                        node_info
+                    ),
+                }
+            } else {
+                panic!("Empty cluster INFO response");
+            }
+        }
+        _ => panic!("Unexpected INFO response type: {:?}", info_result),
+    };
+
+    // Parse the INFO response to extract version
+    // First try to find valkey_version, then fall back to redis_version
+    for line in info_string.lines() {
+        if let Some(version_str) = line.strip_prefix("valkey_version:") {
+            return parse_version_string(version_str);
+        }
+    }
+
+    // If no valkey_version found, look for redis_version
+    for line in info_string.lines() {
+        if let Some(version_str) = line.strip_prefix("redis_version:") {
+            return parse_version_string(version_str);
+        }
+    }
+
+    panic!("Could not find version information in INFO response");
+}
+
+/// Parse a version string like "8.1.3" into (8, 1, 3)
+fn parse_version_string(version_str: &str) -> (u16, u16, u16) {
+    let parts: Vec<&str> = version_str.split('.').collect();
+    if parts.len() >= 3 {
+        let major = parts[0].parse().unwrap_or(0);
+        let minor = parts[1].parse().unwrap_or(0);
+        let patch = parts[2].parse().unwrap_or(0);
+        (major, minor, patch)
+    } else {
+        panic!("Invalid version format: {}", version_str);
+    }
+}
+
+/// Check if the server version is greater than or equal to the specified version
+pub async fn version_greater_or_equal(
+    client: &mut impl glide_core::client::GlideClientForTests,
+    version: &str,
+) -> bool {
+    let (major, minor, patch) = get_server_version(client).await;
+    let server_version = Versioning::new(format!("{major}.{minor}.{patch}")).unwrap();
+    let compared_version = Versioning::new(version).unwrap();
+    server_version >= compared_version
+}
+
+/// Extract client ID from CLIENT INFO response string
+pub fn extract_client_id(client_info: &str) -> Option<String> {
+    client_info
+        .split_whitespace()
+        .find(|part| part.starts_with("id="))
+        .and_then(|id_part| id_part.strip_prefix("id="))
+        .map(|id| id.to_string())
+}

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/local_dependencies/redis/src/cluster.rs

@@ -992,7 +992,7 @@ pub(crate) fn get_connection_info(
             username: cluster_params.username,
             client_name: cluster_params.client_name,
             protocol: cluster_params.protocol,
-            db: 0,
+            db: cluster_params.database_id,
             pubsub_subscriptions: cluster_params.pubsub_subscriptions,
         },
     })

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/local_dependencies/redis/src/cluster_client.rs

@@ -44,6 +44,7 @@ struct BuilderParams {
     protocol: ProtocolVersion,
     pubsub_subscriptions: Option<PubSubSubscriptionInfo>,
     reconnect_retry_strategy: Option<RetryStrategy>,
+    database_id: i64,
 }
 
 #[derive(Clone)]
@@ -144,6 +145,7 @@ pub struct ClusterParams {
     pub(crate) protocol: ProtocolVersion,
     pub(crate) pubsub_subscriptions: Option<PubSubSubscriptionInfo>,
     pub(crate) reconnect_retry_strategy: Option<RetryStrategy>,
+    pub(crate) database_id: i64,
 }
 
 impl ClusterParams {
@@ -173,6 +175,7 @@ impl ClusterParams {
             protocol: value.protocol,
             pubsub_subscriptions: value.pubsub_subscriptions,
             reconnect_retry_strategy: value.reconnect_retry_strategy,
+            database_id: value.database_id,
         })
     }
 }
@@ -489,6 +492,15 @@ impl ClusterClientBuilder {
         self
     }
 
+    /// Sets the database ID for the new ClusterClient.
+    ///
+    /// Note: Database selection in cluster mode requires server support for multiple databases.
+    /// Most cluster configurations only support database 0.
+    pub fn database_id(mut self, database_id: i64) -> ClusterClientBuilder {
+        self.builder_params.database_id = database_id;
+        self
+    }
+
     /// Use `build()`.
     #[deprecated(since = "0.22.0", note = "Use build()")]
     pub fn open(self) -> RedisResult<ClusterClient> {

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/local_dependencies/redis/src/cluster_routing.rs

@@ -545,8 +545,8 @@ impl ResponsePolicy {
             | b"CLIENT SETINFO" | b"CONFIG SET" | b"CONFIG RESETSTAT" | b"CONFIG REWRITE"
             | b"FLUSHALL" | b"FLUSHDB" | b"FUNCTION DELETE" | b"FUNCTION FLUSH"
             | b"FUNCTION LOAD" | b"FUNCTION RESTORE" | b"MEMORY PURGE" | b"MSET" | b"JSON.MSET"
-            | b"PING" | b"SCRIPT FLUSH" | b"SCRIPT LOAD" | b"SLOWLOG RESET" | b"UNWATCH"
-            | b"WATCH" => Some(ResponsePolicy::AllSucceeded),
+            | b"PING" | b"SCRIPT FLUSH" | b"SCRIPT LOAD" | b"SELECT" | b"SLOWLOG RESET"
+            | b"UNWATCH" | b"WATCH" => Some(ResponsePolicy::AllSucceeded),
 
             b"KEYS"
             | b"FT._ALIASLIST"
@@ -601,6 +601,7 @@ fn base_routing(cmd: &[u8]) -> RouteBy {
         | b"ACL SAVE"
         | b"CLIENT SETNAME"
         | b"CLIENT SETINFO"
+        | b"SELECT"
         | b"SLOWLOG GET"
         | b"SLOWLOG LEN"
         | b"SLOWLOG RESET"

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "valkey-glide"
-version = "2.1.0-rc2"
+version = "2.1.0-rc4"
 description = "Valkey GLIDE Async client. Supports Valkey and Redis OSS."
 requires-python = ">=3.9"
 dependencies = [

{valkey_glide-2.1.0rc2 → valkey_glide-2.1.0rc4}/python/glide/async_commands/standalone_commands.py

@@ -166,6 +166,28 @@ class StandaloneCommands(CoreCommands):
         """
         Change the currently selected database.
 
+        **WARNING**: This command is NOT RECOMMENDED for production use.
+        Upon reconnection, the client will revert to the database_id specified
+        in the client configuration (default: 0), NOT the database selected
+        via this command.
+
+        **RECOMMENDED APPROACH**: Use the database_id parameter in client
+        configuration instead:
+
+        ```python
+        client = await GlideClient.create_client(
+            GlideClientConfiguration(
+                addresses=[NodeAddress("localhost", 6379)],
+                database_id=5  # Recommended: persists across reconnections
+            )
+        )
+        ```
+
+        **RECONNECTION BEHAVIOR**: After any reconnection (due to network issues,
+        timeouts, etc.), the client will automatically revert to the database_id
+        specified during client creation, losing any database selection made via
+        this SELECT command.
+
         See [valkey.io](https://valkey.io/commands/select/) for details.
 
         Args: