From bf363661e44da73537e32bb862d80d9547c8b65c Mon Sep 17 00:00:00 2001 From: Shahar Mike Date: Wed, 28 Jun 2023 09:41:04 +0300 Subject: [PATCH] cleanups: Remove unused member, rename test, remove unused forward decl. (#1483) --- src/server/cluster/cluster_config.h | 2 -- src/server/cluster/cluster_config_test.cc | 2 +- src/server/snapshot.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/server/cluster/cluster_config.h b/src/server/cluster/cluster_config.h index ea38eba1e..cb91f808a 100644 --- a/src/server/cluster/cluster_config.h +++ b/src/server/cluster/cluster_config.h @@ -86,8 +86,6 @@ class ClusterConfig { ClusterConfig() = default; - std::string my_id_; - ClusterShards config_; // True bits in `my_slots_` indicate that this slot is owned by this node. diff --git a/src/server/cluster/cluster_config_test.cc b/src/server/cluster/cluster_config_test.cc index 8d17a479f..316fcdd80 100644 --- a/src/server/cluster/cluster_config_test.cc +++ b/src/server/cluster/cluster_config_test.cc @@ -91,7 +91,7 @@ TEST_F(ClusterConfigTest, ConfigSetOk) { EXPECT_THAT(config->GetOwnedSlots(), UnorderedElementsAre()); } -TEST_F(ClusterConfigTest, ConfigSetOkWithReplicas) { +TEST_F(ClusterConfigTest, ConfigSetOkWithReplica) { auto config = ClusterConfig::CreateFromConfig( kMyId, {{.slot_ranges = {{.start = 0, .end = 0x3FFF}}, .master = {.id = "other-master", .ip = "192.168.0.100", .port = 7000}, diff --git a/src/server/snapshot.h b/src/server/snapshot.h index 842dc3388..75b6bb154 100644 --- a/src/server/snapshot.h +++ b/src/server/snapshot.h @@ -19,8 +19,6 @@ namespace journal { struct Entry; } // namespace journal -class RdbSerializer; - // ┌────────────────┐ ┌─────────────┐ // │IterateBucketsFb│ │ OnDbChange │ // └──────┬─────────┘ └─┬───────────┘