From dc86d5b5b4a6a02acfe412e1bcc461cf390e432c Mon Sep 17 00:00:00 2001 From: barshaul Date: Thu, 21 Dec 2023 09:54:05 +0000 Subject: [PATCH] Pulling changes from redis-rs --- babushka-core/.cargo/config.toml | 4 ++-- babushka-core/src/client/mod.rs | 1 + benchmarks/rust/.cargo/config.toml | 4 ++-- csharp/lib/.cargo/config.toml | 4 ++-- java/.cargo/config.toml | 4 ++-- node/rust-client/.cargo/config.toml | 4 ++-- node/tests/SharedTests.ts | 6 +++--- python/.cargo/config.toml | 4 ++-- python/python/tests/test_async_client.py | 2 +- submodules/redis-rs | 2 +- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/babushka-core/.cargo/config.toml b/babushka-core/.cargo/config.toml index e61d57cec1..d7336d3306 100644 --- 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 index afdd45f7ba..a54e766853 100644 --- 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 index e61d57cec1..d7336d3306 100644 --- 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 index 95016f56ae..45873d24a5 100644 --- 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 index 12fc36fc94..25c9e01f33 100644 --- 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 index 319bf407ae..56be8c8010 100644 --- 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 index 58a9ae8fa1..1d586bcf6f 100644 --- a/node/tests/SharedTests.ts +++ b/node/tests/SharedTests.ts @@ -62,7 +62,7 @@ export function runBaseTests(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,7 +245,7 @@ export function runBaseTests(config: { expect( Number( parseInfoResponse(getFirstResult(OldResult).toString())[ - "total_commands_processed" + "total_commands_processed" ] ) ).toBeGreaterThan(1); @@ -253,7 +253,7 @@ export function runBaseTests(config: { 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 index 24a6f21533..3188c03f8a 100644 --- 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 index f4005a453d..33200ca4e7 100644 --- 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 index 8b3fb0a029..71ff85cb64 160000 --- a/submodules/redis-rs +++ b/submodules/redis-rs @@ -1 +1 @@ -Subproject commit 8b3fb0a0292cdda95f10cf3f771f6ad7ae7b3303 +Subproject commit 71ff85cb64a81da8470f18c9f7ba7c541d292a8e