This is an automated email from the ASF dual-hosted git repository. robertnishihara 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 85362b3 ARROW-4249: [Plasma] Clean up client namespace 85362b3 is described below commit 85362b31a733e432dd5d88cb68418e69ac59e0f9 Author: Philipp Moritz <pcmor...@gmail.com> AuthorDate: Sun Jan 13 15:51:03 2019 -0800 ARROW-4249: [Plasma] Clean up client namespace Author: Philipp Moritz <pcmor...@gmail.com> Closes #3392 from pcmoritz/plasma-dcheck and squashes the following commits: 3b5473a <Philipp Moritz> add more includes d2a215a <Philipp Moritz> remove arrow/util/logging.h from plasma/common.h --- cpp/src/plasma/common.h | 1 - cpp/src/plasma/io.cc | 1 + cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc | 2 ++ python/pyarrow/tensorflow/plasma_op.cc | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/src/plasma/common.h b/cpp/src/plasma/common.h index 38925fe..17155b2 100644 --- a/cpp/src/plasma/common.h +++ b/cpp/src/plasma/common.h @@ -33,7 +33,6 @@ #include "plasma/compat.h" #include "arrow/status.h" -#include "arrow/util/logging.h" #ifdef PLASMA_CUDA #include "arrow/gpu/cuda_api.h" #endif diff --git a/cpp/src/plasma/io.cc b/cpp/src/plasma/io.cc index d2794e8..cc42542 100644 --- a/cpp/src/plasma/io.cc +++ b/cpp/src/plasma/io.cc @@ -22,6 +22,7 @@ #include <sstream> #include "arrow/status.h" +#include "arrow/util/logging.h" #include "plasma/common.h" #include "plasma/plasma_generated.h" diff --git a/cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc b/cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc index fa376ec..d552994 100644 --- a/cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc +++ b/cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc @@ -28,6 +28,8 @@ #include <string> #include <vector> +#include "arrow/util/logging.h" + #include "plasma/client.h" constexpr jsize OBJECT_ID_SIZE = sizeof(plasma::ObjectID) / sizeof(jbyte); diff --git a/python/pyarrow/tensorflow/plasma_op.cc b/python/pyarrow/tensorflow/plasma_op.cc index 852be33..bf4eec7 100644 --- a/python/pyarrow/tensorflow/plasma_op.cc +++ b/python/pyarrow/tensorflow/plasma_op.cc @@ -33,6 +33,7 @@ #include "arrow/adapters/tensorflow/convert.h" #include "arrow/api.h" #include "arrow/io/api.h" +#include "arrow/util/logging.h" // These headers do not include Python.h #include "arrow/python/deserialize.h"