From 77710ef3c6e4aa17348474bdeb230db674f2a557 Mon Sep 17 00:00:00 2001
From: Yi Cheng <chengyidna@gmail.com>
Date: Tue, 10 May 2022 06:35:46 +0000
Subject: [PATCH] fix mis-merge

---
 src/ray/core_worker/profiling.cc             | 4 ++--
 src/ray/gcs/gcs_client/accessor.cc           | 2 +-
 src/ray/gcs/gcs_server/stats_handler_impl.cc | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ray/core_worker/profiling.cc b/src/ray/core_worker/profiling.cc
index 4aa56a192b0f..1d9b4d306939 100644
--- a/src/ray/core_worker/profiling.cc
+++ b/src/ray/core_worker/profiling.cc
@@ -37,7 +37,7 @@ Profiler::Profiler(WorkerContext &worker_context,
       rpc_profile_data_(new rpc::ProfileTableData()),
       gcs_client_(gcs_client) {
   rpc_profile_data_->set_component_type(WorkerTypeString(worker_context.GetWorkerType()));
-  rpc_profile_data_->set_message_type(worker_context.GetWorkerID().Binary());
+  rpc_profile_data_->set_component_id(worker_context.GetWorkerID().Binary());
   rpc_profile_data_->set_node_ip_address(node_ip_address);
   periodical_runner_.RunFnPeriodically(
       [this] { FlushEvents(); },
@@ -56,7 +56,7 @@ void Profiler::FlushEvents() {
     absl::MutexLock lock(&mutex_);
     if (rpc_profile_data_->profile_events_size() != 0) {
       cur_profile_data->set_component_type(rpc_profile_data_->component_type());
-      cur_profile_data->set_message_type(rpc_profile_data_->message_type());
+      cur_profile_data->set_component_id(rpc_profile_data_->component_id());
       cur_profile_data->set_node_ip_address(rpc_profile_data_->node_ip_address());
       rpc_profile_data_.swap(cur_profile_data);
     }
diff --git a/src/ray/gcs/gcs_client/accessor.cc b/src/ray/gcs/gcs_client/accessor.cc
index 34a9bc85e4e5..0346e7951f2e 100644
--- a/src/ray/gcs/gcs_client/accessor.cc
+++ b/src/ray/gcs/gcs_client/accessor.cc
@@ -780,7 +780,7 @@ StatsInfoAccessor::StatsInfoAccessor(GcsClient *client_impl)
 Status StatsInfoAccessor::AsyncAddProfileData(
     const std::shared_ptr<rpc::ProfileTableData> &data_ptr,
     const StatusCallback &callback) {
-  NodeID node_id = NodeID::FromBinary(data_ptr->message_type());
+  NodeID node_id = NodeID::FromBinary(data_ptr->component_id());
   RAY_LOG(DEBUG) << "Adding profile data, component type = " << data_ptr->component_type()
                  << ", node id = " << node_id;
   rpc::AddProfileDataRequest request;
diff --git a/src/ray/gcs/gcs_server/stats_handler_impl.cc b/src/ray/gcs/gcs_server/stats_handler_impl.cc
index 628299b92f54..2d9425140630 100644
--- a/src/ray/gcs/gcs_server/stats_handler_impl.cc
+++ b/src/ray/gcs/gcs_server/stats_handler_impl.cc
@@ -22,7 +22,7 @@ namespace rpc {
 void DefaultStatsHandler::HandleAddProfileData(const AddProfileDataRequest &request,
                                                AddProfileDataReply *reply,
                                                SendReplyCallback send_reply_callback) {
-  NodeID node_id = NodeID::FromBinary(request.profile_data().message_type());
+  NodeID node_id = NodeID::FromBinary(request.profile_data().component_id());
   RAY_LOG(DEBUG) << "Adding profile data, component type = "
                  << request.profile_data().component_type() << ", node id = " << node_id;
   auto profile_table_data = std::make_shared<ProfileTableData>();