feat(FQDN): feather refator on idl/duplication.thrift

acelyc111 · Jul 26, 2024 · eb81319 · eb81319
1 parent 00a4fad
commit eb81319
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/idl/duplication.thrift b/idl/duplication.thrift
@@ -187,10 +187,10 @@ struct duplication_sync_request
 {
     // the address of of the replica server who sends this request
     // TODO(wutao1): remove this field and get the source address by dsn_msg_from_address
-    1:dsn.rpc_address                                   node;
+    1:dsn.rpc_address                                   node1;
 
     2:map<dsn.gpid, list<duplication_confirm_entry>>    confirm_list;
-    3:dsn.host_port                                     hp_node;
+    3:dsn.host_port                                     hp_node1;
 }
 
 struct duplication_sync_response

diff --git a/src/meta/duplication/meta_duplication_service.cpp b/src/meta/duplication/meta_duplication_service.cpp
@@ -389,11 +389,11 @@ void meta_duplication_service::duplication_sync(duplication_sync_rpc rpc)
     auto &response = rpc.response();
     response.err = ERR_OK;
 
-    host_port src_hp;
-    GET_HOST_PORT(request, node, src_hp);
-    const auto *ns = get_node_state(_state->_nodes, src_hp, false);
+    host_port src_node;
+    GET_HOST_PORT(request, node1, src_node);
+    const auto *ns = get_node_state(_state->_nodes, src_node, false);
     if (ns == nullptr) {
-        LOG_WARNING("node({}) is not found in meta server", FMT_HOST_PORT_AND_IP(request, node));
+        LOG_WARNING("node({}) is not found in meta server", FMT_HOST_PORT_AND_IP(request, node1));
         response.err = ERR_OBJECT_NOT_FOUND;
         return;
     }

diff --git a/src/meta/test/meta_duplication_service_test.cpp b/src/meta/test/meta_duplication_service_test.cpp
@@ -170,7 +170,7 @@ class meta_duplication_service_test : public meta_test_base
                      std::map<gpid, std::vector<duplication_confirm_entry>> confirm_list)
     {
         auto req = std::make_unique<duplication_sync_request>();
-        SET_IP_AND_HOST_PORT_BY_DNS(*req, node, hp);
+        SET_IP_AND_HOST_PORT_BY_DNS(*req, node1, hp);
         req->confirm_list = confirm_list;
 
         duplication_sync_rpc rpc(std::move(req), RPC_CM_DUPLICATION_SYNC);

diff --git a/src/replica/duplication/duplication_sync_timer.cpp b/src/replica/duplication/duplication_sync_timer.cpp
@@ -70,7 +70,7 @@ void duplication_sync_timer::run()
     }
 
     auto req = std::make_unique<duplication_sync_request>();
-    SET_IP_AND_HOST_PORT(*req, node, _stub->primary_address(), _stub->primary_host_port());
+    SET_IP_AND_HOST_PORT(*req, node1, _stub->primary_address(), _stub->primary_host_port());
 
     // collects confirm points from all primaries on this server
     for (const replica_ptr &r : _stub->get_all_primaries()) {

diff --git a/src/replica/duplication/test/duplication_sync_timer_test.cpp b/src/replica/duplication/test/duplication_sync_timer_test.cpp
@@ -120,7 +120,7 @@ class duplication_sync_timer_test : public duplication_test_base
             ASSERT_EQ(duplication_sync_rpc::mail_box().size(), 1);
 
             auto &req = duplication_sync_rpc::mail_box().back().request();
-            ASSERT_IP_AND_HOST_PORT(req, node, stub->primary_address(), stub->primary_host_port());
+            ASSERT_IP_AND_HOST_PORT(req, node1, stub->primary_address(), stub->primary_host_port());
 
             // ensure confirm list is empty when no progress
             ASSERT_EQ(0, req.confirm_list.size());
@@ -143,7 +143,7 @@ class duplication_sync_timer_test : public duplication_test_base
             ASSERT_EQ(duplication_sync_rpc::mail_box().size(), 1);
 
             auto &req = *duplication_sync_rpc::mail_box().back().mutable_request();
-            ASSERT_IP_AND_HOST_PORT(req, node, stub->primary_address(), stub->primary_host_port());
+            ASSERT_IP_AND_HOST_PORT(req, node1, stub->primary_address(), stub->primary_host_port());
             ASSERT_EQ(req.confirm_list.size(), total_app_num);
 
             for (int appid = 1; appid <= total_app_num; appid++) {