wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-08-01 12:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update arrow and parquet-cpp. (#1875)

Browse Source 
* Update arrow.

* Fix bug.

* Cherry-pick commit for fixing parquet segfault.

* Update arrow and revert auto-releasing buffer commit.

* Remove parquet cherry-pick.
This commit is contained in:
Robert Nishihara
2018-04-12 16:17:12 -07:00
committed by Philipp Moritz
parent 39cf6ff6e1
commit d0fffec2d0
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/object_manager/object_manager.cc
+3 -3
View File
@@ -300,7 +300,7 @@ ray::Status ObjectManager::SendObjectHeaders(const ObjectID &object_id_const,
plasma::ObjectID plasma_id = object_id.to_plasma_id();
std::shared_ptr<plasma::PlasmaClient> store_client = store_pool_.GetObjectStore();
ARROW_CHECK_OK(store_client->Get(&plasma_id, 1, 0, &object_buffer));
if (object_buffer.data_size == -1) {
if (object_buffer.data == nullptr) {
RAY_LOG(ERROR) << "Failed to get object";
// If the object wasn't locally available, exit immediately. If the object
// later appears locally, the requesting plasma manager should request the
@@ -311,12 +311,12 @@ ray::Status ObjectManager::SendObjectHeaders(const ObjectID &object_id_const,
"Unable to transfer object to requesting plasma manager, object not local.");
}
RAY_CHECK(object_buffer.metadata->data() ==
object_buffer.data->data() + object_buffer.data_size);
object_buffer.data->data() + object_buffer.data->size());
TransferQueue::SendContext context;
context.client_id = conn->GetClientID();
context.object_id = object_id;
context.object_size = static_cast<uint64_t>(object_buffer.data_size);
context.object_size = static_cast<uint64_t>(object_buffer.data->size());
context.data = const_cast<uint8_t *>(object_buffer.data->data());
UniqueID context_id = transfer_queue_.AddContext(context);
src/ray/object_manager/test/object_manager_stress_test.cc
+2 -2
View File
@@ -286,8 +286,8 @@ class StressTestObjectManager : public TestObjectManagerBase {
plasma::ObjectBuffer object_buffer_2 = GetObject(client1, object_id_1);
uint8_t *data_1 = const_cast<uint8_t *>(object_buffer_1.data->data());
uint8_t *data_2 = const_cast<uint8_t *>(object_buffer_2.data->data());
ASSERT_EQ(object_buffer_1.data_size, object_buffer_2.data_size);
for (int i = -1; ++i < object_buffer_1.data_size;) {
ASSERT_EQ(object_buffer_1.data->size(), object_buffer_2.data->size());
for (int i = -1; ++i < object_buffer_1.data->size();) {
ASSERT_TRUE(data_1[i] == data_2[i]);
}
}