From 3ee2e9f7e5273663a6f19fad5c7b8c8ccbc9169d Mon Sep 17 00:00:00 2001
From: mehrdadn <mehrdadn@users.noreply.github.com>
Date: Sun, 7 Jun 2020 06:43:24 -0700
Subject: [PATCH] Make #include consistent (#8666)

Co-authored-by: Mehrdad <noreply@github.com>
---
 src/ray/core_worker/test/core_worker_test.cc       |  5 ++---
 src/ray/gcs/gcs_server/test/gcs_server_test_util.h | 14 +++++++-------
 src/ray/gcs/test/gcs_test_util.h                   | 10 +++++-----
 src/ray/raylet/worker.cc                           |  4 ++--
 src/ray/rpc/gcs_server/gcs_rpc_client.h            |  7 ++++---
 src/ray/rpc/gcs_server/gcs_rpc_server.h            |  7 +++----
 src/ray/rpc/grpc_server.cc                         |  3 ++-
 src/ray/rpc/node_manager/node_manager_client.h     |  4 ++--
 src/ray/rpc/node_manager/node_manager_server.h     |  4 ++--
 src/ray/rpc/object_manager/object_manager_client.h | 10 +++++-----
 src/ray/rpc/object_manager/object_manager_server.h |  9 ++++-----
 src/ray/rpc/worker/core_worker_client.h            |  4 ++--
 src/ray/rpc/worker/core_worker_server.h            |  4 ++--
 13 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/src/ray/core_worker/test/core_worker_test.cc b/src/ray/core_worker/test/core_worker_test.cc
index b73ddd15d..70ee037fc 100644
--- a/src/ray/core_worker/test/core_worker_test.cc
+++ b/src/ray/core_worker/test/core_worker_test.cc
@@ -19,7 +19,6 @@
 #include <boost/bind.hpp>
 #include <thread>
 
-#include "../../common/test_util.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "gmock/gmock.h"
@@ -32,10 +31,10 @@
 #include "ray/core_worker/context.h"
 #include "ray/core_worker/store_provider/memory_store/memory_store.h"
 #include "ray/core_worker/transport/direct_actor_transport.h"
+#include "ray/protobuf/core_worker.pb.h"
+#include "ray/protobuf/gcs.pb.h"
 #include "ray/raylet/raylet_client.h"
 #include "ray/util/filesystem.h"
