From 8b376662f39fcaa292b1ab8f9de893158a76cefc Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 17:00:20 +0800 Subject: [PATCH 01/10] Move id.h --- BUILD.bazel | 24 +++++++++++-------- .../java/org/ray/runtime/util/IdUtil.java | 4 ++-- python/ray/includes/common.pxd | 2 +- python/ray/includes/unique_ids.pxd | 4 ++-- src/ray/common/client_connection.h | 2 +- src/ray/common/common_protocol.h | 2 +- src/ray/{ => common}/id.cc | 4 ++-- src/ray/{ => common}/id.h | 0 src/ray/{ => common}/id_def.h | 0 src/ray/core_worker/common.h | 2 +- src/ray/core_worker/object_interface.h | 2 +- src/ray/core_worker/task_interface.h | 2 +- src/ray/gcs/client.h | 2 +- src/ray/gcs/redis_context.h | 2 +- src/ray/gcs/redis_module/ray_redis_module.cc | 2 +- src/ray/gcs/tables.h | 2 +- src/ray/object_manager/connection_pool.h | 2 +- src/ray/object_manager/object_buffer_pool.h | 2 +- src/ray/object_manager/object_directory.h | 2 +- src/ray/object_manager/object_manager.h | 2 +- .../object_manager_client_connection.h | 2 +- .../object_store_notification_manager.h | 2 +- src/ray/raylet/actor_registration.h | 2 +- ...org_ray_runtime_raylet_RayletClientImpl.cc | 2 +- src/ray/raylet/lineage_cache.h | 2 +- src/ray/raylet/mock_gcs_client.h | 2 +- src/ray/raylet/monitor.h | 2 +- src/ray/raylet/node_manager.cc | 2 +- src/ray/raylet/reconstruction_policy.h | 2 +- src/ray/raylet/task_dependency_manager.h | 2 +- src/ray/raylet/task_execution_spec.h | 2 +- src/ray/raylet/task_spec.h | 2 +- src/ray/raylet/worker.h | 2 +- 33 files changed, 47 insertions(+), 43 deletions(-) rename src/ray/{ => common}/id.cc (98%) rename src/ray/{ => common}/id.h (100%) rename src/ray/{ => common}/id_def.h (100%) diff --git a/BUILD.bazel b/BUILD.bazel index 2b75d5d04e77..47b0825a6759 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -306,15 +306,19 @@ cc_library( cc_library( name = "ray_common", - srcs = [ - "src/ray/common/client_connection.cc", - "src/ray/common/common_protocol.cc", - ], - hdrs = [ - "src/ray/common/buffer.h", - "src/ray/common/client_connection.h", - "src/ray/common/common_protocol.h", - ], + srcs = glob( + [ + "src/ray/common/*.cc", + ], + exclude = [ + "src/ray/common/*_test.cc", + ] + ), + hdrs = glob( + [ + "src/ray/common/*.h", + ] + ), copts = COPTS, includes = [ "src/ray/gcs/format", @@ -468,7 +472,7 @@ cc_binary( srcs = [ "src/ray/raylet/lib/java/org_ray_runtime_raylet_RayletClientImpl.h", "src/ray/raylet/lib/java/org_ray_runtime_raylet_RayletClientImpl.cc", - "src/ray/id.h", + "src/ray/common/id.h", "src/ray/raylet/raylet_client.h", "src/ray/util/logging.h", "@bazel_tools//tools/jdk:jni_header", diff --git a/java/runtime/src/main/java/org/ray/runtime/util/IdUtil.java b/java/runtime/src/main/java/org/ray/runtime/util/IdUtil.java index 04f75500b29d..67df09fa11ea 100644 --- a/java/runtime/src/main/java/org/ray/runtime/util/IdUtil.java +++ b/java/runtime/src/main/java/org/ray/runtime/util/IdUtil.java @@ -13,7 +13,7 @@ /** * Helper method for different Ids. * Note: any changes to these methods must be synced with C++ helper functions - * in src/ray/id.h + * in src/ray/common/id.h */ public class IdUtil { public static final int OBJECT_INDEX_POS = 16; @@ -161,7 +161,7 @@ public static long murmurHashCode(BaseId id) { } /** - * This method is the same as `Hash()` method of `ID` class in ray/src/ray/id.h + * This method is the same as `Hash()` method of `ID` class in ray/src/ray/common/id.h */ private static long murmurHash64A(byte[] data, int length, int seed) { final long m = 0xc6a4a7935bd1e995L; diff --git a/python/ray/includes/common.pxd b/python/ray/includes/common.pxd index bdb4316fcc4e..7da700548718 100644 --- a/python/ray/includes/common.pxd +++ b/python/ray/includes/common.pxd @@ -80,7 +80,7 @@ cdef extern from "ray/status.h" namespace "ray::StatusCode" nogil: cdef StatusCode StatusCode_RedisError "RedisError" -cdef extern from "ray/id.h" namespace "ray" nogil: +cdef extern from "ray/common/id.h" namespace "ray" nogil: const CTaskID GenerateTaskId(const CDriverID &driver_id, const CTaskID &parent_task_id, int parent_task_counter) diff --git a/python/ray/includes/unique_ids.pxd b/python/ray/includes/unique_ids.pxd index 8bf369c649b7..1bce0f4ba2d5 100644 --- a/python/ray/includes/unique_ids.pxd +++ b/python/ray/includes/unique_ids.pxd @@ -2,7 +2,7 @@ from libcpp cimport bool as c_bool from libcpp.string cimport string as c_string from libc.stdint cimport uint8_t, int64_t -cdef extern from "ray/id.h" namespace "ray" nogil: +cdef extern from "ray/common/id.h" namespace "ray" nogil: cdef cppclass CBaseID[T]: @staticmethod T from_random() @@ -113,7 +113,7 @@ cdef extern from "ray/id.h" namespace "ray" nogil: c_bool is_put() - int64_t ObjectIndex() const + int64_t ObjectIndex() const CTaskID TaskId() const diff --git a/src/ray/common/client_connection.h b/src/ray/common/client_connection.h index fe895fafd4d4..cf02fef1366b 100644 --- a/src/ray/common/client_connection.h +++ b/src/ray/common/client_connection.h @@ -8,7 +8,7 @@ #include #include -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" namespace ray { diff --git a/src/ray/common/common_protocol.h b/src/ray/common/common_protocol.h index 63a0bf8c259c..1dbd6bbc2c9b 100644 --- a/src/ray/common/common_protocol.h +++ b/src/ray/common/common_protocol.h @@ -5,7 +5,7 @@ #include -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/util/logging.h" /// Convert an unique ID to a flatbuffer string. diff --git a/src/ray/id.cc b/src/ray/common/id.cc similarity index 98% rename from src/ray/id.cc rename to src/ray/common/id.cc index 4c9ce4dc9244..f9bb7c26f66c 100644 --- a/src/ray/id.cc +++ b/src/ray/common/id.cc @@ -1,4 +1,4 @@ -#include "ray/id.h" +#include "ray/common/id.h" #include @@ -10,7 +10,7 @@ #include "ray/status.h" extern "C" { -#include "thirdparty/sha256.h" +#include "ray/thirdparty/sha256.h" } // Definitions for computing hash digests. diff --git a/src/ray/id.h b/src/ray/common/id.h similarity index 100% rename from src/ray/id.h rename to src/ray/common/id.h diff --git a/src/ray/id_def.h b/src/ray/common/id_def.h similarity index 100% rename from src/ray/id_def.h rename to src/ray/common/id_def.h diff --git a/src/ray/core_worker/common.h b/src/ray/core_worker/common.h index ad9485e53826..8317bf181207 100644 --- a/src/ray/core_worker/common.h +++ b/src/ray/core_worker/common.h @@ -4,7 +4,7 @@ #include #include "ray/common/buffer.h" -#include "ray/id.h" +#include "ray/common/id.h" namespace ray { diff --git a/src/ray/core_worker/object_interface.h b/src/ray/core_worker/object_interface.h index f14c5297c456..92809e52708f 100644 --- a/src/ray/core_worker/object_interface.h +++ b/src/ray/core_worker/object_interface.h @@ -4,7 +4,7 @@ #include "common.h" #include "plasma/client.h" #include "ray/common/buffer.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" namespace ray { diff --git a/src/ray/core_worker/task_interface.h b/src/ray/core_worker/task_interface.h index f667d8d5a06f..b12838c2186e 100644 --- a/src/ray/core_worker/task_interface.h +++ b/src/ray/core_worker/task_interface.h @@ -3,7 +3,7 @@ #include "common.h" #include "ray/common/buffer.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" namespace ray { diff --git a/src/ray/gcs/client.h b/src/ray/gcs/client.h index 7a5d8ef0ee9c..6953d8297936 100644 --- a/src/ray/gcs/client.h +++ b/src/ray/gcs/client.h @@ -6,7 +6,7 @@ #include "ray/gcs/asio.h" #include "ray/gcs/tables.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" #include "ray/util/logging.h" diff --git a/src/ray/gcs/redis_context.h b/src/ray/gcs/redis_context.h index 264f61b1ceaa..66abcf0c6141 100644 --- a/src/ray/gcs/redis_context.h +++ b/src/ray/gcs/redis_context.h @@ -5,7 +5,7 @@ #include #include -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" #include "ray/util/logging.h" diff --git a/src/ray/gcs/redis_module/ray_redis_module.cc b/src/ray/gcs/redis_module/ray_redis_module.cc index 13450a4b7642..7f51c848e515 100644 --- a/src/ray/gcs/redis_module/ray_redis_module.cc +++ b/src/ray/gcs/redis_module/ray_redis_module.cc @@ -3,7 +3,7 @@ #include "ray/common/common_protocol.h" #include "ray/gcs/format/gcs_generated.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" #include "ray/util/logging.h" #include "redis_string.h" diff --git a/src/ray/gcs/tables.h b/src/ray/gcs/tables.h index af739dc2ed32..5389f12d4763 100644 --- a/src/ray/gcs/tables.h +++ b/src/ray/gcs/tables.h @@ -7,7 +7,7 @@ #include #include "ray/constants.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" #include "ray/util/logging.h" diff --git a/src/ray/object_manager/connection_pool.h b/src/ray/object_manager/connection_pool.h index 628769d38b1e..ccdeba67fc4a 100644 --- a/src/ray/object_manager/connection_pool.h +++ b/src/ray/object_manager/connection_pool.h @@ -12,7 +12,7 @@ #include #include -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" #include diff --git a/src/ray/object_manager/object_buffer_pool.h b/src/ray/object_manager/object_buffer_pool.h index 78814710ae3c..b9a052916639 100644 --- a/src/ray/object_manager/object_buffer_pool.h +++ b/src/ray/object_manager/object_buffer_pool.h @@ -12,7 +12,7 @@ #include "plasma/client.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" namespace ray { diff --git a/src/ray/object_manager/object_directory.h b/src/ray/object_manager/object_directory.h index 96a2d726e241..7896bb179427 100644 --- a/src/ray/object_manager/object_directory.h +++ b/src/ray/object_manager/object_directory.h @@ -10,7 +10,7 @@ #include "plasma/client.h" #include "ray/gcs/client.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/object_manager/format/object_manager_generated.h" #include "ray/status.h" diff --git a/src/ray/object_manager/object_manager.h b/src/ray/object_manager/object_manager.h index cb0cff83f349..83a61ea8f80d 100644 --- a/src/ray/object_manager/object_manager.h +++ b/src/ray/object_manager/object_manager.h @@ -16,7 +16,7 @@ #include "plasma/client.h" #include "ray/common/client_connection.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" #include "ray/object_manager/connection_pool.h" diff --git a/src/ray/object_manager/object_manager_client_connection.h b/src/ray/object_manager/object_manager_client_connection.h index f878da67d0d3..c7311ae1c032 100644 --- a/src/ray/object_manager/object_manager_client_connection.h +++ b/src/ray/object_manager/object_manager_client_connection.h @@ -11,7 +11,7 @@ #include #include "ray/common/client_connection.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/ray_config.h" namespace ray { diff --git a/src/ray/object_manager/object_store_notification_manager.h b/src/ray/object_manager/object_store_notification_manager.h index 92db89573647..ff065bac8319 100644 --- a/src/ray/object_manager/object_store_notification_manager.h +++ b/src/ray/object_manager/object_store_notification_manager.h @@ -11,7 +11,7 @@ #include "plasma/client.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" #include "ray/object_manager/object_directory.h" diff --git a/src/ray/raylet/actor_registration.h b/src/ray/raylet/actor_registration.h index 38533e7dbe42..0460b4cdf11d 100644 --- a/src/ray/raylet/actor_registration.h +++ b/src/ray/raylet/actor_registration.h @@ -4,7 +4,7 @@ #include #include "ray/gcs/format/gcs_generated.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/raylet/task.h" namespace ray { diff --git a/src/ray/raylet/lib/java/org_ray_runtime_raylet_RayletClientImpl.cc b/src/ray/raylet/lib/java/org_ray_runtime_raylet_RayletClientImpl.cc index ba9fef4f44d6..2afcba18c356 100644 --- a/src/ray/raylet/lib/java/org_ray_runtime_raylet_RayletClientImpl.cc +++ b/src/ray/raylet/lib/java/org_ray_runtime_raylet_RayletClientImpl.cc @@ -2,7 +2,7 @@ #include -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/raylet/raylet_client.h" #include "ray/util/logging.h" diff --git a/src/ray/raylet/lineage_cache.h b/src/ray/raylet/lineage_cache.h index 045ded107474..964f90b3a9e2 100644 --- a/src/ray/raylet/lineage_cache.h +++ b/src/ray/raylet/lineage_cache.h @@ -8,7 +8,7 @@ #include "ray/common/common_protocol.h" #include "ray/raylet/task.h" #include "ray/gcs/tables.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" // clang-format on diff --git a/src/ray/raylet/mock_gcs_client.h b/src/ray/raylet/mock_gcs_client.h index f84b57dbc363..3f910984cdf9 100644 --- a/src/ray/raylet/mock_gcs_client.h +++ b/src/ray/raylet/mock_gcs_client.h @@ -12,7 +12,7 @@ #include #include -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/status.h" namespace ray { diff --git a/src/ray/raylet/monitor.h b/src/ray/raylet/monitor.h index bb698b07f674..8bc1a6c87413 100644 --- a/src/ray/raylet/monitor.h +++ b/src/ray/raylet/monitor.h @@ -5,7 +5,7 @@ #include #include "ray/gcs/client.h" -#include "ray/id.h" +#include "ray/common/id.h" namespace ray { diff --git a/src/ray/raylet/node_manager.cc b/src/ray/raylet/node_manager.cc index 1b582d7617cb..29ffbf3b41a2 100644 --- a/src/ray/raylet/node_manager.cc +++ b/src/ray/raylet/node_manager.cc @@ -5,7 +5,7 @@ #include "ray/status.h" #include "ray/common/common_protocol.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/raylet/format/node_manager_generated.h" #include "ray/stats/stats.h" diff --git a/src/ray/raylet/reconstruction_policy.h b/src/ray/raylet/reconstruction_policy.h index fc441de8a65d..90858ff5e201 100644 --- a/src/ray/raylet/reconstruction_policy.h +++ b/src/ray/raylet/reconstruction_policy.h @@ -8,7 +8,7 @@ #include #include "ray/gcs/tables.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/util/util.h" #include "ray/object_manager/object_directory.h" diff --git a/src/ray/raylet/task_dependency_manager.h b/src/ray/raylet/task_dependency_manager.h index 9691b3d64170..3788a5eae7ae 100644 --- a/src/ray/raylet/task_dependency_manager.h +++ b/src/ray/raylet/task_dependency_manager.h @@ -2,7 +2,7 @@ #define RAY_RAYLET_TASK_DEPENDENCY_MANAGER_H // clang-format off -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/raylet/task.h" #include "ray/object_manager/object_manager.h" #include "ray/raylet/reconstruction_policy.h" diff --git a/src/ray/raylet/task_execution_spec.h b/src/ray/raylet/task_execution_spec.h index fc26e7e275a8..6fc3b833ace8 100644 --- a/src/ray/raylet/task_execution_spec.h +++ b/src/ray/raylet/task_execution_spec.h @@ -3,7 +3,7 @@ #include -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/raylet/format/node_manager_generated.h" namespace ray { diff --git a/src/ray/raylet/task_spec.h b/src/ray/raylet/task_spec.h index 6bb2cdad972c..ce550c0f7c96 100644 --- a/src/ray/raylet/task_spec.h +++ b/src/ray/raylet/task_spec.h @@ -7,7 +7,7 @@ #include #include "ray/gcs/format/gcs_generated.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/raylet/scheduling_resources.h" extern "C" { diff --git a/src/ray/raylet/worker.h b/src/ray/raylet/worker.h index 4860342e3578..cb0797dddce8 100644 --- a/src/ray/raylet/worker.h +++ b/src/ray/raylet/worker.h @@ -4,7 +4,7 @@ #include #include "ray/common/client_connection.h" -#include "ray/id.h" +#include "ray/common/id.h" #include "ray/raylet/scheduling_resources.h" namespace ray { From 7cf6565c8c4d60adaa6434b0a6840ce0220a643a Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 17:10:54 +0800 Subject: [PATCH 02/10] move status.h --- python/ray/includes/common.pxd | 4 ++-- src/ray/common/client_connection.h | 2 +- src/ray/common/id.cc | 2 +- src/ray/{ => common}/status.cc | 2 +- src/ray/{ => common}/status.h | 0 src/ray/core_worker/object_interface.h | 2 +- src/ray/core_worker/task_execution.h | 2 +- src/ray/core_worker/task_interface.h | 2 +- src/ray/gcs/client.h | 2 +- src/ray/gcs/redis_context.h | 2 +- src/ray/gcs/redis_module/ray_redis_module.cc | 2 +- src/ray/gcs/tables.h | 2 +- src/ray/object_manager/connection_pool.h | 2 +- src/ray/object_manager/object_buffer_pool.cc | 2 +- src/ray/object_manager/object_buffer_pool.h | 2 +- src/ray/object_manager/object_directory.h | 2 +- src/ray/object_manager/object_manager.h | 2 +- src/ray/object_manager/object_store_notification_manager.cc | 2 +- src/ray/object_manager/object_store_notification_manager.h | 2 +- src/ray/object_manager/test/object_manager_stress_test.cc | 2 +- src/ray/object_manager/test/object_manager_test.cc | 2 +- src/ray/raylet/lineage_cache.h | 2 +- src/ray/raylet/main.cc | 2 +- src/ray/raylet/mock_gcs_client.h | 2 +- src/ray/raylet/monitor.cc | 2 +- src/ray/raylet/node_manager.cc | 2 +- src/ray/raylet/object_manager_integration_test.cc | 2 +- src/ray/raylet/raylet.cc | 2 +- src/ray/raylet/raylet_client.h | 2 +- src/ray/raylet/scheduling_queue.cc | 2 +- src/ray/raylet/worker_pool.cc | 2 +- src/ray/thirdparty/hiredis/win32.h | 2 +- src/ray/util/util.h | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) rename src/ray/{ => common}/status.cc (98%) rename src/ray/{ => common}/status.h (100%) diff --git a/python/ray/includes/common.pxd b/python/ray/includes/common.pxd index 7da700548718..4c2cd8437a66 100644 --- a/python/ray/includes/common.pxd +++ b/python/ray/includes/common.pxd @@ -12,7 +12,7 @@ from ray.includes.unique_ids cimport ( ) -cdef extern from "ray/status.h" namespace "ray" nogil: +cdef extern from "ray/common/status.h" namespace "ray" nogil: cdef cppclass StatusCode: pass @@ -68,7 +68,7 @@ cdef extern from "ray/status.h" namespace "ray" nogil: cdef CRayStatus RayStatus_Invalid "Status::Invalid"() -cdef extern from "ray/status.h" namespace "ray::StatusCode" nogil: +cdef extern from "ray/common/status.h" namespace "ray::StatusCode" nogil: cdef StatusCode StatusCode_OK "OK" cdef StatusCode StatusCode_OutOfMemory "OutOfMemory" cdef StatusCode StatusCode_KeyError "KeyError" diff --git a/src/ray/common/client_connection.h b/src/ray/common/client_connection.h index cf02fef1366b..936b3d577ed5 100644 --- a/src/ray/common/client_connection.h +++ b/src/ray/common/client_connection.h @@ -9,7 +9,7 @@ #include #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" namespace ray { diff --git a/src/ray/common/id.cc b/src/ray/common/id.cc index f9bb7c26f66c..6cad1cd45b47 100644 --- a/src/ray/common/id.cc +++ b/src/ray/common/id.cc @@ -7,7 +7,7 @@ #include #include "ray/constants.h" -#include "ray/status.h" +#include "ray/common/status.h" extern "C" { #include "ray/thirdparty/sha256.h" diff --git a/src/ray/status.cc b/src/ray/common/status.cc similarity index 98% rename from src/ray/status.cc rename to src/ray/common/status.cc index 4be0de442bb1..01abacde6214 100644 --- a/src/ray/status.cc +++ b/src/ray/common/status.cc @@ -12,7 +12,7 @@ // Adapted from Apache Arrow, Apache Kudu, TensorFlow -#include "ray/status.h" +#include "ray/common/status.h" #include diff --git a/src/ray/status.h b/src/ray/common/status.h similarity index 100% rename from src/ray/status.h rename to src/ray/common/status.h diff --git a/src/ray/core_worker/object_interface.h b/src/ray/core_worker/object_interface.h index 92809e52708f..8a9e20c48c6e 100644 --- a/src/ray/core_worker/object_interface.h +++ b/src/ray/core_worker/object_interface.h @@ -5,7 +5,7 @@ #include "plasma/client.h" #include "ray/common/buffer.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" namespace ray { diff --git a/src/ray/core_worker/task_execution.h b/src/ray/core_worker/task_execution.h index 308b1e6868d6..c4de937ee439 100644 --- a/src/ray/core_worker/task_execution.h +++ b/src/ray/core_worker/task_execution.h @@ -3,7 +3,7 @@ #include "common.h" #include "ray/common/buffer.h" -#include "ray/status.h" +#include "ray/common/status.h" namespace ray { diff --git a/src/ray/core_worker/task_interface.h b/src/ray/core_worker/task_interface.h index b12838c2186e..e23f049d341d 100644 --- a/src/ray/core_worker/task_interface.h +++ b/src/ray/core_worker/task_interface.h @@ -4,7 +4,7 @@ #include "common.h" #include "ray/common/buffer.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" namespace ray { diff --git a/src/ray/gcs/client.h b/src/ray/gcs/client.h index 6953d8297936..7a046d67afb8 100644 --- a/src/ray/gcs/client.h +++ b/src/ray/gcs/client.h @@ -7,7 +7,7 @@ #include "ray/gcs/asio.h" #include "ray/gcs/tables.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/util/logging.h" namespace ray { diff --git a/src/ray/gcs/redis_context.h b/src/ray/gcs/redis_context.h index 66abcf0c6141..fc42e5cd98c2 100644 --- a/src/ray/gcs/redis_context.h +++ b/src/ray/gcs/redis_context.h @@ -6,7 +6,7 @@ #include #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/util/logging.h" #include "ray/gcs/format/gcs_generated.h" diff --git a/src/ray/gcs/redis_module/ray_redis_module.cc b/src/ray/gcs/redis_module/ray_redis_module.cc index 7f51c848e515..a3a59aa56306 100644 --- a/src/ray/gcs/redis_module/ray_redis_module.cc +++ b/src/ray/gcs/redis_module/ray_redis_module.cc @@ -4,7 +4,7 @@ #include "ray/common/common_protocol.h" #include "ray/gcs/format/gcs_generated.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/util/logging.h" #include "redis_string.h" #include "redismodule.h" diff --git a/src/ray/gcs/tables.h b/src/ray/gcs/tables.h index 5389f12d4763..1c3b1d463aed 100644 --- a/src/ray/gcs/tables.h +++ b/src/ray/gcs/tables.h @@ -8,7 +8,7 @@ #include "ray/constants.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/util/logging.h" #include "ray/gcs/format/gcs_generated.h" diff --git a/src/ray/object_manager/connection_pool.h b/src/ray/object_manager/connection_pool.h index ccdeba67fc4a..820cf591e70d 100644 --- a/src/ray/object_manager/connection_pool.h +++ b/src/ray/object_manager/connection_pool.h @@ -13,7 +13,7 @@ #include #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" #include #include "ray/object_manager/format/object_manager_generated.h" diff --git a/src/ray/object_manager/object_buffer_pool.cc b/src/ray/object_manager/object_buffer_pool.cc index fba426d732c3..ee2a2319c0f4 100644 --- a/src/ray/object_manager/object_buffer_pool.cc +++ b/src/ray/object_manager/object_buffer_pool.cc @@ -1,6 +1,6 @@ #include "ray/object_manager/object_buffer_pool.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/util/logging.h" namespace ray { diff --git a/src/ray/object_manager/object_buffer_pool.h b/src/ray/object_manager/object_buffer_pool.h index b9a052916639..67288800498d 100644 --- a/src/ray/object_manager/object_buffer_pool.h +++ b/src/ray/object_manager/object_buffer_pool.h @@ -13,7 +13,7 @@ #include "plasma/client.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" namespace ray { diff --git a/src/ray/object_manager/object_directory.h b/src/ray/object_manager/object_directory.h index 7896bb179427..50edec6799ec 100644 --- a/src/ray/object_manager/object_directory.h +++ b/src/ray/object_manager/object_directory.h @@ -12,7 +12,7 @@ #include "ray/gcs/client.h" #include "ray/common/id.h" #include "ray/object_manager/format/object_manager_generated.h" -#include "ray/status.h" +#include "ray/common/status.h" namespace ray { diff --git a/src/ray/object_manager/object_manager.h b/src/ray/object_manager/object_manager.h index 83a61ea8f80d..6318250ae3e8 100644 --- a/src/ray/object_manager/object_manager.h +++ b/src/ray/object_manager/object_manager.h @@ -17,7 +17,7 @@ #include "ray/common/client_connection.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/object_manager/connection_pool.h" #include "ray/object_manager/format/object_manager_generated.h" diff --git a/src/ray/object_manager/object_store_notification_manager.cc b/src/ray/object_manager/object_store_notification_manager.cc index 5245a94ace3a..6f813ea4595d 100644 --- a/src/ray/object_manager/object_store_notification_manager.cc +++ b/src/ray/object_manager/object_store_notification_manager.cc @@ -5,7 +5,7 @@ #include #include -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/common/common_protocol.h" #include "ray/object_manager/object_store_notification_manager.h" diff --git a/src/ray/object_manager/object_store_notification_manager.h b/src/ray/object_manager/object_store_notification_manager.h index ff065bac8319..912c5dc884d0 100644 --- a/src/ray/object_manager/object_store_notification_manager.h +++ b/src/ray/object_manager/object_store_notification_manager.h @@ -12,7 +12,7 @@ #include "plasma/client.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/object_manager/object_directory.h" diff --git a/src/ray/object_manager/test/object_manager_stress_test.cc b/src/ray/object_manager/test/object_manager_stress_test.cc index 6d7c0be0f856..f1169605134a 100644 --- a/src/ray/object_manager/test/object_manager_stress_test.cc +++ b/src/ray/object_manager/test/object_manager_stress_test.cc @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/object_manager/object_manager.h" diff --git a/src/ray/object_manager/test/object_manager_test.cc b/src/ray/object_manager/test/object_manager_test.cc index 983a8fa7bc05..1b73eef47266 100644 --- a/src/ray/object_manager/test/object_manager_test.cc +++ b/src/ray/object_manager/test/object_manager_test.cc @@ -3,7 +3,7 @@ #include "gtest/gtest.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/object_manager/object_manager.h" diff --git a/src/ray/raylet/lineage_cache.h b/src/ray/raylet/lineage_cache.h index 964f90b3a9e2..02d98b8cffe6 100644 --- a/src/ray/raylet/lineage_cache.h +++ b/src/ray/raylet/lineage_cache.h @@ -9,7 +9,7 @@ #include "ray/raylet/task.h" #include "ray/gcs/tables.h" #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" // clang-format on namespace ray { diff --git a/src/ray/raylet/main.cc b/src/ray/raylet/main.cc index f5b8e898558e..5fe593b111ae 100644 --- a/src/ray/raylet/main.cc +++ b/src/ray/raylet/main.cc @@ -3,7 +3,7 @@ #include "ray/ray_config.h" #include "ray/raylet/raylet.h" #include "ray/stats/stats.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "gflags/gflags.h" diff --git a/src/ray/raylet/mock_gcs_client.h b/src/ray/raylet/mock_gcs_client.h index 3f910984cdf9..a08e74f66e5e 100644 --- a/src/ray/raylet/mock_gcs_client.h +++ b/src/ray/raylet/mock_gcs_client.h @@ -13,7 +13,7 @@ #include #include "ray/common/id.h" -#include "ray/status.h" +#include "ray/common/status.h" namespace ray { diff --git a/src/ray/raylet/monitor.cc b/src/ray/raylet/monitor.cc index 171b4dc9439e..e1eb2c3bd55d 100644 --- a/src/ray/raylet/monitor.cc +++ b/src/ray/raylet/monitor.cc @@ -1,7 +1,7 @@ #include "ray/raylet/monitor.h" #include "ray/ray_config.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/util/util.h" namespace ray { diff --git a/src/ray/raylet/node_manager.cc b/src/ray/raylet/node_manager.cc index 29ffbf3b41a2..e3fd9a0df09f 100644 --- a/src/ray/raylet/node_manager.cc +++ b/src/ray/raylet/node_manager.cc @@ -2,7 +2,7 @@ #include -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/common/common_protocol.h" #include "ray/common/id.h" diff --git a/src/ray/raylet/object_manager_integration_test.cc b/src/ray/raylet/object_manager_integration_test.cc index a774e1409195..1b043ca58c2b 100644 --- a/src/ray/raylet/object_manager_integration_test.cc +++ b/src/ray/raylet/object_manager_integration_test.cc @@ -3,7 +3,7 @@ #include "gtest/gtest.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/raylet/raylet.h" diff --git a/src/ray/raylet/raylet.cc b/src/ray/raylet/raylet.cc index 3b0ebd5b691f..347ca162d298 100644 --- a/src/ray/raylet/raylet.cc +++ b/src/ray/raylet/raylet.cc @@ -5,7 +5,7 @@ #include #include -#include "ray/status.h" +#include "ray/common/status.h" namespace { diff --git a/src/ray/raylet/raylet_client.h b/src/ray/raylet/raylet_client.h index 0bdd076b5577..6c6aefebd551 100644 --- a/src/ray/raylet/raylet_client.h +++ b/src/ray/raylet/raylet_client.h @@ -7,7 +7,7 @@ #include #include "ray/raylet/task_spec.h" -#include "ray/status.h" +#include "ray/common/status.h" using ray::ActorCheckpointID; using ray::ActorID; diff --git a/src/ray/raylet/scheduling_queue.cc b/src/ray/raylet/scheduling_queue.cc index 29af345b8391..541de7aa3907 100644 --- a/src/ray/raylet/scheduling_queue.cc +++ b/src/ray/raylet/scheduling_queue.cc @@ -3,7 +3,7 @@ #include #include "ray/stats/stats.h" -#include "ray/status.h" +#include "ray/common/status.h" namespace { diff --git a/src/ray/raylet/worker_pool.cc b/src/ray/raylet/worker_pool.cc index 27e7fea05311..4b6df3bf216b 100644 --- a/src/ray/raylet/worker_pool.cc +++ b/src/ray/raylet/worker_pool.cc @@ -7,7 +7,7 @@ #include "ray/ray_config.h" #include "ray/stats/stats.h" -#include "ray/status.h" +#include "ray/common/status.h" #include "ray/util/logging.h" namespace { diff --git a/src/ray/thirdparty/hiredis/win32.h b/src/ray/thirdparty/hiredis/win32.h index 1a27c18f2ae5..253d058ac7ad 100644 --- a/src/ray/thirdparty/hiredis/win32.h +++ b/src/ray/thirdparty/hiredis/win32.h @@ -39,4 +39,4 @@ __inline int c99_snprintf(char* str, size_t size, const char* format, ...) #endif #endif -#endif \ No newline at end of file +#endif diff --git a/src/ray/util/util.h b/src/ray/util/util.h index ba34cb7339e9..f86870858c5c 100644 --- a/src/ray/util/util.h +++ b/src/ray/util/util.h @@ -4,7 +4,7 @@ #include #include -#include "ray/status.h" +#include "ray/common/status.h" /// Return the number of milliseconds since the steady clock epoch. NOTE: The /// returned timestamp may be used for accurately measuring intervals but has From 18284d53d25339ab40086917aa8ff2c7999527b5 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 17:12:31 +0800 Subject: [PATCH 03/10] move constants.h --- python/ray/includes/unique_ids.pxi | 8 ++++---- src/ray/{ => common}/constants.h | 0 src/ray/common/id.cc | 2 +- src/ray/common/id.h | 2 +- src/ray/gcs/tables.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename src/ray/{ => common}/constants.h (100%) diff --git a/python/ray/includes/unique_ids.pxi b/python/ray/includes/unique_ids.pxi index cd3c58003fed..98a0a291351d 100644 --- a/python/ray/includes/unique_ids.pxi +++ b/python/ray/includes/unique_ids.pxi @@ -34,7 +34,7 @@ def check_id(b, size=kUniqueIDSize): str(size)) -cdef extern from "ray/constants.h" nogil: +cdef extern from "ray/common/constants.h" nogil: cdef int64_t kUniqueIDSize cdef int64_t kMaxTaskPuts @@ -109,7 +109,7 @@ cdef class UniqueID(BaseID): def nil(cls): return cls(CUniqueID.Nil().Binary()) - + @classmethod def from_random(cls): return cls(os.urandom(CUniqueID.Size())) @@ -122,7 +122,7 @@ cdef class UniqueID(BaseID): def hex(self): return decode(self.data.Hex()) - + def is_nil(self): return self.data.IsNil() @@ -148,7 +148,7 @@ cdef class ObjectID(BaseID): def hex(self): return decode(self.data.Hex()) - + def is_nil(self): return self.data.IsNil() diff --git a/src/ray/constants.h b/src/ray/common/constants.h similarity index 100% rename from src/ray/constants.h rename to src/ray/common/constants.h diff --git a/src/ray/common/id.cc b/src/ray/common/id.cc index 6cad1cd45b47..57e41d97d10c 100644 --- a/src/ray/common/id.cc +++ b/src/ray/common/id.cc @@ -6,7 +6,7 @@ #include #include -#include "ray/constants.h" +#include "ray/common/constants.h" #include "ray/common/status.h" extern "C" { diff --git a/src/ray/common/id.h b/src/ray/common/id.h index 7153a95f7750..3b2d244cfb46 100644 --- a/src/ray/common/id.h +++ b/src/ray/common/id.h @@ -11,7 +11,7 @@ #include #include "plasma/common.h" -#include "ray/constants.h" +#include "ray/common/constants.h" #include "ray/util/logging.h" #include "ray/util/visibility.h" diff --git a/src/ray/gcs/tables.h b/src/ray/gcs/tables.h index 1c3b1d463aed..af42509bda96 100644 --- a/src/ray/gcs/tables.h +++ b/src/ray/gcs/tables.h @@ -6,7 +6,7 @@ #include #include -#include "ray/constants.h" +#include "ray/common/constants.h" #include "ray/common/id.h" #include "ray/common/status.h" #include "ray/util/logging.h" From e26ea8c68bd20555a95d0c3ddb7a3ba671366c83 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 17:14:53 +0800 Subject: [PATCH 04/10] Move ray_config.h --- python/ray/includes/ray_config.pxd | 2 +- src/ray/common/client_connection.cc | 2 +- src/ray/{ => common}/ray_config.h | 0 src/ray/{ => common}/ray_config_def.h | 0 src/ray/gcs/client.cc | 2 +- src/ray/gcs/client_test.cc | 2 +- src/ray/gcs/redis_context.cc | 2 +- src/ray/gcs/tables.cc | 2 +- src/ray/object_manager/object_manager_client_connection.h | 2 +- src/ray/raylet/main.cc | 2 +- src/ray/raylet/monitor.cc | 2 +- src/ray/raylet/monitor_main.cc | 2 +- src/ray/raylet/raylet_client.cc | 2 +- src/ray/raylet/worker_pool.cc | 2 +- 14 files changed, 12 insertions(+), 12 deletions(-) rename src/ray/{ => common}/ray_config.h (100%) rename src/ray/{ => common}/ray_config_def.h (100%) diff --git a/python/ray/includes/ray_config.pxd b/python/ray/includes/ray_config.pxd index bae0995cebff..41adec160c19 100644 --- a/python/ray/includes/ray_config.pxd +++ b/python/ray/includes/ray_config.pxd @@ -3,7 +3,7 @@ from libcpp.string cimport string as c_string from libcpp.unordered_map cimport unordered_map -cdef extern from "ray/ray_config.h" nogil: +cdef extern from "ray/common/ray_config.h" nogil: cdef cppclass RayConfig "RayConfig": @staticmethod RayConfig &instance() diff --git a/src/ray/common/client_connection.cc b/src/ray/common/client_connection.cc index b36382bbb99a..cd9ad1239e0a 100644 --- a/src/ray/common/client_connection.cc +++ b/src/ray/common/client_connection.cc @@ -4,7 +4,7 @@ #include #include -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" #include "ray/raylet/format/node_manager_generated.h" #include "ray/util/util.h" diff --git a/src/ray/ray_config.h b/src/ray/common/ray_config.h similarity index 100% rename from src/ray/ray_config.h rename to src/ray/common/ray_config.h diff --git a/src/ray/ray_config_def.h b/src/ray/common/ray_config_def.h similarity index 100% rename from src/ray/ray_config_def.h rename to src/ray/common/ray_config_def.h diff --git a/src/ray/gcs/client.cc b/src/ray/gcs/client.cc index 642f5f2cf156..a7788abc75b9 100644 --- a/src/ray/gcs/client.cc +++ b/src/ray/gcs/client.cc @@ -1,7 +1,7 @@ #include "ray/gcs/client.h" #include "ray/gcs/redis_context.h" -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" static void GetRedisShards(redisContext *context, std::vector &addresses, std::vector &ports) { diff --git a/src/ray/gcs/client_test.cc b/src/ray/gcs/client_test.cc index c203a4a9482a..9bd362a79972 100644 --- a/src/ray/gcs/client_test.cc +++ b/src/ray/gcs/client_test.cc @@ -7,7 +7,7 @@ extern "C" { #include "ray/gcs/client.h" #include "ray/gcs/tables.h" -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" namespace ray { diff --git a/src/ray/gcs/redis_context.cc b/src/ray/gcs/redis_context.cc index 42d921d932d7..fe5ba3d1d134 100644 --- a/src/ray/gcs/redis_context.cc +++ b/src/ray/gcs/redis_context.cc @@ -14,7 +14,7 @@ extern "C" { } // TODO(pcm): Integrate into the C++ tree. -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" namespace { diff --git a/src/ray/gcs/tables.cc b/src/ray/gcs/tables.cc index 3a381313fd21..825a4012697b 100644 --- a/src/ray/gcs/tables.cc +++ b/src/ray/gcs/tables.cc @@ -2,7 +2,7 @@ #include "ray/common/common_protocol.h" #include "ray/gcs/client.h" -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" #include "ray/util/util.h" namespace { diff --git a/src/ray/object_manager/object_manager_client_connection.h b/src/ray/object_manager/object_manager_client_connection.h index c7311ae1c032..c08b99748408 100644 --- a/src/ray/object_manager/object_manager_client_connection.h +++ b/src/ray/object_manager/object_manager_client_connection.h @@ -12,7 +12,7 @@ #include "ray/common/client_connection.h" #include "ray/common/id.h" -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" namespace ray { diff --git a/src/ray/raylet/main.cc b/src/ray/raylet/main.cc index 5fe593b111ae..7c4601bab6b8 100644 --- a/src/ray/raylet/main.cc +++ b/src/ray/raylet/main.cc @@ -1,6 +1,6 @@ #include -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" #include "ray/raylet/raylet.h" #include "ray/stats/stats.h" #include "ray/common/status.h" diff --git a/src/ray/raylet/monitor.cc b/src/ray/raylet/monitor.cc index e1eb2c3bd55d..a87257cadda4 100644 --- a/src/ray/raylet/monitor.cc +++ b/src/ray/raylet/monitor.cc @@ -1,6 +1,6 @@ #include "ray/raylet/monitor.h" -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" #include "ray/common/status.h" #include "ray/util/util.h" diff --git a/src/ray/raylet/monitor_main.cc b/src/ray/raylet/monitor_main.cc index ed0c05aa7b81..6f3c57136ca7 100644 --- a/src/ray/raylet/monitor_main.cc +++ b/src/ray/raylet/monitor_main.cc @@ -1,6 +1,6 @@ #include -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" #include "ray/raylet/monitor.h" #include "ray/util/util.h" diff --git a/src/ray/raylet/raylet_client.cc b/src/ray/raylet/raylet_client.cc index ac312b79d13e..801bb9112241 100644 --- a/src/ray/raylet/raylet_client.cc +++ b/src/ray/raylet/raylet_client.cc @@ -13,7 +13,7 @@ #include #include "ray/common/common_protocol.h" -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" #include "ray/raylet/format/node_manager_generated.h" #include "ray/raylet/task_spec.h" #include "ray/util/logging.h" diff --git a/src/ray/raylet/worker_pool.cc b/src/ray/raylet/worker_pool.cc index 4b6df3bf216b..600784281865 100644 --- a/src/ray/raylet/worker_pool.cc +++ b/src/ray/raylet/worker_pool.cc @@ -5,7 +5,7 @@ #include #include -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" #include "ray/stats/stats.h" #include "ray/common/status.h" #include "ray/util/logging.h" From ad0c0cd1f136839e5fd751e33412966c698bd967 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 17:20:32 +0800 Subject: [PATCH 05/10] update ray_util --- BUILD.bazel | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 47b0825a6759..c1f519533331 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -281,16 +281,13 @@ cc_library( name = "ray_util", srcs = glob( [ - "src/ray/*.cc", "src/ray/util/*.cc", ], exclude = [ - "src/ray/util/logging_test.cc", - "src/ray/util/signal_test.cc", + "src/ray/util/*_test.cc", ], ), hdrs = glob([ - "src/ray/*.h", "src/ray/util/*.h", ]), copts = COPTS, @@ -317,7 +314,7 @@ cc_library( hdrs = glob( [ "src/ray/common/*.h", - ] + ], ), copts = COPTS, includes = [ From 109d613d57171afa17c21dd49f7b82de4e89e648 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 17:26:03 +0800 Subject: [PATCH 06/10] remove node_manager_fbs dep --- BUILD.bazel | 1 - src/ray/common/client_connection.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index c1f519533331..707c175c70a5 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -322,7 +322,6 @@ cc_library( ], deps = [ ":gcs_fbs", - ":node_manager_fbs", ":ray_util", "@boost//:asio", "@plasma//:plasma_client", diff --git a/src/ray/common/client_connection.cc b/src/ray/common/client_connection.cc index cd9ad1239e0a..b5b26042689d 100644 --- a/src/ray/common/client_connection.cc +++ b/src/ray/common/client_connection.cc @@ -5,7 +5,6 @@ #include #include "ray/common/ray_config.h" -#include "ray/raylet/format/node_manager_generated.h" #include "ray/util/util.h" namespace ray { From 420e57142016470e3ce04944a702bec7c4a80566 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 17:55:47 +0800 Subject: [PATCH 07/10] lint --- BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.bazel b/BUILD.bazel index 707c175c70a5..90b0f536a10b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -309,7 +309,7 @@ cc_library( ], exclude = [ "src/ray/common/*_test.cc", - ] + ], ), hdrs = glob( [ From ef1f1e99b4b5784ce3d80a4b2dd4834f47e1845e Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 20:45:16 +0800 Subject: [PATCH 08/10] format --- src/ray/gcs/client.cc | 2 +- src/ray/gcs/client.h | 4 ++-- src/ray/gcs/client_test.cc | 2 +- src/ray/gcs/redis_module/ray_redis_module.cc | 2 +- src/ray/gcs/tables.cc | 2 +- src/ray/object_manager/object_directory.h | 4 ++-- src/ray/object_manager/test/object_manager_test.cc | 2 +- src/ray/raylet/actor_registration.h | 2 +- src/ray/raylet/main.cc | 2 +- src/ray/raylet/monitor.h | 2 +- src/ray/raylet/raylet.cc | 2 +- src/ray/raylet/raylet_client.h | 2 +- src/ray/raylet/reconstruction_policy.h | 2 +- src/ray/raylet/scheduling_queue.cc | 2 +- src/ray/raylet/task_spec.h | 2 +- src/ray/raylet/worker_pool.cc | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ray/gcs/client.cc b/src/ray/gcs/client.cc index a7788abc75b9..d9b5087c4719 100644 --- a/src/ray/gcs/client.cc +++ b/src/ray/gcs/client.cc @@ -1,7 +1,7 @@ #include "ray/gcs/client.h" -#include "ray/gcs/redis_context.h" #include "ray/common/ray_config.h" +#include "ray/gcs/redis_context.h" static void GetRedisShards(redisContext *context, std::vector &addresses, std::vector &ports) { diff --git a/src/ray/gcs/client.h b/src/ray/gcs/client.h index 7a046d67afb8..d47d9a6e8b24 100644 --- a/src/ray/gcs/client.h +++ b/src/ray/gcs/client.h @@ -4,10 +4,10 @@ #include #include -#include "ray/gcs/asio.h" -#include "ray/gcs/tables.h" #include "ray/common/id.h" #include "ray/common/status.h" +#include "ray/gcs/asio.h" +#include "ray/gcs/tables.h" #include "ray/util/logging.h" namespace ray { diff --git a/src/ray/gcs/client_test.cc b/src/ray/gcs/client_test.cc index 9bd362a79972..1b43bcc23c08 100644 --- a/src/ray/gcs/client_test.cc +++ b/src/ray/gcs/client_test.cc @@ -5,9 +5,9 @@ extern "C" { #include "ray/thirdparty/hiredis/hiredis.h" } +#include "ray/common/ray_config.h" #include "ray/gcs/client.h" #include "ray/gcs/tables.h" -#include "ray/common/ray_config.h" namespace ray { diff --git a/src/ray/gcs/redis_module/ray_redis_module.cc b/src/ray/gcs/redis_module/ray_redis_module.cc index a3a59aa56306..23e611e400df 100644 --- a/src/ray/gcs/redis_module/ray_redis_module.cc +++ b/src/ray/gcs/redis_module/ray_redis_module.cc @@ -2,9 +2,9 @@ #include #include "ray/common/common_protocol.h" -#include "ray/gcs/format/gcs_generated.h" #include "ray/common/id.h" #include "ray/common/status.h" +#include "ray/gcs/format/gcs_generated.h" #include "ray/util/logging.h" #include "redis_string.h" #include "redismodule.h" diff --git a/src/ray/gcs/tables.cc b/src/ray/gcs/tables.cc index 825a4012697b..ffc44daa049a 100644 --- a/src/ray/gcs/tables.cc +++ b/src/ray/gcs/tables.cc @@ -1,8 +1,8 @@ #include "ray/gcs/tables.h" #include "ray/common/common_protocol.h" -#include "ray/gcs/client.h" #include "ray/common/ray_config.h" +#include "ray/gcs/client.h" #include "ray/util/util.h" namespace { diff --git a/src/ray/object_manager/object_directory.h b/src/ray/object_manager/object_directory.h index 50edec6799ec..be21e52807da 100644 --- a/src/ray/object_manager/object_directory.h +++ b/src/ray/object_manager/object_directory.h @@ -9,10 +9,10 @@ #include "plasma/client.h" -#include "ray/gcs/client.h" #include "ray/common/id.h" -#include "ray/object_manager/format/object_manager_generated.h" #include "ray/common/status.h" +#include "ray/gcs/client.h" +#include "ray/object_manager/format/object_manager_generated.h" namespace ray { diff --git a/src/ray/object_manager/test/object_manager_test.cc b/src/ray/object_manager/test/object_manager_test.cc index 1b73eef47266..012c306938d6 100644 --- a/src/ray/object_manager/test/object_manager_test.cc +++ b/src/ray/object_manager/test/object_manager_test.cc @@ -10,7 +10,7 @@ namespace { std::string store_executable; int64_t wait_timeout_ms; -} +} // namespace namespace ray { diff --git a/src/ray/raylet/actor_registration.h b/src/ray/raylet/actor_registration.h index 0460b4cdf11d..8d7ce2a449ec 100644 --- a/src/ray/raylet/actor_registration.h +++ b/src/ray/raylet/actor_registration.h @@ -3,8 +3,8 @@ #include -#include "ray/gcs/format/gcs_generated.h" #include "ray/common/id.h" +#include "ray/gcs/format/gcs_generated.h" #include "ray/raylet/task.h" namespace ray { diff --git a/src/ray/raylet/main.cc b/src/ray/raylet/main.cc index 7c4601bab6b8..003e48370dbf 100644 --- a/src/ray/raylet/main.cc +++ b/src/ray/raylet/main.cc @@ -1,9 +1,9 @@ #include #include "ray/common/ray_config.h" +#include "ray/common/status.h" #include "ray/raylet/raylet.h" #include "ray/stats/stats.h" -#include "ray/common/status.h" #include "gflags/gflags.h" diff --git a/src/ray/raylet/monitor.h b/src/ray/raylet/monitor.h index 8bc1a6c87413..c69cc9f003e0 100644 --- a/src/ray/raylet/monitor.h +++ b/src/ray/raylet/monitor.h @@ -4,8 +4,8 @@ #include #include -#include "ray/gcs/client.h" #include "ray/common/id.h" +#include "ray/gcs/client.h" namespace ray { diff --git a/src/ray/raylet/raylet.cc b/src/ray/raylet/raylet.cc index 347ca162d298..dd9e5fac318e 100644 --- a/src/ray/raylet/raylet.cc +++ b/src/ray/raylet/raylet.cc @@ -37,7 +37,7 @@ static const std::vector object_manager_message_enum = GenerateEnumNames(ray::object_manager::protocol::EnumNamesMessageType(), static_cast(ray::object_manager::protocol::MessageType::MIN), static_cast(ray::object_manager::protocol::MessageType::MAX)); -} +} // namespace namespace ray { diff --git a/src/ray/raylet/raylet_client.h b/src/ray/raylet/raylet_client.h index 6c6aefebd551..8b4dfad5b37a 100644 --- a/src/ray/raylet/raylet_client.h +++ b/src/ray/raylet/raylet_client.h @@ -6,8 +6,8 @@ #include #include -#include "ray/raylet/task_spec.h" #include "ray/common/status.h" +#include "ray/raylet/task_spec.h" using ray::ActorCheckpointID; using ray::ActorID; diff --git a/src/ray/raylet/reconstruction_policy.h b/src/ray/raylet/reconstruction_policy.h index 90858ff5e201..cd969cc2706e 100644 --- a/src/ray/raylet/reconstruction_policy.h +++ b/src/ray/raylet/reconstruction_policy.h @@ -7,8 +7,8 @@ #include -#include "ray/gcs/tables.h" #include "ray/common/id.h" +#include "ray/gcs/tables.h" #include "ray/util/util.h" #include "ray/object_manager/object_directory.h" diff --git a/src/ray/raylet/scheduling_queue.cc b/src/ray/raylet/scheduling_queue.cc index 541de7aa3907..85295e403769 100644 --- a/src/ray/raylet/scheduling_queue.cc +++ b/src/ray/raylet/scheduling_queue.cc @@ -2,8 +2,8 @@ #include -#include "ray/stats/stats.h" #include "ray/common/status.h" +#include "ray/stats/stats.h" namespace { diff --git a/src/ray/raylet/task_spec.h b/src/ray/raylet/task_spec.h index ce550c0f7c96..d557c188ae68 100644 --- a/src/ray/raylet/task_spec.h +++ b/src/ray/raylet/task_spec.h @@ -6,8 +6,8 @@ #include #include -#include "ray/gcs/format/gcs_generated.h" #include "ray/common/id.h" +#include "ray/gcs/format/gcs_generated.h" #include "ray/raylet/scheduling_resources.h" extern "C" { diff --git a/src/ray/raylet/worker_pool.cc b/src/ray/raylet/worker_pool.cc index 600784281865..43698c53f0d8 100644 --- a/src/ray/raylet/worker_pool.cc +++ b/src/ray/raylet/worker_pool.cc @@ -6,8 +6,8 @@ #include #include "ray/common/ray_config.h" -#include "ray/stats/stats.h" #include "ray/common/status.h" +#include "ray/stats/stats.h" #include "ray/util/logging.h" namespace { From 4b80807535c96424734816680877004c5c2e0f72 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Thu, 30 May 2019 20:46:48 +0800 Subject: [PATCH 09/10] revert thirdparty --- src/ray/thirdparty/hiredis/win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ray/thirdparty/hiredis/win32.h b/src/ray/thirdparty/hiredis/win32.h index 253d058ac7ad..1a27c18f2ae5 100644 --- a/src/ray/thirdparty/hiredis/win32.h +++ b/src/ray/thirdparty/hiredis/win32.h @@ -39,4 +39,4 @@ __inline int c99_snprintf(char* str, size_t size, const char* format, ...) #endif #endif -#endif +#endif \ No newline at end of file From d273094f686109cf93e8a9adecf116e292b09c52 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Wed, 5 Jun 2019 10:55:42 +0800 Subject: [PATCH 10/10] fix --- src/ray/core_worker/object_interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ray/core_worker/object_interface.cc b/src/ray/core_worker/object_interface.cc index c966192610c7..0b94c9d4a747 100644 --- a/src/ray/core_worker/object_interface.cc +++ b/src/ray/core_worker/object_interface.cc @@ -1,7 +1,7 @@ #include "object_interface.h" #include "context.h" #include "core_worker.h" -#include "ray/ray_config.h" +#include "ray/common/ray_config.h" namespace ray {