Fix Redis prefix test after main merge

Author: charpty

kv_cache_manager/config/test/coordination_redis_backend_prefix_test.cc

@@ -11,11 +11,9 @@ StandardUri RedisUriWithParams(const std::string &params) {
     return StandardUri::FromUri("redis://localhost:6379/?" + params);
 }
 
-CoordinationRedisBackend MakeBackendWithPrefixes(const StandardUri &uri) {
-    CoordinationRedisBackend backend;
+void SetBackendPrefixes(CoordinationRedisBackend &backend, const StandardUri &uri) {
     backend.lock_key_prefix_ = CoordinationRedisBackend::BuildRedisKeyPrefix("lock", uri);
     backend.kv_key_prefix_ = CoordinationRedisBackend::BuildRedisKeyPrefix("kv", uri);
-    return backend;
 }
 
 } // namespace
@@ -50,37 +48,37 @@ TEST(CoordinationRedisBackendPrefixTest, OtherRedisParamsDoNotAffectClusterScope
 }
 
 TEST(CoordinationRedisBackendPrefixTest, GeneratedLockAndKVKeysAreScopedByClusterName) {
-    CoordinationRedisBackend backend =
-        MakeBackendWithPrefixes(RedisUriWithParams("cluster_name=test_cluster"));
+    CoordinationRedisBackend backend;
+    SetBackendPrefixes(backend, RedisUriWithParams("cluster_name=test_cluster"));
 
     EXPECT_EQ("kvcm_lock:test_cluster:leader", backend.GetRedisLockKey("leader"));
     EXPECT_EQ("kvcm_kv:test_cluster:node_endpoint/127.0.0.1:6381",
               backend.GetRedisKVKey("node_endpoint/127.0.0.1:6381"));
 }
 
 TEST(CoordinationRedisBackendPrefixTest, LockAndKVKeysAreSeparatedWithinSameCluster) {
-    CoordinationRedisBackend backend =
-        MakeBackendWithPrefixes(RedisUriWithParams("cluster_name=test_cluster"));
+    CoordinationRedisBackend backend;
+    SetBackendPrefixes(backend, RedisUriWithParams("cluster_name=test_cluster"));
 
     EXPECT_NE(backend.GetRedisLockKey("leader"), backend.GetRedisKVKey("leader"));
     EXPECT_EQ("kvcm_lock:test_cluster:leader", backend.GetRedisLockKey("leader"));
     EXPECT_EQ("kvcm_kv:test_cluster:leader", backend.GetRedisKVKey("leader"));
 }
 
 TEST(CoordinationRedisBackendPrefixTest, LogicalKeysAreAppendedWithoutMutation) {
-    CoordinationRedisBackend backend =
-        MakeBackendWithPrefixes(RedisUriWithParams("cluster_name=test_cluster"));
+    CoordinationRedisBackend backend;
+    SetBackendPrefixes(backend, RedisUriWithParams("cluster_name=test_cluster"));
 
     EXPECT_EQ("kvcm_lock:test_cluster:model/a/b:0", backend.GetRedisLockKey("model/a/b:0"));
     EXPECT_EQ("kvcm_kv:test_cluster:node_endpoint/10.0.0.1:6381",
               backend.GetRedisKVKey("node_endpoint/10.0.0.1:6381"));
 }
 
 TEST(CoordinationRedisBackendPrefixTest, DifferentClustersGenerateDifferentRedisKeysForSameLogicalKey) {
-    CoordinationRedisBackend first =
-        MakeBackendWithPrefixes(RedisUriWithParams("cluster_name=cluster_a"));
-    CoordinationRedisBackend second =
-        MakeBackendWithPrefixes(RedisUriWithParams("cluster_name=cluster_b"));
+    CoordinationRedisBackend first;
+    CoordinationRedisBackend second;
+    SetBackendPrefixes(first, RedisUriWithParams("cluster_name=cluster_a"));
+    SetBackendPrefixes(second, RedisUriWithParams("cluster_name=cluster_b"));
 
     EXPECT_NE(first.GetRedisLockKey("leader"), second.GetRedisLockKey("leader"));
     EXPECT_NE(first.GetRedisKVKey("node_endpoint"), second.GetRedisKVKey("node_endpoint"));
@@ -93,16 +91,18 @@ TEST(CoordinationRedisBackendPrefixTest, SameClusterNameGeneratesSameScopeAcross
         "redis://user:pwd@redis-a:6379/?timeout_ms=1000&cluster_name=test_cluster");
     StandardUri second_uri = StandardUri::FromUri(
         "redis://redis-b:6380/?db=3&retry_count=5&cluster_name=test_cluster");
-    CoordinationRedisBackend first = MakeBackendWithPrefixes(first_uri);
-    CoordinationRedisBackend second = MakeBackendWithPrefixes(second_uri);
+    CoordinationRedisBackend first;
+    CoordinationRedisBackend second;
+    SetBackendPrefixes(first, first_uri);
+    SetBackendPrefixes(second, second_uri);
 
     EXPECT_EQ(first.GetRedisLockKey("leader"), second.GetRedisLockKey("leader"));
     EXPECT_EQ(first.GetRedisKVKey("node_endpoint"), second.GetRedisKVKey("node_endpoint"));
 }
 
 TEST(CoordinationRedisBackendPrefixTest, LegacyGeneratedKeysStayBackwardCompatible) {
-    CoordinationRedisBackend backend =
-        MakeBackendWithPrefixes(StandardUri::FromUri("redis://localhost:6379/"));
+    CoordinationRedisBackend backend;
+    SetBackendPrefixes(backend, StandardUri::FromUri("redis://localhost:6379/"));
 
     EXPECT_EQ("kvcm_lock:leader", backend.GetRedisLockKey("leader"));
     EXPECT_EQ("kvcm_kv:node_endpoint", backend.GetRedisKVKey("node_endpoint"));