[core] Move plasma store under object_manager (#8832)

* move plasma under object directory * update include paths * cleanup * disable lint of third-party libraries * lint
2026-07-17 11:32:33 +08:00 · 2020-06-08 18:21:41 -07:00
parent 5e2bd6ecb9
commit c1e6813cea
59 changed files with 166 additions and 171 deletions
@@ -269,26 +269,26 @@ PLASMA_LINKOPTS = [] + select({
 cc_library(
    name = "plasma_client",
    srcs = [
-        "src/ray/plasma/client.cc",
-        "src/ray/plasma/common.cc",
-        "src/ray/plasma/fling.cc",
-        "src/ray/plasma/io.cc",
-        "src/ray/plasma/malloc.cc",
-        "src/ray/plasma/plasma.cc",
-        "src/ray/plasma/protocol.cc",
+        "src/ray/object_manager/plasma/client.cc",
+        "src/ray/object_manager/plasma/common.cc",
+        "src/ray/object_manager/plasma/fling.cc",
+        "src/ray/object_manager/plasma/io.cc",
+        "src/ray/object_manager/plasma/malloc.cc",
+        "src/ray/object_manager/plasma/plasma.cc",
+        "src/ray/object_manager/plasma/protocol.cc",
    ],
    hdrs = [
-        "src/ray/plasma/client.h",
-        "src/ray/plasma/common.h",
-        "src/ray/plasma/common_generated.h",
-        "src/ray/plasma/compat.h",
-        "src/ray/plasma/external_store.h",
-        "src/ray/plasma/fling.h",
-        "src/ray/plasma/io.h",
-        "src/ray/plasma/malloc.h",
-        "src/ray/plasma/plasma.h",
-        "src/ray/plasma/plasma_generated.h",
-        "src/ray/plasma/protocol.h",
+        "src/ray/object_manager/plasma/client.h",
+        "src/ray/object_manager/plasma/common.h",
+        "src/ray/object_manager/plasma/common_generated.h",
+        "src/ray/object_manager/plasma/compat.h",
+        "src/ray/object_manager/plasma/external_store.h",
+        "src/ray/object_manager/plasma/fling.h",
+        "src/ray/object_manager/plasma/io.h",
+        "src/ray/object_manager/plasma/malloc.h",
+        "src/ray/object_manager/plasma/plasma.h",
+        "src/ray/object_manager/plasma/plasma_generated.h",
+        "src/ray/object_manager/plasma/protocol.h",
    ],
    copts = PLASMA_COPTS,
    defines = select({
@@ -296,7 +296,7 @@ cc_library(
        "//conditions:default": [],
    }),
    linkopts = PLASMA_LINKOPTS,
-    strip_include_prefix = "src/ray",
+    strip_include_prefix = "src",
    deps = [
        ":common_fbs",
        ":plasma_fbs",
@@ -309,15 +309,13 @@ cc_library(
 cc_binary(
    name = "libplasma_java.so",
    srcs = [
-        "src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc",
-        "src/ray/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h",
+        "src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc",
+        "src/ray/object_manager/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h",
        ":jni.h",
        ":jni_md.h",
    ],
    copts = PLASMA_COPTS,
-    includes = [
-        "src/ray",
-    ],
+    includes = ["src/ray/object_manager/plasma/lib/java"],
    linkshared = 1,
    linkstatic = 1,
    deps = [":plasma_client"],
@@ -352,22 +350,19 @@ genrule(
 cc_library(
    name = "ae",
    srcs = [
-        "src/ray/plasma/thirdparty/ae/ae.c",
+        "src/ray/thirdparty/ae/ae.c",
    ],
    hdrs = [
-        "src/ray/plasma/thirdparty/ae/ae.h",
-        "src/ray/plasma/thirdparty/ae/ae_epoll.c",
-        "src/ray/plasma/thirdparty/ae/ae_evport.c",
-        "src/ray/plasma/thirdparty/ae/ae_kqueue.c",
-        "src/ray/plasma/thirdparty/ae/ae_select.c",
-        "src/ray/plasma/thirdparty/ae/config.h",
-        "src/ray/plasma/thirdparty/ae/zmalloc.h",
+        "src/ray/thirdparty/ae/ae.h",
+        "src/ray/thirdparty/ae/ae_epoll.c",
+        "src/ray/thirdparty/ae/ae_evport.c",
+        "src/ray/thirdparty/ae/ae_kqueue.c",
+        "src/ray/thirdparty/ae/ae_select.c",
+        "src/ray/thirdparty/ae/config.h",
+        "src/ray/thirdparty/ae/zmalloc.h",
    ],
    copts = PLASMA_COPTS,
-    includes = [
-        "src/ray/plasma/thirdparty/ae",
-    ],
-    strip_include_prefix = "src/ray",
+    strip_include_prefix = "src",
    deps = [
        ":platform_shims",
    ],
@@ -376,26 +371,26 @@ cc_library(
 cc_library(
    name = "plasma_store_server_lib",
    srcs = [
-        "src/ray/plasma/dlmalloc.cc",
-        "src/ray/plasma/events.cc",
-        "src/ray/plasma/eviction_policy.cc",
-        "src/ray/plasma/external_store.cc",
-        "src/ray/plasma/plasma_allocator.cc",
-        "src/ray/plasma/quota_aware_policy.cc",
-        "src/ray/plasma/store.cc",
+        "src/ray/object_manager/plasma/dlmalloc.cc",
+        "src/ray/object_manager/plasma/events.cc",
+        "src/ray/object_manager/plasma/eviction_policy.cc",
+        "src/ray/object_manager/plasma/external_store.cc",
+        "src/ray/object_manager/plasma/plasma_allocator.cc",
+        "src/ray/object_manager/plasma/quota_aware_policy.cc",
+        "src/ray/object_manager/plasma/store.cc",
    ],
    hdrs = [
-        "src/ray/plasma/events.h",
-        "src/ray/plasma/eviction_policy.h",
-        "src/ray/plasma/external_store.h",
-        "src/ray/plasma/plasma_allocator.h",
-        "src/ray/plasma/quota_aware_policy.h",
-        "src/ray/plasma/store.h",
-        "src/ray/plasma/thirdparty/dlmalloc.c",
+        "src/ray/object_manager/plasma/events.h",
+        "src/ray/object_manager/plasma/eviction_policy.h",
+        "src/ray/object_manager/plasma/external_store.h",
+        "src/ray/object_manager/plasma/plasma_allocator.h",
+        "src/ray/object_manager/plasma/quota_aware_policy.h",
+        "src/ray/object_manager/plasma/store.h",
+        "src/ray/thirdparty/dlmalloc.c",
    ],
    copts = PLASMA_COPTS,
    linkopts = PLASMA_LINKOPTS,
-    strip_include_prefix = "src/ray",
+    strip_include_prefix = "src",
    deps = [
        ":ae",
        ":plasma_client",
@@ -425,17 +420,17 @@ FLATC_ARGS = [

 flatbuffer_cc_library(
    name = "common_fbs",
-    srcs = ["src/ray/plasma/common.fbs"],
+    srcs = ["src/ray/object_manager/plasma/common.fbs"],
    flatc_args = FLATC_ARGS,
-    out_prefix = "src/ray/plasma/",
+    out_prefix = "src/ray/object_manager/plasma/",
 )

 flatbuffer_cc_library(
    name = "plasma_fbs",
-    srcs = ["src/ray/plasma/plasma.fbs"],
+    srcs = ["src/ray/object_manager/plasma/plasma.fbs"],
    flatc_args = FLATC_ARGS,
-    includes = ["src/ray/plasma/common.fbs"],
-    out_prefix = "src/ray/plasma/",
+    includes = ["src/ray/object_manager/plasma/common.fbs"],
+    out_prefix = "src/ray/object_manager/plasma/",
 )

 # === End of plasma definitions ===
@@ -17,8 +17,9 @@

 #include <cstdint>
 #include <cstdio>
-#include "plasma/client.h"
+
 #include "ray/common/status.h"
+#include "ray/object_manager/plasma/client.h"

 namespace arrow {
 class Buffer;
@@ -25,8 +25,8 @@
 #include <random>
 #include <string>

-#include "plasma/common.h"
 #include "ray/common/constants.h"
+#include "ray/object_manager/plasma/common.h"
 #include "ray/util/logging.h"
 #include "ray/util/util.h"
 #include "ray/util/visibility.h"
@@ -17,12 +17,12 @@

 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
-#include "plasma/client.h"
 #include "ray/common/buffer.h"
 #include "ray/common/id.h"
 #include "ray/common/status.h"
 #include "ray/core_worker/common.h"
 #include "ray/core_worker/context.h"
+#include "ray/object_manager/plasma/client.h"
 #include "ray/raylet/raylet_client.h"

 namespace ray {
@@ -24,10 +24,11 @@
 #include <boost/asio/error.hpp>
 #include <boost/bind.hpp>

-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"

 #include "ray/common/id.h"
 #include "ray/common/status.h"
+#include "ray/object_manager/plasma/client.h"

 namespace ray {

@@ -21,12 +21,11 @@
 #include <unordered_set>
 #include <vector>

-#include "plasma/client.h"
-
 #include "ray/common/id.h"
 #include "ray/common/status.h"
 #include "ray/gcs/redis_gcs_client.h"
 #include "ray/object_manager/format/object_manager_generated.h"
+#include "ray/object_manager/plasma/client.h"

 namespace ray {

@@ -29,16 +29,14 @@
 #include <boost/bind.hpp>

 #include "absl/time/clock.h"
-#include "plasma/client.h"
-
 #include "ray/common/id.h"
 #include "ray/common/ray_config.h"
 #include "ray/common/status.h"
-
 #include "ray/object_manager/format/object_manager_generated.h"
 #include "ray/object_manager/object_buffer_pool.h"
 #include "ray/object_manager/object_directory.h"
 #include "ray/object_manager/object_store_notification_manager.h"
+#include "ray/object_manager/plasma/client.h"
 #include "ray/rpc/object_manager/object_manager_client.h"
 #include "ray/rpc/object_manager/object_manager_server.h"

@@ -23,13 +23,13 @@
 #include <boost/asio/error.hpp>
 #include <boost/bind.hpp>

-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"

 #include "ray/common/client_connection.h"
 #include "ray/common/id.h"
 #include "ray/common/status.h"
-
 #include "ray/object_manager/object_directory.h"
+#include "ray/object_manager/plasma/client.h"

 namespace ray {

@@ -17,7 +17,7 @@

 // PLASMA CLIENT: Client library for using the plasma store and manager

-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"

 #include <fcntl.h>
 #include <netinet/in.h>
@@ -49,12 +49,12 @@
 #include "arrow/buffer.h"
 #include "arrow/util/thread_pool.h"

-#include "plasma/common.h"
-#include "plasma/fling.h"
-#include "plasma/io.h"
-#include "plasma/malloc.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/fling.h"
+#include "ray/object_manager/plasma/io.h"
+#include "ray/object_manager/plasma/malloc.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"

 #ifdef PLASMA_CUDA
 #include "arrow/gpu/cuda_api.h"
@@ -27,7 +27,7 @@
 #include "arrow/status.h"
 #include "arrow/util/macros.h"
 #include "arrow/util/visibility.h"
-#include "plasma/common.h"
+#include "ray/object_manager/plasma/common.h"

 using arrow::Buffer;
 using arrow::Status;
@@ -15,14 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/common.h"
+#include "ray/object_manager/plasma/common.h"

 #include <limits>
 #include <utility>

 #include "arrow/util/ubsan.h"

-#include "plasma/plasma_generated.h"
+#include "ray/object_manager/plasma/plasma_generated.h"

 namespace fb = plasma::flatbuf;

@@ -20,17 +20,11 @@

 #include <stddef.h>

-#include <cstring>
 #include <memory>
 #include <string>
-// TODO(pcm): Convert getopt and sscanf in the store to use more idiomatic C++
-// and get rid of the next three lines:
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
 #include <unordered_map>

-#include "plasma/compat.h"
+#include "ray/object_manager/plasma/compat.h"

 #include "arrow/status.h"
 #ifdef PLASMA_CUDA
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/malloc.h"
+#include "ray/object_manager/plasma/malloc.h"

 #include <assert.h>
 #include <stddef.h>
@@ -32,8 +32,8 @@
 #include <string>
 #include <vector>

-#include "plasma/common.h"
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma.h"

 namespace plasma {

@@ -49,7 +49,7 @@ int fake_munmap(void*, int64_t);
 #define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T
 #define DEFAULT_GRANULARITY ((size_t)128U * 1024U)

-#include "plasma/thirdparty/dlmalloc.c"  // NOLINT
+#include "ray/thirdparty/dlmalloc.c"  // NOLINT

 #undef MMAP
 #undef MUNMAP
@@ -15,14 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/events.h"
+#include "ray/object_manager/plasma/events.h"

 #include <utility>

 #include <errno.h>

 extern "C" {
-#include "plasma/thirdparty/ae/ae.h"
+#include "ray/thirdparty/ae/ae.h"
 }

 namespace plasma {
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/eviction_policy.h"
-#include "plasma/plasma_allocator.h"
+#include "ray/object_manager/plasma/eviction_policy.h"
+#include "ray/object_manager/plasma/plasma_allocator.h"

 #include <algorithm>
 #include <sstream>
@@ -25,8 +25,8 @@
 #include <utility>
 #include <vector>

-#include "plasma/common.h"
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma.h"

 namespace plasma {

@@ -20,7 +20,7 @@

 #include "arrow/util/memory.h"

-#include "plasma/external_store.h"
+#include "ray/object_manager/plasma/external_store.h"

 namespace plasma {

@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <vector>

-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"

 namespace plasma {

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "plasma/fling.h"
+#include "ray/object_manager/plasma/fling.h"

 #include <string.h>

@@ -20,7 +20,7 @@

 #include "arrow/util/logging.h"

-#include "plasma/hash_table_store.h"
+#include "ray/object_manager/plasma/hash_table_store.h"

 namespace plasma {

@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <vector>

-#include "plasma/external_store.h"
+#include "ray/object_manager/plasma/external_store.h"

 namespace plasma {

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/io.h"
+#include "ray/object_manager/plasma/io.h"

 #include <cstdint>
 #include <memory>
@@ -24,8 +24,8 @@
 #include "arrow/status.h"
 #include "arrow/util/logging.h"

-#include "plasma/common.h"
-#include "plasma/plasma_generated.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma_generated.h"
 #ifndef _WIN32
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -28,8 +28,8 @@
 #include <vector>

 #include "arrow/status.h"
-#include "plasma/common.h"
-#include "plasma/compat.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/compat.h"

 namespace plasma {

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.h"
+#include "org_apache_arrow_plasma_PlasmaClientJNI.h"

 #include <pthread.h>
 #include <stdlib.h>
@@ -30,7 +30,7 @@

 #include "arrow/util/logging.h"

-#include "plasma/client.h"
+#include "ray/object_manager/plasma/client.h"

 constexpr jsize OBJECT_ID_SIZE = sizeof(plasma::ObjectID) / sizeof(jbyte);

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/malloc.h"
+#include "ray/object_manager/plasma/malloc.h"

 #include <assert.h>
 #include <stddef.h>
@@ -27,8 +27,8 @@
 #include <string>
 #include <vector>

-#include "plasma/common.h"
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma.h"

 namespace plasma {

@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/plasma.h"

 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>

-#include "plasma/common.h"
-#include "plasma/common_generated.h"
-#include "plasma/protocol.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/common_generated.h"
+#include "ray/object_manager/plasma/protocol.h"

 namespace fb = plasma::flatbuf;

@@ -32,12 +32,12 @@
 #include <unordered_set>
 #include <vector>

-#include "plasma/compat.h"
+#include "ray/object_manager/plasma/compat.h"

 #include "arrow/status.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/macros.h"
-#include "plasma/common.h"
+#include "ray/object_manager/plasma/common.h"

 #ifdef PLASMA_CUDA
 using arrow::cuda::CudaIpcMemHandle;
@@ -17,8 +17,8 @@

 #include <arrow/util/logging.h>

-#include "plasma/malloc.h"
-#include "plasma/plasma_allocator.h"
+#include "ray/object_manager/plasma/malloc.h"
+#include "ray/object_manager/plasma/plasma_allocator.h"

 namespace plasma {

@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/protocol.h"
+#include "ray/object_manager/plasma/protocol.h"

 #include <utility>

 #include "flatbuffers/flatbuffers.h"

-#include "plasma/common.h"
-#include "plasma/io.h"
-#include "plasma/plasma_generated.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/io.h"
+#include "ray/object_manager/plasma/plasma_generated.h"

 #ifdef PLASMA_CUDA
 #include "arrow/gpu/cuda_api.h"
@@ -24,8 +24,8 @@
 #include <vector>

 #include "arrow/status.h"
-#include "plasma/plasma.h"
-#include "plasma/plasma_generated.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/plasma_generated.h"

 namespace plasma {

@@ -15,9 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.

-#include "plasma/quota_aware_policy.h"
-#include "plasma/common.h"
-#include "plasma/plasma_allocator.h"
+#include "ray/object_manager/plasma/quota_aware_policy.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma_allocator.h"

 #include <algorithm>
 #include <memory>
@@ -26,9 +26,9 @@
 #include <utility>
 #include <vector>

-#include "plasma/common.h"
-#include "plasma/eviction_policy.h"
-#include "plasma/plasma.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/eviction_policy.h"
+#include "ray/object_manager/plasma/plasma.h"

 namespace plasma {

@@ -26,7 +26,7 @@
 // It keeps a hash table that maps object_ids (which are 20 byte long,
 // just enough to store and SHA1 hash) to memory mapped files.

-#include "plasma/store.h"
+#include "ray/object_manager/plasma/store.h"

 #include <assert.h>
 #include <fcntl.h>
@@ -50,13 +50,13 @@

 #include "arrow/status.h"

-#include "plasma/common.h"
-#include "plasma/common_generated.h"
-#include "plasma/fling.h"
-#include "plasma/io.h"
-#include "plasma/malloc.h"
-#include "plasma/plasma_allocator.h"
-#include "plasma/protocol.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/common_generated.h"
+#include "ray/object_manager/plasma/fling.h"
+#include "ray/object_manager/plasma/io.h"
+#include "ray/object_manager/plasma/malloc.h"
+#include "ray/object_manager/plasma/plasma_allocator.h"
+#include "ray/object_manager/plasma/protocol.h"

 #ifdef PLASMA_CUDA
 #include "arrow/gpu/cuda_api.h"
@@ -25,12 +25,12 @@
 #include <unordered_set>
 #include <vector>

-#include "plasma/common.h"
-#include "plasma/events.h"
-#include "plasma/external_store.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
-#include "plasma/quota_aware_policy.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/events.h"
+#include "ray/object_manager/plasma/external_store.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
+#include "ray/object_manager/plasma/quota_aware_policy.h"

 namespace arrow {
 class Status;
@@ -30,11 +30,11 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/io_util.h"

-#include "plasma/client.h"
-#include "plasma/common.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
-#include "plasma/test_util.h"
+#include "ray/object_manager/plasma/client.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
+#include "ray/object_manager/plasma/test_util.h"

 namespace plasma {

@@ -30,12 +30,12 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/io_util.h"

-#include "plasma/client.h"
-#include "plasma/common.h"
-#include "plasma/external_store.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
-#include "plasma/test_util.h"
+#include "ray/object_manager/plasma/client.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/external_store.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
+#include "ray/object_manager/plasma/test_util.h"

 namespace plasma {

@@ -25,11 +25,11 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/io_util.h"

-#include "plasma/common.h"
-#include "plasma/io.h"
-#include "plasma/plasma.h"
-#include "plasma/protocol.h"
-#include "plasma/test_util.h"
+#include "ray/object_manager/plasma/common.h"
+#include "ray/object_manager/plasma/io.h"
+#include "ray/object_manager/plasma/plasma.h"
+#include "ray/object_manager/plasma/protocol.h"
+#include "ray/object_manager/plasma/test_util.h"

 namespace fb = plasma::flatbuf;

@@ -22,7 +22,7 @@
 #include <limits>
 #include <random>

-#include "plasma/common.h"
+#include "ray/object_manager/plasma/common.h"

 namespace plasma {

@@ -1,8 +1,14 @@
-#include "plasma/store.h"
 #include <getopt.h>
 #include <stdio.h>

-int main(int argc, char* argv[]) {
+#include "ray/object_manager/plasma/store.h"
+// TODO(pcm): Convert getopt and sscanf in the store to use more idiomatic C++
+// and get rid of the next three lines:
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+
+int main(int argc, char *argv[]) {
  std::string socket_name;
  // Directory where plasma memory mapped files are stored.
  std::string plasma_directory;
@@ -35,8 +41,8 @@ int main(int argc, char* argv[]) {
    }
  }

-  plasma::PlasmaStoreRunner runner(
-    socket_name, system_memory, hugepages_enabled, plasma_directory, external_store_endpoint);
+  plasma::PlasmaStoreRunner runner(socket_name, system_memory, hugepages_enabled,
+                                   plasma_directory, external_store_endpoint);
  runner.Start();
  return 0;
 }
@@ -0,0 +1 @@
+DisableFormat: true
@@ -40,22 +40,22 @@
 #include <time.h>
 #include <errno.h>

-#include "plasma/thirdparty/ae/ae.h"
-#include "plasma/thirdparty/ae/zmalloc.h"
-#include "plasma/thirdparty/ae/config.h"
+#include "ray/thirdparty/ae/ae.h"
+#include "ray/thirdparty/ae/zmalloc.h"
+#include "ray/thirdparty/ae/config.h"

 /* Include the best multiplexing layer supported by this system.
 * The following should be ordered by performances, descending. */
 #ifdef HAVE_EVPORT
-#include "plasma/thirdparty/ae/ae_evport.c"
+#include "ray/thirdparty/ae/ae_evport.c"
 #else
    #ifdef HAVE_EPOLL
-    #include "plasma/thirdparty/ae/ae_epoll.c"
+    #include "ray/thirdparty/ae/ae_epoll.c"
    #else
        #ifdef HAVE_KQUEUE
-        #include "plasma/thirdparty/ae/ae_kqueue.c"
+        #include "ray/thirdparty/ae/ae_kqueue.c"
        #else
-        #include "plasma/thirdparty/ae/ae_select.c"
+        #include "ray/thirdparty/ae/ae_select.c"
        #endif
    #endif
 #endif