Skip to content

Commit f48d26d

Browse files
sunsetxhsunsetxh
committed
rename gcs_callback_types.h to grpc_callback_types.h
Signed-off-by: yuchao-wang <wyc984872769@hotmail.com>
1 parent 1364a14 commit f48d26d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+367
-366
lines changed

‎src/mock/ray/gcs/store_client/in_memory_store_client.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class MockInMemoryStoreClient : public InMemoryStoreClient {
3030
AsyncGet,
3131
(const std::string &table_name,
3232
const std::string &key,
33-
ToPostable<OptionalItemCallback<std::string>> callback),
33+
ToPostable<rpc::OptionalItemCallback<std::string>> callback),
3434
(override));
3535

3636
MOCK_METHOD(void,

‎src/mock/ray/gcs/store_client/redis_store_client.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MockStoreClient : public StoreClient {
2929
AsyncGet,
3030
(const std::string &table_name,
3131
const std::string &key,
32-
ToPostable<OptionalItemCallback<std::string>> callback),
32+
ToPostable<rpc::OptionalItemCallback<std::string>> callback),
3333
(override));
3434
MOCK_METHOD(void,
3535
AsyncGetAll,

‎src/mock/ray/gcs/store_client/store_client.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MockStoreClient : public StoreClient {
2929
AsyncGet,
3030
(const std::string &table_name,
3131
const std::string &key,
32-
ToPostable<OptionalItemCallback<std::string>> callback),
32+
ToPostable<rpc::OptionalItemCallback<std::string>> callback),
3333
(override));
3434
MOCK_METHOD(void,
3535
AsyncGetAll,

‎src/mock/ray/gcs_client/accessor.h‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,30 @@ class MockJobInfoAccessor : public JobInfoAccessor {
2323
MOCK_METHOD(void,
2424
AsyncAdd,
2525
(const std::shared_ptr<rpc::JobTableData> &data_ptr,
26-
const StatusCallback &callback),
26+
const rpc::StatusCallback &callback),
2727
(override));
2828
MOCK_METHOD(void,
2929
AsyncMarkFinished,
30-
(const JobID &job_id, const StatusCallback &callback),
30+
(const JobID &job_id, const rpc::StatusCallback &callback),
3131
(override));
3232
MOCK_METHOD(void,
3333
AsyncSubscribeAll,
34-
((const SubscribeCallback<JobID, rpc::JobTableData> &subscribe),
35-
const StatusCallback &done),
34+
((const rpc::SubscribeCallback<JobID, rpc::JobTableData> &subscribe),
35+
const rpc::StatusCallback &done),
3636
(override));
3737
MOCK_METHOD(void,
3838
AsyncGetAll,
3939
(const std::optional<std::string> &job_or_submission_id,
4040
bool skip_submission_job_info_field,
4141
bool skip_is_running_tasks_field,
42-
const MultiItemCallback<rpc::JobTableData> &callback,
42+
const rpc::MultiItemCallback<rpc::JobTableData> &callback,
4343
int64_t timeout_ms),
4444
(override));
4545
MOCK_METHOD(void, AsyncResubscribe, (), (override));
46-
MOCK_METHOD(void, AsyncGetNextJobID, (const ItemCallback<JobID> &callback), (override));
46+
MOCK_METHOD(void,
47+
AsyncGetNextJobID,
48+
(const rpc::ItemCallback<JobID> &callback),
49+
(override));
4750
};
4851

