Skip to content

Commit 04821bd

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

Some content is hidden

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

41 files changed

+273
-310
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: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@ class MockActorInfoAccessor : public ActorInfoAccessor {
2323
MOCK_METHOD(void,
2424
AsyncGet,
2525
(const ActorID &actor_id,
26-
const OptionalItemCallback<rpc::ActorTableData> &callback),
26+
const rpc::OptionalItemCallback<rpc::ActorTableData> &callback),
2727
(override));
2828
MOCK_METHOD(void,
2929
AsyncGetAllByFilter,
3030
(const std::optional<ActorID> &actor_id,
3131
const std::optional<JobID> &job_id,
3232
const std::optional<std::string> &actor_state_name,
33-
const MultiItemCallback<rpc::ActorTableData> &callback,
33+
const rpc::MultiItemCallback<rpc::ActorTableData> &callback,
3434
int64_t timeout_ms),
3535
(override));
3636
MOCK_METHOD(void,
3737
AsyncGetByName,
3838
(const std::string &name,
3939
const std::string &ray_namespace,
40-
const OptionalItemCallback<rpc::ActorTableData> &callback,
40+
const rpc::OptionalItemCallback<rpc::ActorTableData> &callback,
4141
int64_t timeout_ms),
4242
(override));
4343
MOCK_METHOD(void,
4444
AsyncRegisterActor,
4545
(const TaskSpecification &task_spec,
46-
const StatusCallback &callback,
46+
const rpc::StatusCallback &callback,
4747
int64_t timeout_ms),
4848
(override));
4949
MOCK_METHOD(Status,
@@ -55,7 +55,7 @@ class MockActorInfoAccessor : public ActorInfoAccessor {
5555
(const ActorID &actor_id,
5656
bool force_kill,
5757
bool no_restart,
58-
const StatusCallback &callback,
58+
const rpc::StatusCallback &callback,
5959
int64_t timeout_ms),
6060
(override));
6161
MOCK_METHOD(void,
@@ -66,8 +66,8 @@ class MockActorInfoAccessor : public ActorInfoAccessor {
6666
MOCK_METHOD(void,
6767
AsyncSubscribe,
6868
(const ActorID &actor_id,
69-
(const SubscribeCallback<ActorID, rpc::ActorTableData> &subscribe),
70-
const StatusCallback &done),
69+
(const rpc::SubscribeCallback<ActorID, rpc::ActorTableData> &subscribe),
70+
const rpc::StatusCallback &done),
7171
(override));
7272
MOCK_METHOD(void, AsyncUnsubscribe, (const ActorID &actor_id), (override));
7373
MOCK_METHOD(void, AsyncResubscribe, (), (override));
@@ -85,27 +85,27 @@ class MockJobInfoAccessor : public JobInfoAccessor {
8585
MOCK_METHOD(void,
8686
AsyncAdd,
8787
(const std::shared_ptr<rpc::JobTableData> &data_ptr,
88-
const StatusCallback &callback),
88+
const rpc::StatusCallback &callback),
8989
(override));
9090
MOCK_METHOD(void,
9191
AsyncMarkFinished,
92-
(const JobID &job_id, const StatusCallback &callback),
92+
(const JobID &job_id, const rpc::StatusCallback &callback),
9393
(override));
9494
MOCK_METHOD(void,
9595
AsyncSubscribeAll,
96-
((const SubscribeCallback<JobID, rpc::JobTableData> &subscribe),
97-
const StatusCallback &done),
96+
((const rpc::SubscribeCallback<JobID, rpc::JobTableData> &subscribe),
97+
const rpc::StatusCallback &done),
9898
(override));
9999
MOCK_METHOD(void,
100100
AsyncGetAll,
101101
(const std::optional<std::string> &job_or_submission_id,
102102
bool skip_submission_job_info_field,
103103
bool skip_is_running_tasks_field,
104-
const MultiItemCallback<rpc::JobTableData> &callback,
104+
const rpc::MultiItemCallback<rpc::JobTableData> &callback,
105105
int64_t timeout_ms),
106106
(override));
107107
MOCK_METHOD(void, AsyncResubscribe, (), (override));
108-
MOCK_METHOD(void, AsyncGetNextJobID, (const ItemCallback<JobID> &callback), (override));
108+
MOCK_METHOD(void, AsyncGetNextJobID, (const rpc::ItemCallback<JobID> &callback), (override));
109109
};
110110

111111
} // namespace gcs
@@ -118,40 +118,40 @@ class MockNodeInfoAccessor : public NodeInfoAccessor {
118118
public:
119119
MOCK_METHOD(void,
120120
RegisterSelf,
121-
(rpc::GcsNodeInfo && local_node_info, const StatusCallback &callback),
121+
(rpc::GcsNodeInfo && local_node_info, const rpc::StatusCallback &callback),
122122
(override));
123123
MOCK_METHOD(void,
124124
AsyncRegister,
125-
(const rpc::GcsNodeInfo &node_info, const StatusCallback &callback),
125+
(const rpc::GcsNodeInfo &node_info, const rpc::StatusCallback &callback),
126126
(override));
127127
MOCK_METHOD(void,
128128
AsyncCheckAlive,
129129
(const std::vector<NodeID> &node_ids,
130130
int64_t timeout_ms,
131-
const MultiItemCallback<bool> &callback),
131+
const rpc::MultiItemCallback<bool> &callback),
132132
(override));
133133
MOCK_METHOD(void,
134134
AsyncGetAll,
135-
(const MultiItemCallback<rpc::GcsNodeInfo> &callback,
135+
(const rpc::MultiItemCallback<rpc::GcsNodeInfo> &callback,
136136
int64_t timeout_ms,
137137
const std::vector<NodeID> &node_ids),
138138
(override));
139139
MOCK_METHOD(void,
140140
AsyncGetAllNodeAddressAndLiveness,
141-
(const MultiItemCallback<rpc::GcsNodeAddressAndLiveness> &callback,
141+
(const rpc::MultiItemCallback<rpc::GcsNodeAddressAndLiveness> &callback,
142142
int64_t timeout_ms,
143143
const std::vector<NodeID> &node_ids),
144144
(override));
145145
MOCK_METHOD(void,
146146
AsyncSubscribeToNodeChange,
147147
(std::function<void(NodeID, const rpc::GcsNodeInfo &)> subscribe,
148-
StatusCallback done),
148+
rpc::StatusCallback done),
149149
(override));
150150
MOCK_METHOD(
151151
void,
152152
AsyncSubscribeToNodeAddressAndLivenessChange,
153153
(std::function<void(NodeID, const rpc::GcsNodeAddressAndLiveness &)> subscribe,
154-
StatusCallback done),
154+
rpc::StatusCallback done),
155155
(override));
156156
MOCK_METHOD(const rpc::GcsNodeInfo *,
157157
Get,
@@ -189,11 +189,11 @@ class MockNodeResourceInfoAccessor : public NodeResourceInfoAccessor {
189189
public:
190190
MOCK_METHOD(void,
191191
AsyncGetAllAvailableResources,
192-
(const MultiItemCallback<rpc::AvailableResources> &callback),
192+
(const rpc::MultiItemCallback<rpc::AvailableResources> &callback),
193193
(override));
194194
MOCK_METHOD(void,
195195
AsyncGetAllResourceUsage,
196-
(const ItemCallback<rpc::ResourceUsageBatchData> &callback),
196+
(const rpc::ItemCallback<rpc::ResourceUsageBatchData> &callback),
197197
(override));
198198
};
199199

@@ -218,7 +218,7 @@ class MockTaskInfoAccessor : public TaskInfoAccessor {
218218
public:
219219
MOCK_METHOD(void,
220220
AsyncAddTaskEventData,
221-
(std::unique_ptr<rpc::TaskEventData> data_ptr, StatusCallback callback),
221+
(std::unique_ptr<rpc::TaskEventData> data_ptr, rpc::StatusCallback callback),
222222
(override));
223223
};
224224

@@ -232,27 +232,27 @@ class MockWorkerInfoAccessor : public WorkerInfoAccessor {
232232
public:
233233
MOCK_METHOD(void,
234234
AsyncSubscribeToWorkerFailures,
235-
(const ItemCallback<rpc::WorkerDeltaData> &subscribe,
236-
const StatusCallback &done),
235+
(const rpc::ItemCallback<rpc::WorkerDeltaData> &subscribe,
236+
const rpc::StatusCallback &done),
237237
(override));
238238
MOCK_METHOD(void,
239239
AsyncReportWorkerFailure,
240240
(const std::shared_ptr<rpc::WorkerTableData> &data_ptr,
241-
const StatusCallback &callback),
241+
const rpc::StatusCallback &callback),
242242
(override));
243243
MOCK_METHOD(void,
244244
AsyncGet,
245245
(const WorkerID &worker_id,
246-
const OptionalItemCallback<rpc::WorkerTableData> &callback),
246+
const rpc::OptionalItemCallback<rpc::WorkerTableData> &callback),
247247
(override));
248248
MOCK_METHOD(void,
249249
AsyncGetAll,
250-
(const MultiItemCallback<rpc::WorkerTableData> &callback),
250+
(const rpc::MultiItemCallback<rpc::WorkerTableData> &callback),
251251
(override));
252252
MOCK_METHOD(void,
253253
AsyncAdd,
254254
(const std::shared_ptr<rpc::WorkerTableData> &data_ptr,
255-
const StatusCallback &callback),
255+
const rpc::StatusCallback &callback),
256256
(override));
257257
MOCK_METHOD(void, AsyncResubscribe, (), (override));
258258
};
@@ -272,18 +272,18 @@ class MockPlacementGroupInfoAccessor : public PlacementGroupInfoAccessor {
272272
MOCK_METHOD(void,
273273
AsyncGet,
274274
(const PlacementGroupID &placement_group_id,
275-
const OptionalItemCallback<rpc::PlacementGroupTableData> &callback),
275+
const rpc::OptionalItemCallback<rpc::PlacementGroupTableData> &callback),
276276
(override));
277277
MOCK_METHOD(void,
278278
AsyncGetByName,
279279
(const std::string &placement_group_name,
280280
const std::string &ray_namespace,
281-
const OptionalItemCallback<rpc::PlacementGroupTableData> &callback,
281+
const rpc::OptionalItemCallback<rpc::PlacementGroupTableData> &callback,
282282
int64_t timeout_ms),
283283
(override));
284284
MOCK_METHOD(void,
285285
AsyncGetAll,
286-
(const MultiItemCallback<rpc::PlacementGroupTableData> &callback),
286+
(const rpc::MultiItemCallback<rpc::PlacementGroupTableData> &callback),
287287
(override));
288288
MOCK_METHOD(Status,
289289
SyncRemovePlacementGroup,
@@ -308,14 +308,14 @@ class MockInternalKVAccessor : public InternalKVAccessor {
308308
(const std::string &ns,
309309
const std::string &prefix,
310310
const int64_t timeout_ms,
311-
const OptionalItemCallback<std::vector<std::string>> &callback),
311+
const rpc::OptionalItemCallback<std::vector<std::string>> &callback),
312312
(override));
313313
MOCK_METHOD(void,
314314
AsyncInternalKVGet,
315315
(const std::string &ns,
316316
const std::string &key,
317317
const int64_t timeout_ms,
318-
const OptionalItemCallback<std::string> &callback),
318+
const rpc::OptionalItemCallback<std::string> &callback),
319319
(override));
320320
MOCK_METHOD(void,
321321
AsyncInternalKVPut,
@@ -324,26 +324,26 @@ class MockInternalKVAccessor : public InternalKVAccessor {
324324
const std::string &value,
325325
bool overwrite,
326326
const int64_t timeout_ms,
327-
const OptionalItemCallback<bool> &callback),
327+
const rpc::OptionalItemCallback<bool> &callback),
328328
(override));
329329
MOCK_METHOD(void,
330330
AsyncInternalKVExists,
331331
(const std::string &ns,
332332
const std::string &key,
333333
const int64_t timeout_ms,
334-
const OptionalItemCallback<bool> &callback),
334+
const rpc::OptionalItemCallback<bool> &callback),
335335
(override));
336336
MOCK_METHOD(void,
337337
AsyncInternalKVDel,
338338
(const std::string &ns,
339339
const std::string &key,
340340
bool del_by_prefix,
341341
const int64_t timeout_ms,
342-
const OptionalItemCallback<int> &callback),
342+
const rpc::OptionalItemCallback<int> &callback),
343343
(override));
344344
MOCK_METHOD(void,
345345
AsyncGetInternalConfig,
346-
(const OptionalItemCallback<std::string> &callback),
346+
(const rpc::OptionalItemCallback<std::string> &callback),
347347
(override));
348348
};
349349

‎src/ray/common/BUILD.bazel‎

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

392-
ray_cc_library(
393-
name = "gcs_callback_types",
394-
hdrs = ["gcs_callback_types.h"],
395-
deps = [
396-
"//src/ray/common:status",
397-
],
398-
)
399-
400392
ray_cc_library(
401393
name = "metrics",
402394
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)