From 1bcb0b94cc1d589a93eaedcb3059d6cde27c96c0 Mon Sep 17 00:00:00 2001
From: Philipp Moritz <pcmoritz@gmail.com>
Date: Wed, 27 Mar 2019 22:37:07 -0700
Subject: [PATCH] Synchronize arrow version and put changes upstream (#4385)

---
 WORKSPACE          |  2 +-
 bazel/BUILD.plasma | 14 ++++----------
 build.sh           |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 79adb90f1..a2a5c191e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -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",
 )
 
diff --git a/bazel/BUILD.plasma b/bazel/BUILD.plasma
index e0afd8580..45dd170b2 100644
--- a/bazel/BUILD.plasma
+++ b/bazel/BUILD.plasma
@@ -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"],
 )
diff --git a/build.sh b/build.sh
index a67170722..c3b96ec5a 100755
--- a/build.sh
+++ b/build.sh
@@ -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