Update arrow to include apache/arrow#3392 (#3765)

* update arrow to include apache/arrow#3392 * add appropriate includes * update
ray-project · Jan 14, 2019 · 02bdaf2 · 02bdaf2
1 parent 3cf5985
commit 02bdaf2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/cmake/Modules/ArrowExternalProject.cmake b/cmake/Modules/ArrowExternalProject.cmake
@@ -15,17 +15,17 @@
 #  - PLASMA_SHARED_LIB
 
 set(arrow_URL https://github.com/ray-project/arrow.git)
-# This commit is based on https://github.com/apache/arrow/pull/3197. We
+# This commit is based on https://github.com/apache/arrow/pull/3392. We
 # include the link here to make it easier to find the right commit because
 # Arrow often rewrites git history and invalidates certain commits.
 # It has been patched to fix an upstream symbol clash with TensorFlow,
 # the patch is available at
-# https://github.com/ray-project/arrow/commit/c347cd571e51723fc8512922f1b3a8e45e45b169
+# https://github.com/ray-project/arrow/commit/f8c990e4165012123e03d822c95526eaea5cbfab
 # See the discussion in https://github.com/apache/arrow/pull/3177
 # WARNING: If the arrow version is updated, you need to also update the
 # SETUPTOOLS_SCM_PRETEND_VERSION version string in the ThirdpartyToolchain.cmake
 # file
-set(arrow_TAG c347cd571e51723fc8512922f1b3a8e45e45b169)
+set(arrow_TAG f8c990e4165012123e03d822c95526eaea5cbfab)
 
 set(ARROW_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/arrow-install)
 set(ARROW_HOME ${ARROW_INSTALL_PREFIX})

diff --git a/cmake/Modules/ThirdpartyToolchain.cmake b/cmake/Modules/ThirdpartyToolchain.cmake
@@ -118,7 +118,7 @@ if ("${CMAKE_RAY_LANG_PYTHON}" STREQUAL "YES")
 
     # PYARROW_PARALLEL= , so it will add -j to pyarrow build
     set(pyarrow_ENV
-      "SETUPTOOLS_SCM_PRETEND_VERSION=0.11.1-RAY"
+      "SETUPTOOLS_SCM_PRETEND_VERSION=0.12.0-RAY"
       "PKG_CONFIG_PATH=${ARROW_LIBRARY_DIR}/pkgconfig"
       "PYARROW_WITH_PLASMA=1"
       "PYARROW_WITH_TENSORFLOW=1"

diff --git a/src/ray/object_manager/object_buffer_pool.cc b/src/ray/object_manager/object_buffer_pool.cc
@@ -1,5 +1,7 @@
 #include "ray/object_manager/object_buffer_pool.h"
 
+#include "arrow/util/logging.h"
+
 namespace ray {
 
 ObjectBufferPool::ObjectBufferPool(const std::string &store_socket_name,

diff --git a/src/ray/object_manager/object_store_notification_manager.cc b/src/ray/object_manager/object_store_notification_manager.cc
@@ -5,8 +5,9 @@
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 
-#include "ray/common/common_protocol.h"
+#include "arrow/util/logging.h"
 
+#include "ray/common/common_protocol.h"
 #include "ray/object_manager/object_store_notification_manager.h"
 #include "ray/util/util.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
@@ -5,6 +5,8 @@
 
 #include "gtest/gtest.h"
 
+#include "arrow/util/logging.h"
+
 #include "ray/object_manager/object_manager.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
@@ -3,6 +3,8 @@
 
 #include "gtest/gtest.h"
 
+#include "arrow/util/logging.h"
+
 #include "ray/object_manager/object_manager.h"
 
 namespace ray {

diff --git a/src/ray/raylet/node_manager.cc b/src/ray/raylet/node_manager.cc
@@ -2,6 +2,8 @@
 
 #include <fstream>
 
+#include "arrow/util/logging.h"
+
 #include "ray/common/common_protocol.h"
 #include "ray/id.h"
 #include "ray/raylet/format/node_manager_generated.h"

diff --git a/src/ray/raylet/object_manager_integration_test.cc b/src/ray/raylet/object_manager_integration_test.cc
@@ -3,6 +3,8 @@
 
 #include "gtest/gtest.h"
 
+#include "arrow/util/logging.h"
+
 #include "ray/raylet/raylet.h"
 
 namespace ray {