Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c41f53d

Browse files
panda-sheepCPWstaticSophie-Xie
authored
rename AdminCmd to JobType (vesoft-inc#4045)
Co-authored-by: cpw <[email protected]> Co-authored-by: Sophie <[email protected]>
1 parent b655df5 commit c41f53d

39 files changed

+294
-301
lines changed

‎src/clients/meta/MetaClient.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,10 +1149,10 @@ PartitionID MetaClient::partId(int32_t numParts, const VertexID id) const {
11491149
}
11501150

11511151
folly::Future<StatusOr<cpp2::AdminJobResult>> MetaClient::submitJob(
1152-
cpp2::AdminJobOp op, cpp2::AdminCmd cmd, std::vector<std::string> paras) {
1152+
cpp2::JobOp op, cpp2::JobType type, std::vector<std::string> paras) {
11531153
cpp2::AdminJobReq req;
11541154
req.op_ref() = op;
1155-
req.cmd_ref() = cmd;
1155+
req.type_ref() = type;
11561156
req.paras_ref() = std::move(paras);
11571157
folly::Promise<StatusOr<cpp2::AdminJobResult>> promise;
11581158
auto future = promise.getFuture();

‎src/clients/meta/MetaClient.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ class MetaClient {
252252
listener_ = nullptr;
253253
}
254254

255-
folly::Future<StatusOr<cpp2::AdminJobResult>> submitJob(cpp2::AdminJobOp op,
256-
cpp2::AdminCmd cmd,
255+
folly::Future<StatusOr<cpp2::AdminJobResult>> submitJob(cpp2::JobOp op,
256+
cpp2::JobType type,
257257
std::vector<std::string> paras);
258258

259259
// Operations for parts

‎src/graph/executor/admin/SubmitJobExecutor.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ folly::Future<Status> SubmitJobExecutor::execute() {
2020

2121
auto *sjNode = asNode<SubmitJob>(node());
2222
auto jobOp = sjNode->jobOp();
23-
auto cmd = sjNode->cmd();
23+
auto jobType = sjNode->jobType();
2424
auto params = sjNode->params();
2525

2626
return qctx()
2727
->getMetaClient()
28-
->submitJob(jobOp, cmd, params)
28+
->submitJob(jobOp, jobType, params)
2929
.via(runner())
3030
.thenValue([jobOp, this](StatusOr<meta::cpp2::AdminJobResult> &&resp) {
3131
SCOPED_TIMER(&execTime_);
@@ -40,10 +40,10 @@ folly::Future<Status> SubmitJobExecutor::execute() {
4040
});
4141
}
4242

43-
StatusOr<DataSet> SubmitJobExecutor::buildResult(meta::cpp2::AdminJobOp jobOp,
43+
StatusOr<DataSet> SubmitJobExecutor::buildResult(meta::cpp2::JobOp jobOp,
4444
meta::cpp2::AdminJobResult &&resp) {
4545
switch (jobOp) {
46-
case meta::cpp2::AdminJobOp::ADD: {
46+
case meta::cpp2::JobOp::ADD: {
4747
nebula::DataSet v({"New Job Id"});
4848
DCHECK(resp.job_id_ref().has_value());
4949
if (!resp.job_id_ref().has_value()) {
@@ -52,7 +52,7 @@ StatusOr<DataSet> SubmitJobExecutor::buildResult(meta::cpp2::AdminJobOp jobOp,
5252
v.emplace_back(nebula::Row({*resp.job_id_ref()}));
5353
return v;
5454
}
55-
case meta::cpp2::AdminJobOp::RECOVER: {
55+
case meta::cpp2::JobOp::RECOVER: {
5656
nebula::DataSet v({"Recovered job num"});
5757
DCHECK(resp.recovered_job_num_ref().has_value());
5858
if (!resp.recovered_job_num_ref().has_value()) {
@@ -61,7 +61,7 @@ StatusOr<DataSet> SubmitJobExecutor::buildResult(meta::cpp2::AdminJobOp jobOp,
6161
v.emplace_back(nebula::Row({*resp.recovered_job_num_ref()}));
6262
return v;
6363
}
64-
case meta::cpp2::AdminJobOp::SHOW: {
64+
case meta::cpp2::JobOp::SHOW: {
6565
DCHECK(resp.job_desc_ref().has_value());
6666
if (!resp.job_desc_ref().has_value()) {
6767
return Status::Error("Response unexpected.");
@@ -73,7 +73,7 @@ StatusOr<DataSet> SubmitJobExecutor::buildResult(meta::cpp2::AdminJobOp jobOp,
7373
auto &jobDesc = *resp.job_desc_ref();
7474
return buildShowResultData(jobDesc.front(), *resp.get_task_desc());
7575
}
76-
case meta::cpp2::AdminJobOp::SHOW_All: {
76+
case meta::cpp2::JobOp::SHOW_All: {
7777
nebula::DataSet v({"Job Id", "Command", "Status", "Start Time", "Stop Time"});
7878
DCHECK(resp.job_desc_ref().has_value());
7979
if (!resp.job_desc_ref().has_value()) {
@@ -83,15 +83,15 @@ StatusOr<DataSet> SubmitJobExecutor::buildResult(meta::cpp2::AdminJobOp jobOp,
8383
for (const auto &jobDesc : jobsDesc) {
8484
v.emplace_back(nebula::Row({
8585
jobDesc.get_id(),
86-
apache::thrift::util::enumNameSafe(jobDesc.get_cmd()),
86+
apache::thrift::util::enumNameSafe(jobDesc.get_type()),
8787
apache::thrift::util::enumNameSafe(jobDesc.get_status()),
8888
convertJobTimestampToDateTime(jobDesc.get_start_time()),
8989
convertJobTimestampToDateTime(jobDesc.get_stop_time()),
9090
}));
9191
}
9292
return v;
9393
}
94-
case meta::cpp2::AdminJobOp::STOP: {
94+
case meta::cpp2::JobOp::STOP: {
9595
nebula::DataSet v({"Result"});
9696
v.emplace_back(nebula::Row({"Job stopped"}));
9797
return v;
@@ -109,16 +109,16 @@ Value SubmitJobExecutor::convertJobTimestampToDateTime(int64_t timestamp) {
109109

110110
nebula::DataSet SubmitJobExecutor::buildShowResultData(
111111
const nebula::meta::cpp2::JobDesc &jd, const std::vector<nebula::meta::cpp2::TaskDesc> &td) {
112-
if (jd.get_cmd() == meta::cpp2::AdminCmd::DATA_BALANCE ||
113-
jd.get_cmd() == meta::cpp2::AdminCmd::ZONE_BALANCE) {
112+
if (jd.get_type() == meta::cpp2::JobType::DATA_BALANCE ||
113+
jd.get_type() == meta::cpp2::JobType::ZONE_BALANCE) {
114114
nebula::DataSet v(
115115
{"Job Id(spaceId:partId)", "Command(src->dst)", "Status", "Start Time", "Stop Time"});
116116
const auto &paras = jd.get_paras();
117117
size_t index = std::stoul(paras.back());
118118
uint32_t total = paras.size() - index - 1, succeeded = 0, failed = 0, inProgress = 0,
119119
invalid = 0;
120120
v.emplace_back(Row({jd.get_id(),
121-
apache::thrift::util::enumNameSafe(jd.get_cmd()),
121+
apache::thrift::util::enumNameSafe(jd.get_type()),
122122
apache::thrift::util::enumNameSafe(jd.get_status()),
123123
convertJobTimestampToDateTime(jd.get_start_time()).toString(),
124124
convertJobTimestampToDateTime(jd.get_stop_time()).toString()}));
@@ -155,7 +155,7 @@ nebula::DataSet SubmitJobExecutor::buildShowResultData(
155155
nebula::DataSet v({"Job Id(TaskId)", "Command(Dest)", "Status", "Start Time", "Stop Time"});
156156
v.emplace_back(nebula::Row({
157157
jd.get_id(),
158-
apache::thrift::util::enumNameSafe(jd.get_cmd()),
158+
apache::thrift::util::enumNameSafe(jd.get_type()),
159159
apache::thrift::util::enumNameSafe(jd.get_status()),
160160
convertJobTimestampToDateTime(jd.get_start_time()),
161161
convertJobTimestampToDateTime(jd.get_stop_time()),

‎src/graph/executor/admin/SubmitJobExecutor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class SubmitJobExecutor final : public Executor {
2020

2121
private:
2222
FRIEND_TEST(JobTest, JobFinishTime);
23-
StatusOr<DataSet> buildResult(meta::cpp2::AdminJobOp jobOp, meta::cpp2::AdminJobResult &&resp);
23+
StatusOr<DataSet> buildResult(meta::cpp2::JobOp jobOp, meta::cpp2::AdminJobResult &&resp);
2424
Value convertJobTimestampToDateTime(int64_t timestamp);
2525
nebula::DataSet buildShowResultData(const nebula::meta::cpp2::JobDesc &jd,
2626
const std::vector<nebula::meta::cpp2::TaskDesc> &td);

‎src/graph/executor/test/JobTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ TEST_F(JobTest, JobFinishTime) {
3030

3131
auto qctx = std::make_unique<QueryContext>();
3232
auto submitJob = SubmitJob::make(
33-
qctx.get(), nullptr, meta::cpp2::AdminJobOp::SHOW, meta::cpp2::AdminCmd::UNKNOWN, {});
33+
qctx.get(), nullptr, meta::cpp2::JobOp::SHOW, meta::cpp2::JobType::UNKNOWN, {});
3434
auto submitJobExe = std::make_unique<SubmitJobExecutor>(submitJob, qctx.get());
3535

36-
auto status = submitJobExe->buildResult(meta::cpp2::AdminJobOp::SHOW, std::move(resp));
36+
auto status = submitJobExe->buildResult(meta::cpp2::JobOp::SHOW, std::move(resp));
3737
EXPECT_TRUE(status.ok());
3838
auto result = std::move(status).value();
3939
EXPECT_EQ(result.rows.size(), 2);
@@ -53,10 +53,10 @@ TEST_F(JobTest, JobFinishTime) {
5353

5454
auto qctx = std::make_unique<QueryContext>();
5555
auto submitJob = SubmitJob::make(
56-
qctx.get(), nullptr, meta::cpp2::AdminJobOp::SHOW_All, meta::cpp2::AdminCmd::UNKNOWN, {});
56+
qctx.get(), nullptr, meta::cpp2::JobOp::SHOW_All, meta::cpp2::JobType::UNKNOWN, {});
5757
auto submitJobExe = std::make_unique<SubmitJobExecutor>(submitJob, qctx.get());
5858

59-
auto status = submitJobExe->buildResult(meta::cpp2::AdminJobOp::SHOW_All, std::move(resp));
59+
auto status = submitJobExe->buildResult(meta::cpp2::JobOp::SHOW_All, std::move(resp));
6060
EXPECT_TRUE(status.ok());
6161
auto result = std::move(status).value();
6262
EXPECT_EQ(result.rows.size(), 1);

‎src/graph/planner/plan/Admin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ std::unique_ptr<PlanNodeDescription> ListRoles::explain() const {
176176
std::unique_ptr<PlanNodeDescription> SubmitJob::explain() const {
177177
auto desc = SingleDependencyNode::explain();
178178
addDescription("operation", apache::thrift::util::enumNameSafe(op_), desc.get());
179-
addDescription("command", apache::thrift::util::enumNameSafe(cmd_), desc.get());
179+
addDescription("command", apache::thrift::util::enumNameSafe(type_), desc.get());
180180
addDescription("parameters", folly::toJson(util::toJson(params_)), desc.get());
181181
return desc;
182182
}

‎src/graph/planner/plan/Admin.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -908,21 +908,21 @@ class SubmitJob final : public SingleDependencyNode {
908908
public:
909909
static SubmitJob* make(QueryContext* qctx,
910910
PlanNode* dep,
911-
meta::cpp2::AdminJobOp op,
912-
meta::cpp2::AdminCmd cmd,
911+
meta::cpp2::JobOp op,
912+
meta::cpp2::JobType type,
913913
const std::vector<std::string>& params) {
914-
return qctx->objPool()->add(new SubmitJob(qctx, dep, op, cmd, params));
914+
return qctx->objPool()->add(new SubmitJob(qctx, dep, op, type, params));
915915
}
916916

917917
std::unique_ptr<PlanNodeDescription> explain() const override;
918918

919919
public:
920-
meta::cpp2::AdminJobOp jobOp() const {
920+
meta::cpp2::JobOp jobOp() const {
921921
return op_;
922922
}
923923

924-
meta::cpp2::AdminCmd cmd() const {
925-
return cmd_;
924+
meta::cpp2::JobType jobType() const {
925+
return type_;
926926
}
927927

928928
const std::vector<std::string>& params() const {
@@ -932,14 +932,14 @@ class SubmitJob final : public SingleDependencyNode {
932932
private:
933933
SubmitJob(QueryContext* qctx,
934934
PlanNode* dep,
935-
meta::cpp2::AdminJobOp op,
936-
meta::cpp2::AdminCmd cmd,
935+
meta::cpp2::JobOp op,
936+
meta::cpp2::JobType type,
937937
const std::vector<std::string>& params)
938-
: SingleDependencyNode(qctx, Kind::kSubmitJob, dep), op_(op), cmd_(cmd), params_(params) {}
938+
: SingleDependencyNode(qctx, Kind::kSubmitJob, dep), op_(op), type_(type), params_(params) {}
939939

940940
private:
941-
meta::cpp2::AdminJobOp op_;
942-
meta::cpp2::AdminCmd cmd_;
941+
meta::cpp2::JobOp op_;
942+
meta::cpp2::JobType type_;
943943
const std::vector<std::string> params_;
944944
};
945945

‎src/graph/validator/AdminJobValidator.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ namespace nebula {
1111
namespace graph {
1212

1313
Status AdminJobValidator::validateImpl() {
14-
if (sentence_->getCmd() == meta::cpp2::AdminCmd::DATA_BALANCE ||
15-
sentence_->getCmd() == meta::cpp2::AdminCmd::ZONE_BALANCE) {
14+
if (sentence_->getJobType() == meta::cpp2::JobType::DATA_BALANCE ||
15+
sentence_->getJobType() == meta::cpp2::JobType::ZONE_BALANCE) {
1616
return Status::SemanticError("Data balance not support");
1717
}
18-
if (sentence_->getOp() == meta::cpp2::AdminJobOp::ADD) {
19-
auto cmd = sentence_->getCmd();
18+
if (sentence_->getOp() == meta::cpp2::JobOp::ADD) {
19+
auto jobType = sentence_->getJobType();
2020
if (requireSpace()) {
2121
const auto &spaceInfo = vctx_->whichSpace();
2222
auto spaceId = spaceInfo.id;
2323
const auto &spaceName = spaceInfo.name;
2424
sentence_->addPara(spaceName);
2525

26-
if (cmd == meta::cpp2::AdminCmd::REBUILD_TAG_INDEX ||
27-
cmd == meta::cpp2::AdminCmd::REBUILD_EDGE_INDEX) {
28-
auto ret = cmd == meta::cpp2::AdminCmd::REBUILD_TAG_INDEX
26+
if (jobType == meta::cpp2::JobType::REBUILD_TAG_INDEX ||
27+
jobType == meta::cpp2::JobType::REBUILD_EDGE_INDEX) {
28+
auto ret = jobType == meta::cpp2::JobType::REBUILD_TAG_INDEX
2929
? qctx()->indexMng()->getTagIndexes(spaceId)
3030
: qctx()->indexMng()->getEdgeIndexes(spaceId);
3131
if (!ret.ok()) {
@@ -60,7 +60,7 @@ Status AdminJobValidator::validateImpl() {
6060

6161
Status AdminJobValidator::toPlan() {
6262
auto *doNode = SubmitJob::make(
63-
qctx_, nullptr, sentence_->getOp(), sentence_->getCmd(), sentence_->getParas());
63+
qctx_, nullptr, sentence_->getOp(), sentence_->getJobType(), sentence_->getParas());
6464
root_ = doNode;
6565
tail_ = root_;
6666
return Status::OK();

‎src/graph/validator/AdminJobValidator.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,31 @@ class AdminJobValidator final : public Validator {
2828

2929
bool requireSpace() const {
3030
switch (sentence_->getOp()) {
31-
case meta::cpp2::AdminJobOp::ADD:
32-
switch (sentence_->getCmd()) {
31+
case meta::cpp2::JobOp::ADD:
32+
switch (sentence_->getJobType()) {
3333
// All jobs are space-level, except for the jobs that need to be refactored.
34-
case meta::cpp2::AdminCmd::REBUILD_TAG_INDEX:
35-
case meta::cpp2::AdminCmd::REBUILD_EDGE_INDEX:
36-
case meta::cpp2::AdminCmd::REBUILD_FULLTEXT_INDEX:
37-
case meta::cpp2::AdminCmd::STATS:
38-
case meta::cpp2::AdminCmd::COMPACT:
39-
case meta::cpp2::AdminCmd::FLUSH:
40-
case meta::cpp2::AdminCmd::DATA_BALANCE:
41-
case meta::cpp2::AdminCmd::LEADER_BALANCE:
42-
case meta::cpp2::AdminCmd::ZONE_BALANCE:
34+
case meta::cpp2::JobType::REBUILD_TAG_INDEX:
35+
case meta::cpp2::JobType::REBUILD_EDGE_INDEX:
36+
case meta::cpp2::JobType::REBUILD_FULLTEXT_INDEX:
37+
case meta::cpp2::JobType::STATS:
38+
case meta::cpp2::JobType::COMPACT:
39+
case meta::cpp2::JobType::FLUSH:
40+
case meta::cpp2::JobType::DATA_BALANCE:
41+
case meta::cpp2::JobType::LEADER_BALANCE:
42+
case meta::cpp2::JobType::ZONE_BALANCE:
4343
return true;
4444
// TODO: download and ingest need to be refactored to use the rpc protocol.
4545
// Currently they are using their own validator
46-
case meta::cpp2::AdminCmd::DOWNLOAD:
47-
case meta::cpp2::AdminCmd::INGEST:
48-
case meta::cpp2::AdminCmd::UNKNOWN:
46+
case meta::cpp2::JobType::DOWNLOAD:
47+
case meta::cpp2::JobType::INGEST:
48+
case meta::cpp2::JobType::UNKNOWN:
4949
return false;
5050
}
5151
break;
52-
case meta::cpp2::AdminJobOp::SHOW_All:
53-
case meta::cpp2::AdminJobOp::SHOW:
54-
case meta::cpp2::AdminJobOp::STOP:
55-
case meta::cpp2::AdminJobOp::RECOVER:
52+
case meta::cpp2::JobOp::SHOW_All:
53+
case meta::cpp2::JobOp::SHOW:
54+
case meta::cpp2::JobOp::STOP:
55+
case meta::cpp2::JobOp::RECOVER:
5656
return true;
5757
}
5858
return false;

‎src/interface/meta.thrift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,21 +220,15 @@ struct AlterSpaceReq {
220220
}
221221

222222
// Job related data structures
223-
enum AdminJobOp {
223+
enum JobOp {
224224
ADD = 0x01,
225225
SHOW_All = 0x02,
226226
SHOW = 0x03,
227227
STOP = 0x04,
228228
RECOVER = 0x05,
229229
} (cpp.enum_strict)
230230

231-
struct AdminJobReq {
232-
1: AdminJobOp op,
233-
2: AdminCmd cmd,
234-
3: list<binary> paras,
235-
}
236-
237-
enum AdminCmd {
231+
enum JobType {
238232
COMPACT = 0,
239233
FLUSH = 1,
240234
REBUILD_TAG_INDEX = 2,
@@ -249,6 +243,12 @@ enum AdminCmd {
249243
UNKNOWN = 99,
250244
} (cpp.enum_strict)
251245

246+
struct AdminJobReq {
247+
1: JobOp op,
248+
2: JobType type,
249+
3: list<binary> paras,
250+
}
251+
252252
enum JobStatus {
253253
QUEUE = 0x01,
254254
RUNNING = 0x02,
@@ -260,7 +260,7 @@ enum JobStatus {
260260

261261
struct JobDesc {
262262
1: i32 id,
263-
2: AdminCmd cmd,
263+
2: JobType type,
264264
3: list<string> paras,
265265
4: JobStatus status,
266266
5: i64 start_time,

0 commit comments

Comments
 (0)