[arrow] branch master updated: ARROW-4319: [C++] [Plasma] plasma/store.h pulls in flatbuffer dependency

[apitrou]

This is an automated email from the ASF dual-hosted git repository.

apitrou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new b6d557d  ARROW-4319: [C++] [Plasma] plasma/store.h pulls in flatbuffer 
dependency
b6d557d is described below

commit b6d557df92b7e6ae6581dd498bbb8536b1b5e294
Author: Matthias Vallentin <vallen...@icir.org>
AuthorDate: Tue Jan 22 16:55:25 2019 +0100

    ARROW-4319: [C++] [Plasma] plasma/store.h pulls in flatbuffer dependency
    
    The plasma store header leaked the flatbuffer dependency. This PR fixes 
this by moving the corresponding header to the implementation.
    
    Author: Matthias Vallentin <vallen...@icir.org>
    
    Closes #3454 from mavam/issue/arrow-4319 and squashes the following commits:
    
    f16403ba <Matthias Vallentin> Remove flatbuffer dependency from plasma store
---
 cpp/src/plasma/plasma.cc |  1 +
 cpp/src/plasma/plasma.h  |  5 ++++-
 cpp/src/plasma/store.cc  |  3 +++
 cpp/src/plasma/store.h   | 12 ++++++++++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/cpp/src/plasma/plasma.cc b/cpp/src/plasma/plasma.cc
index 601a612..a1749d0 100644
--- a/cpp/src/plasma/plasma.cc
+++ b/cpp/src/plasma/plasma.cc
@@ -22,6 +22,7 @@
 #include <unistd.h>
 
 #include "plasma/common.h"
+#include "plasma/common_generated.h"
 #include "plasma/protocol.h"
 
 namespace fb = plasma::flatbuf;
diff --git a/cpp/src/plasma/plasma.h b/cpp/src/plasma/plasma.h
index aafe527..3d3eca1 100644
--- a/cpp/src/plasma/plasma.h
+++ b/cpp/src/plasma/plasma.h
@@ -38,7 +38,6 @@
 #include "arrow/util/logging.h"
 #include "arrow/util/macros.h"
 #include "plasma/common.h"
-#include "plasma/common_generated.h"
 
 #ifdef PLASMA_CUDA
 using arrow::cuda::CudaIpcMemHandle;
@@ -46,6 +45,10 @@ using arrow::cuda::CudaIpcMemHandle;
 
 namespace plasma {
 
+namespace flatbuf {
+struct ObjectInfoT;
+}  // namespace flatbuf
+
 #define HANDLE_SIGPIPE(s, fd_)                                              \
   do {                                                                      \
     Status _s = (s);                                                        \
diff --git a/cpp/src/plasma/store.cc b/cpp/src/plasma/store.cc
index f6326cc..ca49d01 100644
--- a/cpp/src/plasma/store.cc
+++ b/cpp/src/plasma/store.cc
@@ -52,11 +52,14 @@
 #include <utility>
 #include <vector>
 
+#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/protocol.h"
 
 #ifdef PLASMA_CUDA
 #include "arrow/gpu/cuda_api.h"
diff --git a/cpp/src/plasma/store.h b/cpp/src/plasma/store.h
index 0e0eb83..9866e74 100644
--- a/cpp/src/plasma/store.h
+++ b/cpp/src/plasma/store.h
@@ -29,10 +29,18 @@
 #include "plasma/events.h"
 #include "plasma/eviction_policy.h"
 #include "plasma/plasma.h"
-#include "plasma/protocol.h"
+
+namespace arrow {
+class Status;
+}  // namespace arrow
 
 namespace plasma {
 
+namespace flatbuf {
+struct ObjectInfoT;
+enum class PlasmaError;
+}  // namespace flatbuf
+
 using flatbuf::ObjectInfoT;
 using flatbuf::PlasmaError;
 
@@ -176,7 +184,7 @@ class PlasmaStore {
 
   NotificationMap::iterator SendNotifications(NotificationMap::iterator it);
 
-  Status ProcessMessage(Client* client);
+  arrow::Status ProcessMessage(Client* client);
 
  private:
   void PushNotification(ObjectInfoT* object_notification);