-#include "src/ray/protobuf/core_worker.pb.h"
-#include "src/ray/protobuf/gcs.pb.h"
 
 namespace {
 
diff --git a/src/ray/gcs/gcs_server/test/gcs_server_test_util.h b/src/ray/gcs/gcs_server/test/gcs_server_test_util.h
index 4b7ba9502..e1b7e0dc2 100644
--- a/src/ray/gcs/gcs_server/test/gcs_server_test_util.h
+++ b/src/ray/gcs/gcs_server/test/gcs_server_test_util.h
@@ -18,13 +18,13 @@
 #include <memory>
 #include <utility>
 
-#include "src/ray/common/task/task.h"
-#include "src/ray/common/task/task_util.h"
-#include "src/ray/common/test_util.h"
-#include "src/ray/gcs/gcs_server/gcs_actor_manager.h"
-#include "src/ray/gcs/gcs_server/gcs_actor_scheduler.h"
-#include "src/ray/gcs/gcs_server/gcs_node_manager.h"
-#include "src/ray/util/asio_util.h"
+#include "ray/common/task/task.h"
+#include "ray/common/task/task_util.h"
+#include "ray/common/test_util.h"
+#include "ray/gcs/gcs_server/gcs_actor_manager.h"
+#include "ray/gcs/gcs_server/gcs_actor_scheduler.h"
+#include "ray/gcs/gcs_server/gcs_node_manager.h"
+#include "ray/util/asio_util.h"
 
 namespace ray {
 
diff --git a/src/ray/gcs/test/gcs_test_util.h b/src/ray/gcs/test/gcs_test_util.h
index 890b54811..1d122d169 100644
--- a/src/ray/gcs/test/gcs_test_util.h
+++ b/src/ray/gcs/test/gcs_test_util.h
@@ -19,11 +19,11 @@
 #include <utility>
 
 #include "gmock/gmock.h"
-#include "src/ray/common/task/task.h"
-#include "src/ray/common/task/task_util.h"
-#include "src/ray/common/test_util.h"
-#include "src/ray/protobuf/gcs_service.grpc.pb.h"
-#include "src/ray/util/asio_util.h"
+#include "ray/common/task/task.h"
+#include "ray/common/task/task_util.h"
+#include "ray/common/test_util.h"
+#include "ray/protobuf/gcs_service.grpc.pb.h"
+#include "ray/util/asio_util.h"
 
 namespace ray {
 
diff --git a/src/ray/raylet/worker.cc b/src/ray/raylet/worker.cc
index a9cec0788..bbde48cb1 100644
--- a/src/ray/raylet/worker.cc
+++ b/src/ray/raylet/worker.cc
@@ -16,10 +16,10 @@
 
 #include <boost/bind.hpp>
 
+#include "ray/protobuf/core_worker.grpc.pb.h"
+#include "ray/protobuf/core_worker.pb.h"
 #include "ray/raylet/format/node_manager_generated.h"
 #include "ray/raylet/raylet.h"
-#include "src/ray/protobuf/core_worker.grpc.pb.h"
-#include "src/ray/protobuf/core_worker.pb.h"
 
 namespace ray {
 
diff --git a/src/ray/rpc/gcs_server/gcs_rpc_client.h b/src/ray/rpc/gcs_server/gcs_rpc_client.h
index 2584e6803..538f64f86 100644
--- a/src/ray/rpc/gcs_server/gcs_rpc_client.h
+++ b/src/ray/rpc/gcs_server/gcs_rpc_client.h
@@ -16,9 +16,10 @@
 #define RAY_RPC_GCS_RPC_CLIENT_H
 
 #include <unistd.h>
-#include "src/ray/common/network_util.h"
-#include "src/ray/protobuf/gcs_service.grpc.pb.h"
-#include "src/ray/rpc/grpc_client.h"
+
+#include "ray/common/network_util.h"
+#include "ray/protobuf/gcs_service.grpc.pb.h"
+#include "ray/rpc/grpc_client.h"
 
 namespace ray {
 namespace rpc {
diff --git a/src/ray/rpc/gcs_server/gcs_rpc_server.h b/src/ray/rpc/gcs_server/gcs_rpc_server.h
index 23d84a3d6..30f2846a4 100644
--- a/src/ray/rpc/gcs_server/gcs_rpc_server.h
+++ b/src/ray/rpc/gcs_server/gcs_rpc_server.h
@@ -15,10 +15,9 @@
 #ifndef RAY_RPC_GCS_RPC_SERVER_H
 #define RAY_RPC_GCS_RPC_SERVER_H
 
-#include "src/ray/rpc/grpc_server.h"
-#include "src/ray/rpc/server_call.h"
-
-#include "src/ray/protobuf/gcs_service.grpc.pb.h"
+#include "ray/protobuf/gcs_service.grpc.pb.h"
+#include "ray/rpc/grpc_server.h"
+#include "ray/rpc/server_call.h"
 
 namespace ray {
 namespace rpc {
diff --git a/src/ray/rpc/grpc_server.cc b/src/ray/rpc/grpc_server.cc
index 071319aa6..932ad368f 100644
--- a/src/ray/rpc/grpc_server.cc
+++ b/src/ray/rpc/grpc_server.cc
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ray/rpc/grpc_server.h"
+#include "ray/rpc/grpc_server.h"
 
 #include <grpcpp/impl/service_type.h>
+
 #include <boost/asio/detail/socket_holder.hpp>
 
 #include "ray/common/ray_config.h"
diff --git a/src/ray/rpc/node_manager/node_manager_client.h b/src/ray/rpc/node_manager/node_manager_client.h
index 595f4b5a3..a35883439 100644
--- a/src/ray/rpc/node_manager/node_manager_client.h
+++ b/src/ray/rpc/node_manager/node_manager_client.h
@@ -20,10 +20,10 @@
 #include <thread>
 
 #include "ray/common/status.h"
+#include "ray/protobuf/node_manager.grpc.pb.h"
+#include "ray/protobuf/node_manager.pb.h"
 #include "ray/rpc/grpc_client.h"
 #include "ray/util/logging.h"
-#include "src/ray/protobuf/node_manager.grpc.pb.h"
-#include "src/ray/protobuf/node_manager.pb.h"
 
 namespace ray {
 namespace rpc {
diff --git a/src/ray/rpc/node_manager/node_manager_server.h b/src/ray/rpc/node_manager/node_manager_server.h
index 8e4e9e170..b1a0ea9cf 100644
--- a/src/ray/rpc/node_manager/node_manager_server.h
+++ b/src/ray/rpc/node_manager/node_manager_server.h
@@ -15,10 +15,10 @@
 #ifndef RAY_RPC_NODE_MANAGER_SERVER_H
 #define RAY_RPC_NODE_MANAGER_SERVER_H
 
+#include "ray/protobuf/node_manager.grpc.pb.h"
+#include "ray/protobuf/node_manager.pb.h"
 #include "ray/rpc/grpc_server.h"
 #include "ray/rpc/server_call.h"
-#include "src/ray/protobuf/node_manager.grpc.pb.h"
-#include "src/ray/protobuf/node_manager.pb.h"
 
 namespace ray {
 namespace rpc {
diff --git a/src/ray/rpc/object_manager/object_manager_client.h b/src/ray/rpc/object_manager/object_manager_client.h
index c4730e3e7..b17dbb25a 100644
--- a/src/ray/rpc/object_manager/object_manager_client.h
+++ b/src/ray/rpc/object_manager/object_manager_client.h
@@ -15,17 +15,17 @@
 #ifndef RAY_RPC_OBJECT_MANAGER_CLIENT_H
 #define RAY_RPC_OBJECT_MANAGER_CLIENT_H
 
-#include <thread>
-
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <thread>
+
 #include "ray/common/status.h"
+#include "ray/protobuf/object_manager.grpc.pb.h"
+#include "ray/protobuf/object_manager.pb.h"
+#include "ray/rpc/grpc_client.h"
 #include "ray/util/logging.h"
-#include "src/ray/protobuf/object_manager.grpc.pb.h"
-#include "src/ray/protobuf/object_manager.pb.h"
-#include "src/ray/rpc/grpc_client.h"
 
 namespace ray {
 namespace rpc {
diff --git a/src/ray/rpc/object_manager/object_manager_server.h b/src/ray/rpc/object_manager/object_manager_server.h
index f5ede7c64..a76446551 100644
--- a/src/ray/rpc/object_manager/object_manager_server.h
+++ b/src/ray/rpc/object_manager/object_manager_server.h
@@ -15,11 +15,10 @@
 #ifndef RAY_RPC_OBJECT_MANAGER_SERVER_H
 #define RAY_RPC_OBJECT_MANAGER_SERVER_H
 
-#include "src/ray/rpc/grpc_server.h"
-#include "src/ray/rpc/server_call.h"
-
-#include "src/ray/protobuf/object_manager.grpc.pb.h"
-#include "src/ray/protobuf/object_manager.pb.h"
+#include "ray/protobuf/object_manager.grpc.pb.h"
+#include "ray/protobuf/object_manager.pb.h"
+#include "ray/rpc/grpc_server.h"
+#include "ray/rpc/server_call.h"
 
 namespace ray {
 namespace rpc {
diff --git a/src/ray/rpc/worker/core_worker_client.h b/src/ray/rpc/worker/core_worker_client.h
index 24a62acf2..15a3cafdc 100644
--- a/src/ray/rpc/worker/core_worker_client.h
+++ b/src/ray/rpc/worker/core_worker_client.h
@@ -25,10 +25,10 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/hash/hash.h"
 #include "ray/common/status.h"
+#include "ray/protobuf/core_worker.grpc.pb.h"
+#include "ray/protobuf/core_worker.pb.h"
 #include "ray/rpc/grpc_client.h"
 #include "ray/util/logging.h"
-#include "src/ray/protobuf/core_worker.grpc.pb.h"
-#include "src/ray/protobuf/core_worker.pb.h"
 
 namespace ray {
 namespace rpc {
diff --git a/src/ray/rpc/worker/core_worker_server.h b/src/ray/rpc/worker/core_worker_server.h
index f3e902a45..0e2f78f79 100644
--- a/src/ray/rpc/worker/core_worker_server.h
+++ b/src/ray/rpc/worker/core_worker_server.h
@@ -15,10 +15,10 @@
 #ifndef RAY_RPC_CORE_WORKER_SERVER_H
 #define RAY_RPC_CORE_WORKER_SERVER_H
 
+#include "ray/protobuf/core_worker.grpc.pb.h"
+#include "ray/protobuf/core_worker.pb.h"
 #include "ray/rpc/grpc_server.h"
 #include "ray/rpc/server_call.h"
-#include "src/ray/protobuf/core_worker.grpc.pb.h"
-#include "src/ray/protobuf/core_worker.pb.h"
 
 namespace ray {