Skip to content

Commit 87d8331

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 87d8331

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

+322
-335
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: 42 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,30 @@ 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,
109+
AsyncGetNextJobID,
110+
(const rpc::ItemCallback<JobID> &callback),
111+
(override));
109112
};
110113

111114
} // namespace gcs
@@ -118,40 +121,40 @@ class MockNodeInfoAccessor : public NodeInfoAccessor {
118121
public:
119122
MOCK_METHOD(void,
120123
RegisterSelf,
121-
(rpc::GcsNodeInfo && local_node_info, const StatusCallback &callback),
124+
(rpc::GcsNodeInfo && local_node_info, const rpc::StatusCallback &callback),
122125
(override));
123126
MOCK_METHOD(void,
124127
AsyncRegister,
125-
(const rpc::GcsNodeInfo &node_info, const StatusCallback &callback),
128+
(const rpc::GcsNodeInfo &node_info, const rpc::StatusCallback &callback),
126129
(override));
127130
MOCK_METHOD(void,
128131
AsyncCheckAlive,
129132
(const std::vector<NodeID> &node_ids,
130133
int64_t timeout_ms,
131-
const MultiItemCallback<bool> &callback),
134+
const rpc::MultiItemCallback<bool> &callback),
132135
(override));
133136
MOCK_METHOD(void,
134137
AsyncGetAll,
135-
(const MultiItemCallback<rpc::GcsNodeInfo> &callback,
138+
(const rpc::MultiItemCallback<rpc::GcsNodeInfo> &callback,
136139
int64_t timeout_ms,
137140
const std::vector<NodeID> &node_ids),
138141
(override));
139142
MOCK_METHOD(void,
140143
AsyncGetAllNodeAddressAndLiveness,
141-
(const MultiItemCallback<rpc::GcsNodeAddressAndLiveness> &callback,
144+
(const rpc::MultiItemCallback<rpc::GcsNodeAddressAndLiveness> &callback,
142145
int64_t timeout_ms,
143146
const std::vector<NodeID> &node_ids),
144147
(override));
145148
MOCK_METHOD(void,
146149
AsyncSubscribeToNodeChange,
147150
(std::function<void(NodeID, const rpc::GcsNodeInfo &)> subscribe,
148-
StatusCallback done),
151+
rpc::StatusCallback done),
149152
(override));
150153
MOCK_METHOD(
151154
void,
152155
AsyncSubscribeToNodeAddressAndLivenessChange,
153156
(std::function<void(NodeID, const rpc::GcsNodeAddressAndLiveness &)> subscribe,
154-
StatusCallback done),
157+
rpc::StatusCallback done),
155158
(override));
156159
MOCK_METHOD(const rpc::GcsNodeInfo *,
157160
Get,
@@ -189,11 +192,11 @@ class MockNodeResourceInfoAccessor : public NodeResourceInfoAccessor {
189192
public:
190193
MOCK_METHOD(void,
191194
AsyncGetAllAvailableResources,
192-
(const MultiItemCallback<rpc::AvailableResources> &callback),
195+
(const rpc::MultiItemCallback<rpc::AvailableResources> &callback),
193196
(override));
194197
MOCK_METHOD(void,
195198
AsyncGetAllResourceUsage,
196-
(const ItemCallback<rpc::ResourceUsageBatchData> &callback),
199+
(const rpc::ItemCallback<rpc::ResourceUsageBatchData> &callback),
197200
(override));
198201
};
199202

@@ -218,7 +221,8 @@ class MockTaskInfoAccessor : public TaskInfoAccessor {
218221
public:
219222
MOCK_METHOD(void,
220223
AsyncAddTaskEventData,
221-
(std::unique_ptr<rpc::TaskEventData> data_ptr, StatusCallback callback),
224+
(std::unique_ptr<rpc::TaskEventData> data_ptr,
225+
rpc::StatusCallback callback),
222226
(override));
223227
};
224228

@@ -232,27 +236,27 @@ class MockWorkerInfoAccessor : public WorkerInfoAccessor {
232236
public:
233237
MOCK_METHOD(void,
234238
AsyncSubscribeToWorkerFailures,
235-
(const ItemCallback<rpc::WorkerDeltaData> &subscribe,
236-
const StatusCallback &done),
239+
(const rpc::ItemCallback<rpc::WorkerDeltaData> &subscribe,
240+
const rpc::StatusCallback &done),
237241
(override));
238242
MOCK_METHOD(void,
239243
AsyncReportWorkerFailure,
240244
(const std::shared_ptr<rpc::WorkerTableData> &data_ptr,
241-
const StatusCallback &callback),
245+
const rpc::StatusCallback &callback),
242246
(override));
243247
MOCK_METHOD(void,
244248
AsyncGet,
245249
(const WorkerID &worker_id,
246-
const OptionalItemCallback<rpc::WorkerTableData> &callback),
250+
const rpc::OptionalItemCallback<rpc::WorkerTableData> &callback),
247251
(override));
248252
MOCK_METHOD(void,
249253
AsyncGetAll,
250-
(const MultiItemCallback<rpc::WorkerTableData> &callback),
254+
(const rpc::MultiItemCallback<rpc::WorkerTableData> &callback),
251255
(override));
252256
MOCK_METHOD(void,
253257
AsyncAdd,
254258
(const std::shared_ptr<rpc::WorkerTableData> &data_ptr,
255-
const StatusCallback &callback),
259+
const rpc::StatusCallback &callback),
256260
(override));
257261
MOCK_METHOD(void, AsyncResubscribe, (), (override));
258262
};
@@ -272,18 +276,18 @@ class MockPlacementGroupInfoAccessor : public PlacementGroupInfoAccessor {
272276
MOCK_METHOD(void,
273277
AsyncGet,
274278
(const PlacementGroupID &placement_group_id,
275-
const OptionalItemCallback<rpc::PlacementGroupTableData> &callback),
279+
const rpc::OptionalItemCallback<rpc::PlacementGroupTableData> &callback),
276280
(override));
277281
MOCK_METHOD(void,
278282
AsyncGetByName,
279283
(const std::string &placement_group_name,
280284
const std::string &ray_namespace,
281-
const OptionalItemCallback<rpc::PlacementGroupTableData> &callback,
285+
const rpc::OptionalItemCallback<rpc::PlacementGroupTableData> &callback,
282286
int64_t timeout_ms),
283287
(override));
284288
MOCK_METHOD(void,
285289
AsyncGetAll,
286-
(const MultiItemCallback<rpc::PlacementGroupTableData> &callback),
290+
(const rpc::MultiItemCallback<rpc::PlacementGroupTableData> &callback),
287291
(override));
288292
MOCK_METHOD(Status,
289293
SyncRemovePlacementGroup,
@@ -308,14 +312,14 @@ class MockInternalKVAccessor : public InternalKVAccessor {
308312
(const std::string &ns,
309313
const std::string &prefix,
310314
const int64_t timeout_ms,
311-
const OptionalItemCallback<std::vector<std::string>> &callback),
315+
const rpc::OptionalItemCallback<std::vector<std::string>> &callback),
312316
(override));
313317
MOCK_METHOD(void,
314318
AsyncInternalKVGet,
315319
(const std::string &ns,
316320
const std::string &key,
317321
const int64_t timeout_ms,
318-
const OptionalItemCallback<std::string> &callback),
322+
const rpc::OptionalItemCallback<std::string> &callback),
319323
(override));
320324
MOCK_METHOD(void,
321325
AsyncInternalKVPut,
@@ -324,26 +328,26 @@ class MockInternalKVAccessor : public InternalKVAccessor {
324328
const std::string &value,
325329
bool overwrite,
326330
const int64_t timeout_ms,
327-
const OptionalItemCallback<bool> &callback),
331+
const rpc::OptionalItemCallback<bool> &callback),
328332
(override));
329333
MOCK_METHOD(void,
330334
AsyncInternalKVExists,
331335
(const std::string &ns,
332336
const std::string &key,
333337
const int64_t timeout_ms,
334-
const OptionalItemCallback<bool> &callback),
338+
const rpc::OptionalItemCallback<bool> &callback),
335339
(override));
336340
MOCK_METHOD(void,
337341
AsyncInternalKVDel,
338342
(const std::string &ns,
339343
const std::string &key,
340344
bool del_by_prefix,
341345
const int64_t timeout_ms,
342-
const OptionalItemCallback<int> &callback),
346+
const rpc::OptionalItemCallback<int> &callback),
343347
(override));
344348
MOCK_METHOD(void,
345349
AsyncGetInternalConfig,
346-
(const OptionalItemCallback<std::string> &callback),
350+
(const rpc::OptionalItemCallback<std::string> &callback),
347351
(override));
348352
};
349353

‎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)