Skip to content

Commit 7f66876

Browse files
visualYJDyuhaijun999
authored andcommitted
[fix][store] Fixup issues.
1 parent 53f374f commit 7f66876

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

src/server/document_service.cc

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,6 +1946,7 @@ void DocumentServiceImpl::TxnCheckTxnStatus(google::protobuf::RpcController* con
19461946

19471947
auto status = DocumentValidateTxnCheckTxnStatusRequest(request, region);
19481948
if (!status.ok()) {
1949+
brpc::ClosureGuard done_guard(svr_done);
19491950
ServiceHelper::SetError(response->mutable_error(), status.error_code(), status.error_str());
19501951
return;
19511952
}
@@ -1970,18 +1971,6 @@ static butil::Status DocumentValidateTxnResolveLockRequest(const pb::store::TxnR
19701971
return epoch_ret;
19711972
}
19721973

1973-
if (request->start_ts() == 0) {
1974-
return butil::Status(pb::error::EILLEGAL_PARAMTETERS, "start_ts is 0, it's illegal");
1975-
}
1976-
1977-
if (request->commit_ts() < 0) {
1978-
return butil::Status(pb::error::EILLEGAL_PARAMTETERS, "commit_ts < 0, it's illegal");
1979-
}
1980-
1981-
if (request->commit_ts() > 0 && request->commit_ts() < request->start_ts()) {
1982-
return butil::Status(pb::error::EILLEGAL_PARAMTETERS, "commit_ts < start_ts, it's illegal");
1983-
}
1984-
19851974
if (request->keys_size() > 0) {
19861975
for (const auto& key : request->keys()) {
19871976
if (key.empty()) {
@@ -2036,13 +2025,12 @@ void DocumentServiceImpl::TxnResolveLock(google::protobuf::RpcController* contro
20362025

20372026
auto region = svr_done->GetRegion();
20382027
int64_t region_id = request->context().region_id();
2039-
20402028
auto status = DocumentValidateTxnResolveLockRequest(request, region);
20412029
if (!status.ok()) {
2030+
brpc::ClosureGuard done_guard(svr_done);
20422031
ServiceHelper::SetError(response->mutable_error(), status.error_code(), status.error_str());
20432032
return;
20442033
}
2045-
20462034
// Run in queue.
20472035
auto task = std::make_shared<ServiceTask>([this, controller, request, response, svr_done]() {
20482036
DoTxnResolveLock(storage_, controller, request, response, svr_done, true);
@@ -2404,6 +2392,7 @@ void DocumentServiceImpl::TxnGc(google::protobuf::RpcController* controller, con
24042392

24052393
auto status = DocumentValidateTxnGcRequest(request, region);
24062394
if (!status.ok()) {
2395+
brpc::ClosureGuard done_guard(svr_done);
24072396
ServiceHelper::SetError(response->mutable_error(), status.error_code(), status.error_str());
24082397
return;
24092398
}

src/server/index_service.cc

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3280,6 +3280,7 @@ void IndexServiceImpl::TxnCheckTxnStatus(google::protobuf::RpcController* contro
32803280

32813281
auto status = VectorValidateTxnCheckTxnStatusRequest(request, region);
32823282
if (!status.ok()) {
3283+
brpc::ClosureGuard done_guard(svr_done);
32833284
ServiceHelper::SetError(response->mutable_error(), status.error_code(), status.error_str());
32843285
return;
32853286
}
@@ -3304,18 +3305,6 @@ static butil::Status VectorValidateTxnResolveLockRequest(const pb::store::TxnRes
33043305
return epoch_ret;
33053306
}
33063307

3307-
if (request->start_ts() == 0) {
3308-
return butil::Status(pb::error::EILLEGAL_PARAMTETERS, "start_ts is 0, it's illegal");
3309-
}
3310-
3311-
if (request->commit_ts() < 0) {
3312-
return butil::Status(pb::error::EILLEGAL_PARAMTETERS, "commit_ts < 0, it's illegal");
3313-
}
3314-
3315-
if (request->commit_ts() > 0 && request->commit_ts() < request->start_ts()) {
3316-
return butil::Status(pb::error::EILLEGAL_PARAMTETERS, "commit_ts < start_ts, it's illegal");
3317-
}
3318-
33193308
if (request->keys_size() > 0) {
33203309
for (const auto& key : request->keys()) {
33213310
if (key.empty()) {
@@ -3370,13 +3359,12 @@ void IndexServiceImpl::TxnResolveLock(google::protobuf::RpcController* controlle
33703359

33713360
auto region = svr_done->GetRegion();
33723361
int64_t region_id = request->context().region_id();
3373-
33743362
auto status = VectorValidateTxnResolveLockRequest(request, region);
33753363
if (!status.ok()) {
3364+
brpc::ClosureGuard done_guard(svr_done);
33763365
ServiceHelper::SetError(response->mutable_error(), status.error_code(), status.error_str());
33773366
return;
33783367
}
3379-
33803368
// Run in queue.
33813369
auto task = std::make_shared<ServiceTask>([this, controller, request, response, svr_done]() {
33823370
DoTxnResolveLock(storage_, controller, request, response, svr_done, true);
@@ -3749,6 +3737,7 @@ void IndexServiceImpl::TxnGc(google::protobuf::RpcController* controller, const
37493737

37503738
auto status = VectorValidateTxnGcRequest(request, region);
37513739
if (!status.ok()) {
3740+
brpc::ClosureGuard done_guard(svr_done);
37523741
ServiceHelper::SetError(response->mutable_error(), status.error_code(), status.error_str());
37533742
return;
37543743
}

0 commit comments

Comments
 (0)