From 0bb922c29f23ef7ea029d28c099ad53edc66d3f7 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Fri, 25 Oct 2019 23:02:21 -0700 Subject: [PATCH] Revert "Use plasma with batched CreateAndSeal implemented (#5864)" (#6022) This reverts commit 875c84ed634c1beb45d39a8c0c80cb7d968f577d. --- bazel/BUILD.plasma | 24 +++++++++--------------- bazel/ray_deps_setup.bzl | 2 +- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/bazel/BUILD.plasma b/bazel/BUILD.plasma index a8a7441e0..d3a9c86f4 100644 --- a/bazel/BUILD.plasma +++ b/bazel/BUILD.plasma @@ -9,23 +9,19 @@ cc_library( "cpp/src/arrow/io/interfaces.cc", "cpp/src/arrow/memory_pool.cc", "cpp/src/arrow/status.cc", - "cpp/src/arrow/util/io_util.cc", + "cpp/src/arrow/util/io-util.cc", "cpp/src/arrow/util/logging.cc", "cpp/src/arrow/util/memory.cc", - "cpp/src/arrow/util/string.cc", "cpp/src/arrow/util/string_builder.cc", - "cpp/src/arrow/util/thread_pool.cc", + "cpp/src/arrow/util/thread-pool.cc", ], hdrs = [ "cpp/src/arrow/buffer.h", - "cpp/src/arrow/io/concurrency.h", "cpp/src/arrow/io/interfaces.h", - "cpp/src/arrow/io/util_internal.h", "cpp/src/arrow/memory_pool.h", "cpp/src/arrow/status.h", - "cpp/src/arrow/util/bit_util.h", - "cpp/src/arrow/util/checked_cast.h", - "cpp/src/arrow/util/io_util.h", + "cpp/src/arrow/util/bit-util.h", + "cpp/src/arrow/util/io-util.h", "cpp/src/arrow/util/logging.h", "cpp/src/arrow/util/macros.h", "cpp/src/arrow/util/memory.h", @@ -33,14 +29,12 @@ cc_library( "cpp/src/arrow/util/string.h", "cpp/src/arrow/util/string_builder.h", "cpp/src/arrow/util/string_view.h", - "cpp/src/arrow/util/thread_pool.h", + "cpp/src/arrow/util/thread-pool.h", "cpp/src/arrow/util/type_traits.h", "cpp/src/arrow/util/ubsan.h", "cpp/src/arrow/util/visibility.h", "cpp/src/arrow/util/windows_compatibility.h", "cpp/src/arrow/vendored/string_view.hpp", - "cpp/src/arrow/vendored/xxhash.h", - "cpp/src/arrow/vendored/xxhash/xxh3.h", "cpp/src/arrow/vendored/xxhash/xxhash.c", "cpp/src/arrow/vendored/xxhash/xxhash.h", ], @@ -182,17 +176,17 @@ FLATC_ARGS = [ flatbuffer_cc_library( name = "common_fbs", - srcs = ["cpp/src/plasma/common.fbs"], + srcs = ["cpp/src/plasma/format/common.fbs"], flatc_args = FLATC_ARGS, out_prefix = "cpp/src/plasma/", ) flatbuffer_cc_library( name = "plasma_fbs", - srcs = ["cpp/src/plasma/plasma.fbs"], + srcs = ["cpp/src/plasma/format/plasma.fbs"], flatc_args = FLATC_ARGS, - includes = ["cpp/src/plasma/common.fbs"], + includes = ["cpp/src/plasma/format/common.fbs"], out_prefix = "cpp/src/plasma/", ) -exports_files(["cpp/src/plasma/common.fbs"]) +exports_files(["cpp/src/plasma/format/common.fbs"]) diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl index 9ab8fee62..d0740b0e7 100644 --- a/bazel/ray_deps_setup.bzl +++ b/bazel/ray_deps_setup.bzl @@ -74,7 +74,7 @@ def ray_deps_setup(): new_git_repository( name = "plasma", build_file = "@//bazel:BUILD.plasma", - commit = "0aad5a08e539a7b7f4abd4ee57e08fe78957d412", + commit = "141a213a54f4979ab0b94b94928739359a2ee9ad", remote = "https://github.com/apache/arrow", )