Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix a bug: I guess storage may core #4196

Merged
merged 2 commits into from
Apr 23, 2022
Merged

fix a bug: I guess storage may core #4196

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e27cd3
fix a bug: I guess storage may core
liuyu85cn Apr 22, 2022
7f7429c
Merge branch 'master' into bugs
Sophie-Xie Apr 22, 2022
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
24 changes: 15 additions & 9 deletions src/storage/mutate/AddVerticesProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,15 @@ void AddVerticesProcessor::doProcess(const cpp2::AddVerticesRequest& req) {
void AddVerticesProcessor::doProcessWithIndex(const cpp2::AddVerticesRequest& req) {
const auto& partVertices = req.get_parts();
const auto& propNamesMap = req.get_prop_names();
auto batchHolder = std::make_unique<kvstore::BatchHolder>();

for (const auto& part : partVertices) {
auto partId = part.first;
const auto& vertices = part.second;
std::vector<kvstore::KV> kvs;
kvs.reserve(vertices.size());
std::vector<kvstore::KV> tags;
tags.reserve(vertices.size());

std::vector<std::string> verticeData;
verticeData.reserve(vertices.size());

auto code = nebula::cpp2::ErrorCode::SUCCEEDED;
deleteDupVid(const_cast<std::vector<cpp2::NewVertex>&>(vertices));
Expand All @@ -158,7 +160,7 @@ void AddVerticesProcessor::doProcessWithIndex(const cpp2::AddVerticesRequest& re
break;
}

batchHolder->put(NebulaKeyUtils::vertexKey(spaceVidLen_, partId, vid), "");
verticeData.emplace_back(NebulaKeyUtils::vertexKey(spaceVidLen_, partId, vid));
for (const auto& newTag : newTags) {
auto tagId = newTag.get_tag_id();
VLOG(3) << "PartitionID: " << partId << ", VertexID: " << vid << ", TagID: " << tagId;
Expand Down Expand Up @@ -186,15 +188,15 @@ void AddVerticesProcessor::doProcessWithIndex(const cpp2::AddVerticesRequest& re
code = writeResultTo(writeResult, false);
break;
}
kvs.emplace_back(std::string(key), std::string(encode.value()));
tags.emplace_back(std::string(key), std::string(encode.value()));
}
}

if (code != nebula::cpp2::ErrorCode::SUCCEEDED) {
handleAsync(spaceId_, partId, code);
} else {
auto atomicOp = [&, partId, data = std::move(kvs)]() mutable {
return addVerticesWithIndex(partId, std::move(data), std::move(batchHolder));
auto atomicOp = [=, tags = std::move(tags), vertices = std::move(verticeData)]() mutable {
return addVerticesWithIndex(partId, tags, vertices);
};

auto cb = [partId, this](nebula::cpp2::ErrorCode ec) { handleAsync(spaceId_, partId, ec); };
Expand All @@ -205,11 +207,15 @@ void AddVerticesProcessor::doProcessWithIndex(const cpp2::AddVerticesRequest& re

kvstore::MergeableAtomicOpResult AddVerticesProcessor::addVerticesWithIndex(
PartitionID partId,
std::vector<kvstore::KV>&& data,
std::unique_ptr<kvstore::BatchHolder>&& batchHolder) {
const std::vector<kvstore::KV>& data,
const std::vector<std::string>& vertices) {
kvstore::MergeableAtomicOpResult ret;
ret.code = nebula::cpp2::ErrorCode::E_RAFT_ATOMIC_OP_FAILED;
IndexCountWrapper wrapper(env_);
auto batchHolder = std::make_unique<kvstore::BatchHolder>();
for (auto& vertice : vertices) {
batchHolder->put(std::string(vertice), "");
}
for (auto& [key, value] : data) {
auto vId = NebulaKeyUtils::getVertexId(spaceVidLen_, key);
auto tagId = NebulaKeyUtils::getTagId(spaceVidLen_, key);
Expand Down
7 changes: 3 additions & 4 deletions src/storage/mutate/AddVerticesProcessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ class AddVerticesProcessor : public BaseProcessor<cpp2::ExecResponse> {

void deleteDupVid(std::vector<cpp2::NewVertex>& vertices);

kvstore::MergeableAtomicOpResult addVerticesWithIndex(
PartitionID partId,
std::vector<kvstore::KV>&& data,
std::unique_ptr<kvstore::BatchHolder>&& batchHolder);
kvstore::MergeableAtomicOpResult addVerticesWithIndex(PartitionID partId,
const std::vector<kvstore::KV>& data,
const std::vector<std::string>& vertices);

private:
GraphSpaceID spaceId_;
Expand Down