Remove DurabilityVersion from ReplicationReplicaEntry

memgraph · May 24, 2024 · 36c7e1b · 36c7e1b
1 parent d374afc
commit 36c7e1b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/src/replication/include/replication/status.hpp b/src/replication/include/replication/status.hpp
@@ -61,8 +61,8 @@ struct ReplicationRoleEntry {
 
 // from key: "__replication_replica:"
 struct ReplicationReplicaEntry {
-  DurabilityVersion version =
-      DurabilityVersion::V4;  // if not V4, no version was specified. No changes between [V1, V3]
+  // NOTE: There are multiple versions of ReplicationReplicaEntry, but we distinguish them in terms of
+  // ReplicationRoleEntry.
   ReplicationClientConfig config;
   friend bool operator==(ReplicationReplicaEntry const &, ReplicationReplicaEntry const &) = default;
 };

diff --git a/src/replication/state.cpp b/src/replication/state.cpp
@@ -236,8 +236,7 @@ bool ReplicationState::HandleVersionMigration(durability::ReplicationRoleEntry &
           auto old_json = nlohmann::json::parse(old_data, nullptr, false);
           if (old_json.is_discarded()) return false;
           try {
-            durability::ReplicationReplicaEntry new_data = old_json.get<durability::ReplicationReplicaEntry>();
-            new_data.version = durability::DurabilityVersion::V4;
+            durability::ReplicationReplicaEntry const new_data = old_json.get<durability::ReplicationReplicaEntry>();
             to_put.emplace(old_key, nlohmann::json(new_data).dump());
           } catch (...) {
             return false;

diff --git a/src/replication/status.cpp b/src/replication/status.cpp
@@ -95,8 +95,7 @@ void from_json(const nlohmann::json &j, ReplicationRoleEntry &p) {
 }
 
 void to_json(nlohmann::json &j, const ReplicationReplicaEntry &p) {
-  auto common = nlohmann::json{{kVersion, p.version},
-                               {kReplicaName, p.config.name},
+  auto common = nlohmann::json{{kReplicaName, p.config.name},
                                {kSyncMode, p.config.mode},
                                {kCheckFrequency, p.config.replica_check_frequency.count()}};
 
@@ -113,8 +112,6 @@ void to_json(nlohmann::json &j, const ReplicationReplicaEntry &p) {
 }
 void from_json(const nlohmann::json &j, ReplicationReplicaEntry &p) {
   using io::network::Endpoint;
-  // This value did not exist until DurabilityVersion::V4, hence default DurabilityVersion::V3
-  DurabilityVersion version = j.value(kVersion, DurabilityVersion::V3);
 
   const auto &key_file = j.at(kSSLKeyFile);
   const auto &cert_file = j.at(kSSLCertFile);
@@ -142,6 +139,6 @@ void from_json(const nlohmann::json &j, ReplicationReplicaEntry &p) {
     key_file.get_to(config.ssl->key_file);
     cert_file.get_to(config.ssl->cert_file);
   }
-  p = ReplicationReplicaEntry{.version = version, .config = std::move(config)};
+  p = ReplicationReplicaEntry{.config = std::move(config)};
 }
 }  // namespace memgraph::replication::durability
diff --git a/tests/unit/replication_persistence_helper.cpp b/tests/unit/replication_persistence_helper.cpp
@@ -177,7 +177,6 @@ TEST(ReplicationDurability, ReplicaEntryMigrationNoVersionToV4) {
   ReplicationReplicaEntry deser;
   from_json(j, deser);
   // Default version is V3
-  ASSERT_EQ(deser.version, DurabilityVersion::V3);
   ASSERT_EQ(deser.config.name, "TEST_NAME");
   ASSERT_EQ(deser.config.mode, ReplicationMode::ASYNC);
   ASSERT_EQ(deser.config.repl_server_endpoint.GetAddress(), "000.123.456.789");