From 44b4394afa4cdd59ad39f332f07ad2b3ae8048da Mon Sep 17 00:00:00 2001 From: Edward Oakes Date: Tue, 25 Feb 2020 16:42:20 -0800 Subject: [PATCH] Remove unused AddContainedObjectIDs (#7323) --- python/ray/_raylet.pyx | 9 --------- python/ray/includes/libcoreworker.pxd | 3 --- src/ray/core_worker/core_worker.cc | 5 ----- src/ray/core_worker/core_worker.h | 8 -------- 4 files changed, 25 deletions(-) diff --git a/python/ray/_raylet.pyx b/python/ray/_raylet.pyx index 300286729..9daa00060 100644 --- a/python/ray/_raylet.pyx +++ b/python/ray/_raylet.pyx @@ -1006,15 +1006,6 @@ cdef class CoreWorker: c_owner_id, c_owner_address) - def add_contained_object_ids( - self, ObjectID object_id, contained_object_ids): - cdef: - CObjectID c_object_id = object_id.native() - c_vector[CObjectID] c_contained_ids - c_contained_ids = ObjectIDsToVector(contained_object_ids) - self.core_worker.get().AddContainedObjectIDs( - c_object_id, c_contained_ids) - # TODO: handle noreturn better cdef store_task_outputs( self, worker, outputs, const c_vector[CObjectID] return_ids, diff --git a/python/ray/includes/libcoreworker.pxd b/python/ray/includes/libcoreworker.pxd index 2e1a16a7c..579008e9b 100644 --- a/python/ray/includes/libcoreworker.pxd +++ b/python/ray/includes/libcoreworker.pxd @@ -149,9 +149,6 @@ cdef extern from "ray/core_worker/core_worker.h" nogil: const CObjectID &outer_object_id, const CTaskID &owner_id, const CAddress &owner_address) - void AddContainedObjectIDs( - const CObjectID &object_id, - const c_vector[CObjectID] &contained_object_ids) CRayStatus SetClientOptions(c_string client_name, int64_t limit) CRayStatus Put(const CRayObject &object, diff --git a/src/ray/core_worker/core_worker.cc b/src/ray/core_worker/core_worker.cc index ec41da335..08e3dd46d 100644 --- a/src/ray/core_worker/core_worker.cc +++ b/src/ray/core_worker/core_worker.cc @@ -378,11 +378,6 @@ void CoreWorker::RegisterOwnershipInfoAndResolveFuture( future_resolver_->ResolveFutureAsync(object_id, owner_id, owner_address); } -void CoreWorker::AddContainedObjectIDs( - const ObjectID &object_id, const std::vector &contained_object_ids) { - // TODO(edoakes,swang): integrate with the reference counting logic. -} - Status CoreWorker::SetClientOptions(std::string name, int64_t limit_bytes) { // Currently only the Plasma store supports client options. return plasma_store_provider_->SetClientOptions(name, limit_bytes); diff --git a/src/ray/core_worker/core_worker.h b/src/ray/core_worker/core_worker.h index 811c64b2a..203ebd2ce 100644 --- a/src/ray/core_worker/core_worker.h +++ b/src/ray/core_worker/core_worker.h @@ -169,14 +169,6 @@ class CoreWorker : public rpc::CoreWorkerServiceHandler { const TaskID &owner_id, const rpc::Address &owner_address); - /// Add metadata about the object IDs contained within another object ID. - /// This should be called during deserialization of the outer object ID. - /// - /// \param[in] object_id The object containing IDs. - /// \param[in] contained_object_ids The IDs contained in the object. - void AddContainedObjectIDs(const ObjectID &object_id, - const std::vector &contained_object_ids); - /// /// Public methods related to storing and retrieving objects. ///