unify add/delete finish() as update

vesoft-inc · Jan 25, 2022 · fca2ce4 · fca2ce4
1 parent 266149d
commit fca2ce4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/src/storage/transaction/ChainAddEdgesLocalProcessor.cpp b/src/storage/transaction/ChainAddEdgesLocalProcessor.cpp
@@ -288,7 +288,6 @@ cpp2::AddEdgesRequest ChainAddEdgesLocalProcessor::reverseRequest(
 }
 
 void ChainAddEdgesLocalProcessor::finish() {
- auto rc = (rcPrepare_ == Code::SUCCEEDED) ? rcCommit_ : rcPrepare_;
  if (rcPrepare_ == Code::SUCCEEDED) {
  VLOG(1) << uuid_ << execDesc_ << makeReadableEdge(req_)
  << ", rcPrepare_=" << apache::thrift::util::enumNameSafe(rcPrepare_)
@@ -311,6 +310,26 @@ void ChainAddEdgesLocalProcessor::finish() {
  }
  } while (0);
 
+ auto rc = Code::SUCCEEDED;
+ do {
+ if (rcPrepare_ != Code::SUCCEEDED) {
+ rc = rcPrepare_;
+ break;
+ }
+
+ if (rcCommit_ != Code::SUCCEEDED) {
+ rc = rcCommit_;
+ break;
+ }
+
+ // rcCommit_ may be set SUCCEEDED in abort().
+ // which we should return the error code or remote.
+ if (rcRemote_ != Code::E_RPC_FAILURE) {
+ rc = rcRemote_;
+ break;
+ }
+ } while (0);
+
  pushResultCode(rc, localPartId_);
  finished_.setValue(rc);
  onFinished();

diff --git a/src/storage/transaction/ChainDeleteEdgesLocalProcessor.cpp b/src/storage/transaction/ChainDeleteEdgesLocalProcessor.cpp
@@ -344,7 +344,25 @@ void ChainDeleteEdgesLocalProcessor::finish() {
  }
  } while (0);
 
- auto rc = (rcPrepare_ == Code::SUCCEEDED) ? rcCommit_ : rcPrepare_;
+ auto rc = Code::SUCCEEDED;
+ do {
+ if (rcPrepare_ != Code::SUCCEEDED) {
+ rc = rcPrepare_;
+ break;
+ }
+
+ if (rcCommit_ != Code::SUCCEEDED) {
+ rc = rcCommit_;
+ break;
+ }
+
+ // rcCommit_ may be set SUCCEEDED in abort().
+ // which we should return the error code or remote.
+ if (rcRemote_ != Code::E_RPC_FAILURE) {
+ rc = rcRemote_;
+ break;
+ }
+ } while (0);
  pushResultCode(rc, localPartId_);
  finished_.setValue(rc);
  onFinished();

diff --git a/src/storage/transaction/TransactionManager.cpp b/src/storage/transaction/TransactionManager.cpp
@@ -162,7 +162,6 @@ void TransactionManager::addPrime(GraphSpaceID spaceId,
  if (lk) {
  lk->unlock(egKey);
  }
- // delPrime(spaceId, partId, termId, egKey);
  return;
  }
  auto fut = proc->getFinished();
@@ -173,7 +172,6 @@ void TransactionManager::addPrime(GraphSpaceID spaceId,
  if (lk) {
  lk->unlock(egKey);
  }
- // env_->txnMan_->delPrime(spaceId, partId, termId, egKey);
  }
  });
  addChainTask(proc);