4952
} // namespace gcs
@@ -56,40 +59,40 @@ class MockNodeInfoAccessor : public NodeInfoAccessor {
5659
public:
5760
MOCK_METHOD(void,
5861
RegisterSelf,
59-
(rpc::GcsNodeInfo && local_node_info, const StatusCallback &callback),
62+
(rpc::GcsNodeInfo && local_node_info, const rpc::StatusCallback &callback),
6063
(override));
6164
MOCK_METHOD(void,
6265
AsyncRegister,
63-
(const rpc::GcsNodeInfo &node_info, const StatusCallback &callback),
66+
(const rpc::GcsNodeInfo &node_info, const rpc::StatusCallback &callback),
6467
(override));
6568
MOCK_METHOD(void,
6669
AsyncCheckAlive,
6770
(const std::vector<NodeID> &node_ids,
6871
int64_t timeout_ms,
69-
const MultiItemCallback<bool> &callback),
72+
const rpc::MultiItemCallback<bool> &callback),
7073
(override));
7174
MOCK_METHOD(void,
7275
AsyncGetAll,
73-
(const MultiItemCallback<rpc::GcsNodeInfo> &callback,
76+
(const rpc::MultiItemCallback<rpc::GcsNodeInfo> &callback,
7477
int64_t timeout_ms,
7578
const std::vector<NodeID> &node_ids),
7679
(override));
7780
MOCK_METHOD(void,
7881
AsyncGetAllNodeAddressAndLiveness,
79-
(const MultiItemCallback<rpc::GcsNodeAddressAndLiveness> &callback,
82+
(const rpc::MultiItemCallback<rpc::GcsNodeAddressAndLiveness> &callback,
8083
int64_t timeout_ms,
8184
const std::vector<NodeID> &node_ids),
8285
(override));
8386
MOCK_METHOD(void,
8487
AsyncSubscribeToNodeChange,
8588
(std::function<void(NodeID, const rpc::GcsNodeInfo &)> subscribe,
86-
StatusCallback done),
89+
rpc::StatusCallback done),
8790
(override));
8891
MOCK_METHOD(
8992
void,
9093
AsyncSubscribeToNodeAddressAndLivenessChange,
9194
(std::function<void(NodeID, const rpc::GcsNodeAddressAndLiveness &)> subscribe,
92-
StatusCallback done),
95+
rpc::StatusCallback done),
9396
(override));
9497
MOCK_METHOD(const rpc::GcsNodeInfo *,
9598
Get,
@@ -127,11 +130,11 @@ class MockNodeResourceInfoAccessor : public NodeResourceInfoAccessor {
127130
public:
128131
MOCK_METHOD(void,
129132
AsyncGetAllAvailableResources,
130-
(const MultiItemCallback<rpc::AvailableResources> &callback),
133+
(const rpc::MultiItemCallback<rpc::AvailableResources> &callback),
131134
(override));
132135
MOCK_METHOD(void,
133136
AsyncGetAllResourceUsage,
134-
(const ItemCallback<rpc::ResourceUsageBatchData> &callback),
137+
(const rpc::ItemCallback<rpc::ResourceUsageBatchData> &callback),
135138
(override));
136139
};
137140

@@ -156,7 +159,8 @@ class MockTaskInfoAccessor : public TaskInfoAccessor {
156159
public:
157160
MOCK_METHOD(void,
158161
AsyncAddTaskEventData,
159-
(std::unique_ptr<rpc::TaskEventData> data_ptr, StatusCallback callback),
162+
(std::unique_ptr<rpc::TaskEventData> data_ptr,
163+
rpc::StatusCallback callback),
160164
(override));
161165
};
162166

@@ -170,27 +174,27 @@ class MockWorkerInfoAccessor : public WorkerInfoAccessor {
170174
public:
171175
MOCK_METHOD(void,
172176
AsyncSubscribeToWorkerFailures,
173-
(const ItemCallback<rpc::WorkerDeltaData> &subscribe,
174-
const StatusCallback &done),
177+
(const rpc::ItemCallback<rpc::WorkerDeltaData> &subscribe,
178+
const rpc::StatusCallback &done),
175179
(override));
176180
MOCK_METHOD(void,
177181
AsyncReportWorkerFailure,
178182
(const std::shared_ptr<rpc::WorkerTableData> &data_ptr,
179-
const StatusCallback &callback),
183+
const rpc::StatusCallback &callback),
180184
(override));
181185
MOCK_METHOD(void,
182186
AsyncGet,
183187
(const WorkerID &worker_id,
184-
const OptionalItemCallback<rpc::WorkerTableData> &callback),
188+
const rpc::OptionalItemCallback<rpc::WorkerTableData> &callback),
185189
(override));
186190
MOCK_METHOD(void,
187191
AsyncGetAll,
188-
(const MultiItemCallback<rpc::WorkerTableData> &callback),
192+
(const rpc::MultiItemCallback<rpc::WorkerTableData> &callback),
189193
(override));
190194
MOCK_METHOD(void,
191195
AsyncAdd,
192196
(const std::shared_ptr<rpc::WorkerTableData> &data_ptr,
193-
const StatusCallback &callback),
197+
const rpc::StatusCallback &callback),
194198
(override));
195199
MOCK_METHOD(void, AsyncResubscribe, (), (override));
196200
};
@@ -210,18 +214,18 @@ class MockPlacementGroupInfoAccessor : public PlacementGroupInfoAccessor {
210214
MOCK_METHOD(void,
211215
AsyncGet,
212216
(const PlacementGroupID &placement_group_id,
213-
const OptionalItemCallback<rpc::PlacementGroupTableData> &callback),
217+
const rpc::OptionalItemCallback<rpc::PlacementGroupTableData> &callback),
214218
(override));
215219
MOCK_METHOD(void,
216220
AsyncGetByName,
217221
(const std::string &placement_group_name,
218222
const std::string &ray_namespace,
219-
const OptionalItemCallback<rpc::PlacementGroupTableData> &callback,
223+
const rpc::OptionalItemCallback<rpc::PlacementGroupTableData> &callback,
220224
int64_t timeout_ms),
221225
(override));
222226
MOCK_METHOD(void,
223227
AsyncGetAll,
224-
(const MultiItemCallback<rpc::PlacementGroupTableData> &callback),
228+
(const rpc::MultiItemCallback<rpc::PlacementGroupTableData> &callback),
225229
(override));
226230
MOCK_METHOD(Status,
227231
SyncRemovePlacementGroup,
@@ -246,14 +250,14 @@ class MockInternalKVAccessor : public InternalKVAccessor {
246250
(const std::string &ns,
247251
const std::string &prefix,
248252
const int64_t timeout_ms,
249-
const OptionalItemCallback<std::vector<std::string>> &callback),
253+
const rpc::OptionalItemCallback<std::vector<std::string>> &callback),
250254
(override));
251255
MOCK_METHOD(void,
252256
AsyncInternalKVGet,
253257
(const std::string &ns,
254258
const std::string &key,
255259
const int64_t timeout_ms,
256-
const OptionalItemCallback<std::string> &callback),
260+
const rpc::OptionalItemCallback<std::string> &callback),
257261
(override));
258262
MOCK_METHOD(void,
259263
AsyncInternalKVPut,
@@ -262,26 +266,26 @@ class MockInternalKVAccessor : public InternalKVAccessor {
262266
const std::string &value,
263267
bool overwrite,
264268
const int64_t timeout_ms,
265-
const OptionalItemCallback<bool> &callback),
269+
const rpc::OptionalItemCallback<bool> &callback),
266270
(override));
267271
MOCK_METHOD(void,
268272
AsyncInternalKVExists,
269273
(const std::string &ns,
270274
const std::string &key,
271275
const int64_t timeout_ms,
272-
const OptionalItemCallback<bool> &callback),
276+
const rpc::OptionalItemCallback<bool> &callback),
273277
(override));
274278
MOCK_METHOD(void,
275279
AsyncInternalKVDel,
276280
(const std::string &ns,
277281
const std::string &key,
278282
bool del_by_prefix,
279283
const int64_t timeout_ms,
280-
const OptionalItemCallback<int> &callback),
284+
const rpc::OptionalItemCallback<int> &callback),
281285
(override));
282286
MOCK_METHOD(void,
283287
AsyncGetInternalConfig,
284-
(const OptionalItemCallback<std::string> &callback),
288+
(const rpc::OptionalItemCallback<std::string> &callback),
285289
(override));
286290
};
287291

