From 6a5eeec86b23e0f16ff542948d3a802dd0b7b1da Mon Sep 17 00:00:00 2001
From: Robert Nishihara <robertnishihara@gmail.com>
Date: Wed, 6 Apr 2016 22:06:53 -0700
Subject: [PATCH] fix naming Pull -> Request

---
 protos/orchestra.proto | 8 ++++----
 src/scheduler.cc       | 2 +-
 src/scheduler.h        | 2 +-
 src/worker.cc          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/protos/orchestra.proto b/protos/orchestra.proto
index 959eddb22..6eb7d90c0 100644
--- a/protos/orchestra.proto
+++ b/protos/orchestra.proto
@@ -32,7 +32,7 @@ service Scheduler {
   // Request an object reference for an object that will be pushed to an object store
   rpc PushObj(PushObjRequest) returns (PushObjReply);
   // Request delivery of an object from an object store that holds the object to the local object store
-  rpc PullObj(PullObjRequest) returns (AckReply); // TODO(pcm): rename to RequestObj and change documentation
+  rpc RequestObj(RequestObjRequest) returns (AckReply);
   // Used by an object store to tell the scheduler that an object is ready (i.e. has been finalized and can be shared)
   rpc ObjReady(ObjReadyRequest) returns (AckReply);
   // Used by the worker to report back and ask for more work
@@ -75,9 +75,9 @@ message RemoteCallReply {
   repeated uint64 result = 1; // Object references of the function return values
 }
 
-message PullObjRequest {
-  uint64 workerid = 1; // Worker that tries to pull the object
-  uint64 objref = 2; // Object reference of the object being pulled
+message RequestObjRequest {
+  uint64 workerid = 1; // Worker that tries to request the object
+  uint64 objref = 2; // Object reference of the object being requested
 }
 
 message PushObjRequest {
diff --git a/src/scheduler.cc b/src/scheduler.cc
index ec235b1ef..aca637400 100644
--- a/src/scheduler.cc
+++ b/src/scheduler.cc
@@ -38,7 +38,7 @@ Status SchedulerService::PushObj(ServerContext* context, const PushObjRequest* r
   return Status::OK;
 }
 
-Status SchedulerService::PullObj(ServerContext* context, const PullObjRequest* request, AckReply* reply) {
+Status SchedulerService::RequestObj(ServerContext* context, const RequestObjRequest* request, AckReply* reply) {
   objtable_lock_.lock();
   size_t size = objtable_.size();
   objtable_lock_.unlock();
diff --git a/src/scheduler.h b/src/scheduler.h
index afe6ccb0c..ec677e8f4 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -39,7 +39,7 @@ class SchedulerService : public Scheduler::Service {
 public:
   Status RemoteCall(ServerContext* context, const RemoteCallRequest* request, RemoteCallReply* reply) override;
   Status PushObj(ServerContext* context, const PushObjRequest* request, PushObjReply* reply) override;
-  Status PullObj(ServerContext* context, const PullObjRequest* request, AckReply* reply) override;
+  Status RequestObj(ServerContext* context, const RequestObjRequest* request, AckReply* reply) override;
   Status RegisterObjStore(ServerContext* context, const RegisterObjStoreRequest* request, RegisterObjStoreReply* reply) override;
   Status RegisterWorker(ServerContext* context, const RegisterWorkerRequest* request, RegisterWorkerReply* reply) override;
   Status RegisterFunction(ServerContext* context, const RegisterFunctionRequest* request, AckReply* reply) override;
diff --git a/src/worker.cc b/src/worker.cc
index d1575048d..9b0ba87a0 100644
--- a/src/worker.cc
+++ b/src/worker.cc
@@ -37,12 +37,12 @@ void Worker::register_worker(const std::string& worker_address, const std::strin
 }
 
 void Worker::request_object(ObjRef objref) {
-  PullObjRequest request;
+  RequestObjRequest request;
   request.set_workerid(workerid_);
   request.set_objref(objref);
   AckReply reply;
   ClientContext context;
-  Status status = scheduler_stub_->PullObj(&context, request, &reply);
+  Status status = scheduler_stub_->RequestObj(&context, request, &reply);
   return;
 }