You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/01/31 03:36:14 UTC
[arrow] branch master updated: ARROW-2042: [Plasma] Revert API
change of plasma::Create to output a MutableBuffer
This is an automated email from the ASF dual-hosted git repository.
wesm 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 0d6817a ARROW-2042: [Plasma] Revert API change of plasma::Create to output a MutableBuffer
0d6817a is described below
commit 0d6817a05e1316c60dbdaa055c18fabf30240a5e
Author: Philipp Moritz <pc...@gmail.com>
AuthorDate: Tue Jan 30 22:36:10 2018 -0500
ARROW-2042: [Plasma] Revert API change of plasma::Create to output a MutableBuffer
This reverts a part of the changes from https://github.com/apache/arrow/pull/1479. This is needed for https://github.com/apache/arrow/pull/1445 so we can return a CudaBuffer from plasma::Create.
Author: Philipp Moritz <pc...@gmail.com>
Closes #1520 from pcmoritz/revert-mutable-buffer and squashes the following commits:
0d36c734 [Philipp Moritz] fix plasma python bindings
259127d5 [Philipp Moritz] revert plasma::Create API back to Buffer
---
cpp/src/plasma/client.cc | 4 +++-
cpp/src/plasma/client.h | 3 +--
cpp/src/plasma/test/client_tests.cc | 14 +++++++-------
python/pyarrow/plasma.pyx | 4 ++--
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/cpp/src/plasma/client.cc b/cpp/src/plasma/client.cc
index a683da0..6e9b696 100644
--- a/cpp/src/plasma/client.cc
+++ b/cpp/src/plasma/client.cc
@@ -54,6 +54,8 @@
namespace plasma {
+using arrow::MutableBuffer;
+
// Number of threads used for memcopy and hash computations.
constexpr int64_t kThreadPoolSize = 8;
constexpr int64_t kBytesInMB = 1 << 20;
@@ -147,7 +149,7 @@ void PlasmaClient::increment_object_count(const ObjectID& object_id, PlasmaObjec
Status PlasmaClient::Create(const ObjectID& object_id, int64_t data_size,
uint8_t* metadata, int64_t metadata_size,
- std::shared_ptr<MutableBuffer>* data) {
+ std::shared_ptr<Buffer>* data) {
ARROW_LOG(DEBUG) << "called plasma_create on conn " << store_conn_ << " with size "
<< data_size << " and metadata size " << metadata_size;
RETURN_NOT_OK(SendCreateRequest(store_conn_, object_id, data_size, metadata_size));
diff --git a/cpp/src/plasma/client.h b/cpp/src/plasma/client.h
index a1e10a9..d6372f4 100644
--- a/cpp/src/plasma/client.h
+++ b/cpp/src/plasma/client.h
@@ -32,7 +32,6 @@
#include "plasma/common.h"
using arrow::Buffer;
-using arrow::MutableBuffer;
using arrow::Status;
namespace plasma {
@@ -116,7 +115,7 @@ class ARROW_EXPORT PlasmaClient {
/// will be written here.
/// \return The return status.
Status Create(const ObjectID& object_id, int64_t data_size, uint8_t* metadata,
- int64_t metadata_size, std::shared_ptr<MutableBuffer>* data);
+ int64_t metadata_size, std::shared_ptr<Buffer>* data);
/// Get some objects from the Plasma Store. This function will block until the
/// objects have all been created and sealed in the Plasma Store or the
/// timeout
diff --git a/cpp/src/plasma/test/client_tests.cc b/cpp/src/plasma/test/client_tests.cc
index 63b5693..f19c2bf 100644
--- a/cpp/src/plasma/test/client_tests.cc
+++ b/cpp/src/plasma/test/client_tests.cc
@@ -70,7 +70,7 @@ TEST_F(TestPlasmaStore, DeleteTest) {
int64_t data_size = 100;
uint8_t metadata[] = {5};
int64_t metadata_size = sizeof(metadata);
- std::shared_ptr<MutableBuffer> data;
+ std::shared_ptr<Buffer> data;
ARROW_CHECK_OK(client_.Create(object_id, data_size, metadata, metadata_size, &data));
ARROW_CHECK_OK(client_.Seal(object_id));
@@ -96,7 +96,7 @@ TEST_F(TestPlasmaStore, ContainsTest) {
int64_t data_size = 100;
uint8_t metadata[] = {5};
int64_t metadata_size = sizeof(metadata);
- std::shared_ptr<MutableBuffer> data;
+ std::shared_ptr<Buffer> data;
ARROW_CHECK_OK(client_.Create(object_id, data_size, metadata, metadata_size, &data));
ARROW_CHECK_OK(client_.Seal(object_id));
// Avoid race condition of Plasma Manager waiting for notification.
@@ -119,7 +119,7 @@ TEST_F(TestPlasmaStore, GetTest) {
int64_t data_size = 4;
uint8_t metadata[] = {5};
int64_t metadata_size = sizeof(metadata);
- std::shared_ptr<MutableBuffer> data_buffer;
+ std::shared_ptr<Buffer> data_buffer;
uint8_t* data;
ARROW_CHECK_OK(
client_.Create(object_id, data_size, metadata, metadata_size, &data_buffer));
@@ -145,7 +145,7 @@ TEST_F(TestPlasmaStore, MultipleGetTest) {
int64_t data_size = 4;
uint8_t metadata[] = {5};
int64_t metadata_size = sizeof(metadata);
- std::shared_ptr<MutableBuffer> data;
+ std::shared_ptr<Buffer> data;
ARROW_CHECK_OK(client_.Create(object_id1, data_size, metadata, metadata_size, &data));
data->mutable_data()[0] = 1;
ARROW_CHECK_OK(client_.Seal(object_id1));
@@ -172,7 +172,7 @@ TEST_F(TestPlasmaStore, AbortTest) {
int64_t data_size = 4;
uint8_t metadata[] = {5};
int64_t metadata_size = sizeof(metadata);
- std::shared_ptr<MutableBuffer> data;
+ std::shared_ptr<Buffer> data;
uint8_t* data_ptr;
ARROW_CHECK_OK(client_.Create(object_id, data_size, metadata, metadata_size, &data));
data_ptr = data->mutable_data();
@@ -220,7 +220,7 @@ TEST_F(TestPlasmaStore, MultipleClientTest) {
int64_t data_size = 100;
uint8_t metadata[] = {5};
int64_t metadata_size = sizeof(metadata);
- std::shared_ptr<MutableBuffer> data;
+ std::shared_ptr<Buffer> data;
ARROW_CHECK_OK(client2_.Create(object_id, data_size, metadata, metadata_size, &data));
ARROW_CHECK_OK(client2_.Seal(object_id));
// Test that the first client can get the object.
@@ -260,7 +260,7 @@ TEST_F(TestPlasmaStore, ManyObjectTest) {
int64_t data_size = 100;
uint8_t metadata[] = {5};
int64_t metadata_size = sizeof(metadata);
- std::shared_ptr<MutableBuffer> data;
+ std::shared_ptr<Buffer> data;
ARROW_CHECK_OK(client_.Create(object_id, data_size, metadata, metadata_size, &data));
if (i % 3 == 0) {
diff --git a/python/pyarrow/plasma.pyx b/python/pyarrow/plasma.pyx
index 801d094..32f6d18 100644
--- a/python/pyarrow/plasma.pyx
+++ b/python/pyarrow/plasma.pyx
@@ -81,7 +81,7 @@ cdef extern from "plasma/client.h" nogil:
CStatus Create(const CUniqueID& object_id, int64_t data_size,
const uint8_t* metadata, int64_t metadata_size,
- const shared_ptr[CMutableBuffer]* data)
+ const shared_ptr[CBuffer]* data)
CStatus Get(const CUniqueID* object_ids, int64_t num_objects,
int64_t timeout_ms, CObjectBuffer* object_buffers)
@@ -297,7 +297,7 @@ cdef class PlasmaClient:
not be created because the plasma store is unable to evict
enough objects to create room for it.
"""
- cdef shared_ptr[CMutableBuffer] data
+ cdef shared_ptr[CBuffer] data
with nogil:
check_status(self.client.get().Create(object_id.data, data_size,
<uint8_t*>(metadata.data()),
--
To stop receiving notification emails like this one, please contact
wesm@apache.org.