Skip to content
This repository has been archived by the owner on Dec 1, 2022. It is now read-only.

restore update atomic operation #428

Merged
merged 1 commit into from
Apr 12, 2021
Merged

restore update atomic operation #428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 41 additions & 37 deletions src/storage/exec/UpdateNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,24 @@ class UpdateTagNode : public UpdateNode<VertexID> {

kvstore::ResultCode execute(PartitionID partId, const VertexID& vId) override {
CHECK_NOTNULL(planContext_->env_->kvstore_);
auto ret = kvstore::ResultCode::SUCCEEDED;
IndexCountWrapper wrapper(planContext_->env_);
ret = RelNode::execute(partId, vId);

// Update is read-modify-write, which is an atomic operation.
std::vector<VMLI> dummyLock = {std::make_tuple(planContext_->spaceId_,
partId, tagId_, vId)};
nebula::MemoryLockGuard<VMLI> lg(planContext_->env_->verticesML_.get(),
std::move(dummyLock));
if (!lg) {
auto conflict = lg.conflictKey();
LOG(ERROR) << "vertex conflict "
<< std::get<0>(conflict) << ":"
<< std::get<1>(conflict) << ":"
<< std::get<2>(conflict) << ":"
<< std::get<3>(conflict);
return kvstore::ResultCode::ERR_DATA_CONFLICT_ERROR;
}

auto ret = RelNode::execute(partId, vId);
if (ret != kvstore::ResultCode::SUCCEEDED) {
return ret;
}
Expand Down Expand Up @@ -205,20 +219,6 @@ class UpdateTagNode : public UpdateNode<VertexID> {
return kvstore::ResultCode::ERR_INVALID_DATA;
}

std::vector<VMLI> dummyLock = {std::make_tuple(planContext_->spaceId_,
partId, tagId_, vId)};
nebula::MemoryLockGuard<VMLI> lg(planContext_->env_->verticesML_.get(),
std::move(dummyLock));
if (!lg) {
auto conflict = lg.conflictKey();
LOG(ERROR) << "vertex conflict "
<< std::get<0>(conflict) << ":"
<< std::get<1>(conflict) << ":"
<< std::get<2>(conflict) << ":"
<< std::get<3>(conflict);
return kvstore::ResultCode::ERR_DATA_CONFLICT_ERROR;
}

folly::Baton<true, std::atomic> baton;
auto callback = [&ret, &baton] (kvstore::ResultCode code) {
ret = code;
Expand Down Expand Up @@ -463,6 +463,29 @@ class UpdateEdgeNode : public UpdateNode<cpp2::EdgeKey> {
auto ret = kvstore::ResultCode::SUCCEEDED;
IndexCountWrapper wrapper(planContext_->env_);

// Update is read-modify-write, which is an atomic operation.
std::vector<EMLI> dummyLock = {
std::make_tuple(planContext_->spaceId_,
partId,
edgeKey.get_src().getStr(),
edgeKey.get_edge_type(),
edgeKey.get_ranking(),
edgeKey.get_dst().getStr())
};
nebula::MemoryLockGuard<EMLI> lg(planContext_->env_->edgesML_.get(),
std::move(dummyLock));
if (!lg) {
auto conflict = lg.conflictKey();
LOG(ERROR) << "edge conflict "
<< std::get<0>(conflict) << ":"
<< std::get<1>(conflict) << ":"
<< std::get<2>(conflict) << ":"
<< std::get<3>(conflict) << ":"
<< std::get<4>(conflict) << ":"
<< std::get<5>(conflict);
return kvstore::ResultCode::ERR_DATA_CONFLICT_ERROR;
}

auto op = [&partId, &edgeKey, this]() -> folly::Optional<std::string> {
this->exeResult_ = RelNode::execute(partId, edgeKey);
if (this->exeResult_ == kvstore::ResultCode::SUCCEEDED) {
Expand Down Expand Up @@ -520,32 +543,13 @@ class UpdateEdgeNode : public UpdateNode<cpp2::EdgeKey> {
if (batch == folly::none) {
return this->exeResult_;
}
std::vector<EMLI> dummyLock = {
std::make_tuple(planContext_->spaceId_, partId,
edgeKey.get_src().getStr(),
edgeKey.get_edge_type(),
edgeKey.get_ranking(),
edgeKey.get_dst().getStr()
)
};
nebula::MemoryLockGuard<EMLI> lg(planContext_->env_->edgesML_.get(),
std::move(dummyLock));
if (!lg) {
auto conflict = lg.conflictKey();
LOG(ERROR) << "edge conflict "
<< std::get<0>(conflict) << ":"
<< std::get<1>(conflict) << ":"
<< std::get<2>(conflict) << ":"
<< std::get<3>(conflict) << ":"
<< std::get<4>(conflict) << ":"
<< std::get<5>(conflict);
return kvstore::ResultCode::ERR_DATA_CONFLICT_ERROR;
}

folly::Baton<true, std::atomic> baton;
auto callback = [&ret, &baton] (kvstore::ResultCode code) {
ret = code;
baton.post();
};

planContext_->env_->kvstore_->asyncAppendBatch(
planContext_->spaceId_, partId, std::move(batch).value(), callback);
baton.wait();
Expand Down