Synchronize arrow version and put changes upstream (#4385)

This commit is contained in:
Philipp Moritz 2019-03-27 22:37:07 -07:00 committed by Robert Nishihara
parent a22bf1e511
commit 1bcb0b94cc
3 changed files with 6 additions and 12 deletions

View file

@ -49,7 +49,7 @@ new_git_repository(
new_git_repository(
name = "plasma",
build_file = "@//bazel:BUILD.plasma",
commit = "9c33e1aee98f96a82c6a0b6bb214df172a143fb1",
commit = "d00497b38be84fd77c40cbf77f3422f2a81c44f9",
remote = "https://github.com/apache/arrow",
)

View file

@ -148,6 +148,7 @@ cc_library(
"cpp/src/plasma/eviction_policy.cc",
"cpp/src/plasma/external_store.cc",
"cpp/src/plasma/plasma_allocator.cc",
"cpp/src/plasma/thirdparty/ae/ae.c",
],
hdrs = [
"cpp/src/plasma/events.h",
@ -170,16 +171,9 @@ cc_library(
cc_binary(
name = "plasma_store_server",
srcs = glob(
[
"cpp/src/plasma/store.cc",
"cpp/src/plasma/thirdparty/ae/ae.c",
],
exclude = [
"cpp/src/plasma/dlmalloc.cc",
"cpp/src/plasma/events.cc",
],
),
srcs = [
"cpp/src/plasma/store.cc",
],
visibility = ["//visibility:public"],
deps = [":plasma_lib"],
)

View file

@ -120,7 +120,7 @@ else
# the commit listed in the command.
$PYTHON_EXECUTABLE -m pip install \
--target=$ROOT_DIR/python/ray/pyarrow_files pyarrow==0.12.0.RAY \
--find-links https://s3-us-west-2.amazonaws.com/arrow-wheels/9357dc130789ee42f8181d8724bee1d5d1509060/index.html
--find-links https://s3-us-west-2.amazonaws.com/arrow-wheels/ca1fa51f0901f5a4298f0e4faea00f24e5dd7bb7/index.html
export PYTHON_BIN_PATH="$PYTHON_EXECUTABLE"
if [ "$RAY_BUILD_JAVA" == "YES" ]; then