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

Add const to to_plasma_id function to make it usable by const ObjectID (#2404)

Browse Source 
* Add const to to_plasma_id to make it usable by const ObjectID

* Separate the building script to another PR.
This commit is contained in:
Yuhong Guo
2018-07-17 02:05:29 +08:00
committed by Philipp Moritz
parent 8a3e180156
commit 206254bcf3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/id.cc
+1 -1
View File
@@ -72,7 +72,7 @@ std::string UniqueID::hex() const {
return result;
}
plasma::UniqueID UniqueID::to_plasma_id() {
plasma::UniqueID UniqueID::to_plasma_id() const {
plasma::UniqueID result;
std::memcpy(result.mutable_data(), &id_, kUniqueIDSize);
return result;
src/ray/id.h
+1 -1
View File
@@ -27,7 +27,7 @@ class RAY_EXPORT UniqueID {
size_t size() const;
std::string binary() const;
std::string hex() const;
plasma::UniqueID to_plasma_id();
plasma::UniqueID to_plasma_id() const;
private:
uint8_t id_[kUniqueIDSize];
src/ray/object_manager/object_buffer_pool.cc
+6 -6
View File
@@ -51,7 +51,7 @@ std::pair<const ObjectBufferPool::ChunkInfo &, ray::Status> ObjectBufferPool::Ge
RAY_LOG(DEBUG) << "GetChunk " << object_id << " " << data_size << " " << metadata_size;
if (get_buffer_state_.count(object_id) == 0) {
plasma::ObjectBuffer object_buffer;
plasma::ObjectID plasma_id = ObjectID(object_id).to_plasma_id();
plasma::ObjectID plasma_id = object_id.to_plasma_id();
ARROW_CHECK_OK(store_client_.Get(&plasma_id, 1, 0, &object_buffer));
if (object_buffer.data == nullptr) {
RAY_LOG(ERROR) << "Failed to get object";
@@ -81,14 +81,14 @@ void ObjectBufferPool::ReleaseGetChunk(const ObjectID &object_id, uint64_t chunk
buffer_state.references--;
RAY_LOG(DEBUG) << "ReleaseBuffer " << object_id << " " << buffer_state.references;
if (buffer_state.references == 0) {
ARROW_CHECK_OK(store_client_.Release(ObjectID(object_id).to_plasma_id()));
ARROW_CHECK_OK(store_client_.Release(object_id.to_plasma_id()));
get_buffer_state_.erase(object_id);
}
}
void ObjectBufferPool::AbortGet(const ObjectID &object_id) {
std::lock_guard<std::mutex> lock(pool_mutex_);
ARROW_CHECK_OK(store_client_.Release(ObjectID(object_id).to_plasma_id()));
ARROW_CHECK_OK(store_client_.Release(object_id.to_plasma_id()));
get_buffer_state_.erase(object_id);
}
@@ -99,7 +99,7 @@ std::pair<const ObjectBufferPool::ChunkInfo &, ray::Status> ObjectBufferPool::Cr
RAY_LOG(DEBUG) << "CreateChunk " << object_id << " " << data_size << " "
<< metadata_size;
if (create_buffer_state_.count(object_id) == 0) {
const plasma::ObjectID plasma_id = ObjectID(object_id).to_plasma_id();
const plasma::ObjectID plasma_id = object_id.to_plasma_id();
int64_t object_size = data_size - metadata_size;
// Try to create shared buffer.
std::shared_ptr<Buffer> data;
@@ -163,7 +163,7 @@ void ObjectBufferPool::SealChunk(const ObjectID &object_id, const uint64_t chunk
RAY_LOG(DEBUG) << "SealChunk" << object_id << " "
<< create_buffer_state_[object_id].num_seals_remaining;
if (create_buffer_state_[object_id].num_seals_remaining == 0) {
const plasma::ObjectID plasma_id = ObjectID(object_id).to_plasma_id();
const plasma::ObjectID plasma_id = object_id.to_plasma_id();
ARROW_CHECK_OK(store_client_.Seal(plasma_id));
ARROW_CHECK_OK(store_client_.Release(plasma_id));
create_buffer_state_.erase(object_id);
@@ -171,7 +171,7 @@ void ObjectBufferPool::SealChunk(const ObjectID &object_id, const uint64_t chunk
}
void ObjectBufferPool::AbortCreate(const ObjectID &object_id) {
const plasma::ObjectID plasma_id = ObjectID(object_id).to_plasma_id();
const plasma::ObjectID plasma_id = object_id.to_plasma_id();
ARROW_CHECK_OK(store_client_.Release(plasma_id));
ARROW_CHECK_OK(store_client_.Abort(plasma_id));
create_buffer_state_.erase(object_id);