‎src/mock/ray/gcs_client/accessors/actor_info_accessor.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ class FakeActorInfoAccessor : public gcs::ActorInfoAccessorInterface {
3232

3333
// Stub implementations for interface methods not used by this test
3434
void AsyncGet(const ActorID &,
35-
const gcs::OptionalItemCallback<rpc::ActorTableData> &) override {}
35+
const rpc::OptionalItemCallback<rpc::ActorTableData> &) override {}
3636
void AsyncGetAllByFilter(const std::optional<ActorID> &,
3737
const std::optional<JobID> &,
3838
const std::optional<std::string> &,
39-
const gcs::MultiItemCallback<rpc::ActorTableData> &,
39+
const rpc::MultiItemCallback<rpc::ActorTableData> &,
4040
int64_t = -1) override {}
4141
void AsyncGetByName(const std::string &,
4242
const std::string &,
43-
const gcs::OptionalItemCallback<rpc::ActorTableData> &,
43+
const rpc::OptionalItemCallback<rpc::ActorTableData> &,
4444
int64_t = -1) override {}
4545
Status SyncGetByName(const std::string &,
4646
const std::string &,
@@ -56,20 +56,20 @@ class FakeActorInfoAccessor : public gcs::ActorInfoAccessorInterface {
5656
}
5757
void AsyncReportActorOutOfScope(const ActorID &,
5858
uint64_t,
59-
const gcs::StatusCallback &,
59+
const rpc::StatusCallback &,
6060
int64_t = -1) override {}
6161
void AsyncRegisterActor(const TaskSpecification &task_spec,
62-
const gcs::StatusCallback &callback,
62+
const rpc::StatusCallback &callback,
6363
int64_t = -1) override {
6464
async_register_actor_callback_ = callback;
6565
}
6666
void AsyncRestartActorForLineageReconstruction(const ActorID &,
6767
uint64_t,
68-
const gcs::StatusCallback &,
68+
const rpc::StatusCallback &,
6969
int64_t = -1) override {}
7070
Status SyncRegisterActor(const TaskSpecification &) override { return Status::OK(); }
7171
void AsyncKillActor(
72-
const ActorID &, bool, bool, const gcs::StatusCallback &, int64_t = -1) override {}
72+
const ActorID &, bool, bool, const rpc::StatusCallback &, int64_t = -1) override {}
7373
void AsyncCreateActor(
7474
const TaskSpecification &task_spec,
7575
const rpc::ClientCallback<rpc::CreateActorReply> &callback) override {
@@ -78,8 +78,8 @@ class FakeActorInfoAccessor : public gcs::ActorInfoAccessorInterface {
7878

7979
void AsyncSubscribe(
8080
const ActorID &actor_id,
81-
const gcs::SubscribeCallback<ActorID, rpc::ActorTableData> &subscribe,
82-
const gcs::StatusCallback &done) override {
81+
const rpc::SubscribeCallback<ActorID, rpc::ActorTableData> &subscribe,
82+
const rpc::StatusCallback &done) override {
8383
auto callback_entry = std::make_pair(actor_id, subscribe);
8484
callback_map_.emplace(actor_id, subscribe);
8585
subscribe_finished_callback_map_[actor_id] = done;
@@ -124,14 +124,14 @@ class FakeActorInfoAccessor : public gcs::ActorInfoAccessorInterface {
124124
return true;
125125
}
126126

127-
absl::flat_hash_map<ActorID, gcs::SubscribeCallback<ActorID, rpc::ActorTableData>>
127+
absl::flat_hash_map<ActorID, rpc::SubscribeCallback<ActorID, rpc::ActorTableData>>
128128
callback_map_;
129-
absl::flat_hash_map<ActorID, gcs::StatusCallback> subscribe_finished_callback_map_;
129+
absl::flat_hash_map<ActorID, rpc::StatusCallback> subscribe_finished_callback_map_;
130130
absl::flat_hash_map<ActorID, uint32_t> actor_subscribed_times_;
131131

132132
// Callbacks for AsyncCreateActor and AsyncRegisterActor
133133
rpc::ClientCallback<rpc::CreateActorReply> async_create_actor_callback_;
134-
gcs::StatusCallback async_register_actor_callback_;
134+
rpc::StatusCallback async_register_actor_callback_;
135135
};
136136

137137
} // namespace gcs

‎src/ray/common/BUILD.bazel‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -388,14 +388,6 @@ ray_cc_library(
388388
],
389389
)
390390

391-
ray_cc_library(
392-
name = "gcs_callback_types",
393-
hdrs = ["gcs_callback_types.h"],
394-
deps = [
395-
"//src/ray/common:status",
396-
],
397-
)
398-
399391
ray_cc_library(
400392
name = "metrics",
401393
hdrs = ["metrics.h"],

‎src/ray/common/gcs_callback_types.h‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)