Pulling changes from redis-rs

valkey-io · Dec 21, 2023 · dc86d5b · dc86d5b
1 parent 50a944a
commit dc86d5b
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 17 deletions.
diff --git a/babushka-core/.cargo/config.toml b/babushka-core/.cargo/config.toml
@@ -1,3 +1,3 @@
 [env]
-BABUSHKA_NAME = "Babushka" # This should be overwritten by each wrapper library.
-BABUSHKA_VERSION = "0.1.0"
+GLIDE_NAME = "Glide" # This should be overwritten by each wrapper library.
+GLIDE_VERSION = "0.1.0"
diff --git a/babushka-core/src/client/mod.rs b/babushka-core/src/client/mod.rs
@@ -55,6 +55,7 @@ pub(super) fn get_redis_connection_info(
             username: chars_to_string_option(&info.username),
             password: chars_to_string_option(&info.password),
             use_resp3,
+            client_name: None,
         },
         None => redis::RedisConnectionInfo {
             db: database_id as i64,

diff --git a/benchmarks/rust/.cargo/config.toml b/benchmarks/rust/.cargo/config.toml
@@ -1,3 +1,3 @@
 [env]
-BABUSHKA_NAME = "Babushka" # This should be overwritten by each wrapper library.
-BABUSHKA_VERSION = "0.1.0"
+GLIDE_NAME = "Glide" # This should be overwritten by each wrapper library.
+GLIDE_VERSION = "0.1.0"
diff --git a/csharp/lib/.cargo/config.toml b/csharp/lib/.cargo/config.toml
@@ -1,3 +1,3 @@
 [env]
-BABUSHKA_NAME = { value = "BabushkaC#", force = true }
-BABUSHKA_VERSION = "0.1.0"
+GLIDE_NAME = { value = "GlideC#", force = true }
+GLIDE_VERSION = "0.1.0"
diff --git a/java/.cargo/config.toml b/java/.cargo/config.toml
@@ -1,3 +1,3 @@
 [env]
-BABUSHKA_NAME = { value = "javababushka", force = true }
-BABUSHKA_VERSION = "0.1.0"
+GLIDE_NAME = { value = "GlideJava", force = true }
+GLIDE_VERSION = "0.1.0"
diff --git a/node/rust-client/.cargo/config.toml b/node/rust-client/.cargo/config.toml
@@ -1,3 +1,3 @@
 [env]
-BABUSHKA_NAME = { value = "BabushkaJS", force = true }
-BABUSHKA_VERSION = "0.1.0"
+GLIDE_NAME = { value = "GlideJS", force = true }
+GLIDE_VERSION = "0.1.0"
diff --git a/node/tests/SharedTests.ts b/node/tests/SharedTests.ts
@@ -62,7 +62,7 @@ export function runBaseTests<Context>(config: {
 
                 const result = await client.customCommand("CLIENT", ["INFO"]);
 
-                expect(result).toContain("lib-name=BabushkaJS");
+                expect(result).toContain("lib-name=GlideJS");
                 expect(result).toContain("lib-ver=0.1.0");
             });
         },
@@ -245,15 +245,15 @@ export function runBaseTests<Context>(config: {
                 expect(
                     Number(
                         parseInfoResponse(getFirstResult(OldResult).toString())[
-                            "total_commands_processed"
+                        "total_commands_processed"
                         ]
                     )
                 ).toBeGreaterThan(1);
                 expect(await client.configResetStat()).toEqual("OK");
                 const result = await client.info([InfoOptions.Stats]);
                 expect(
                     parseInfoResponse(getFirstResult(result).toString())[
-                        "total_commands_processed"
+                    "total_commands_processed"
                     ]
                 ).toEqual("1");
             });

diff --git a/python/.cargo/config.toml b/python/.cargo/config.toml
@@ -1,3 +1,3 @@
 [env]
-BABUSHKA_NAME = { value = "BabushkaPy", force = true }
-BABUSHKA_VERSION = "0.1.0"
+GLIDE_NAME = { value = "GlidePy", force = true }
+GLIDE_VERSION = "0.1.0"
diff --git a/python/python/tests/test_async_client.py b/python/python/tests/test_async_client.py
@@ -109,7 +109,7 @@ async def test_register_client_name_and_version(self, redis_client: TRedisClient
             return pytest.mark.skip(reason=f"Redis version required >= {min_version}")
         info = await redis_client.custom_command(["CLIENT", "INFO"])
         assert type(info) is str
-        assert "lib-name=BabushkaPy" in info
+        assert "lib-name=GlidePy" in info
         assert "lib-ver=0.1.0" in info
 
     @pytest.mark.parametrize("cluster_mode", [True, False])

diff --git a/submodules/redis-rs b/submodules/redis-rs
+2 −2		.cargo/config.toml
+1 −0		redis/Cargo.toml
+15 −0		redis/src/aio/mod.rs
+106 −46		redis/src/cluster.rs
+2 −2		redis/src/cluster_async/connections_container.rs
+1 −0		redis/src/cluster_async/mod.rs
+18 −1		redis/src/cluster_client.rs
+57 −25		redis/src/cluster_routing.rs
+85 −33		redis/src/cluster_topology.rs
+5 −11		redis/src/cmd.rs
+35 −14		redis/src/connection.rs
+0 −11		redis/src/macros.rs
+2 −0		redis/src/sentinel.rs
+5 −15		redis/src/types.rs
+4 −0		redis/tests/support/cluster.rs
+53 −44		redis/tests/support/mod.rs
+13 −0		redis/tests/support/util.rs
+33 −0		redis/tests/test_async.rs
+23 −0		redis/tests/test_basic.rs
+27 −0		redis/tests/test_cluster.rs
+36 −0		redis/tests/test_cluster_async.rs