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

Cherry pick 3.3 （1017-1020） #4761

Merged
merged 8 commits into from
Oct 20, 2022
Merged

Cherry pick 3.3 （1017-1020） #4761

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c6cffd
fix dep of loop in go planner (#4736)
jievince Oct 17, 2022
ab726c4
fix inappropriate error code from raft (#4737)
critical27 Oct 17, 2022
5593627
Fix variable types collected and graph crash (#4724)
czpmango Oct 18, 2022
f1ad49e
stats handle the flag use_vertex_key (#4738)
critical27 Oct 19, 2022
3f69f27
JobManager related fix (#4742)
critical27 Oct 19, 2022
da23f87
download job related fix (#4754)
critical27 Oct 20, 2022
88ceadd
fixed case-when error (#4744)
caton-hpg Oct 20, 2022
31cc59c
Refine go planner (#4750)
jievince Oct 20, 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
Prev Previous commit
Next Next commit
stats handle the flag use_vertex_key (#4738)
  • Loading branch information
@critical27 @Sophie-Xie
critical27 authored and Sophie-Xie committed Oct 20, 2022
commit f1ad49e1e82ddb73665a8dd67f6d12848725109b
20 changes: 19 additions & 1 deletion src/storage/admin/StatsTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "common/base/MurmurHash2.h"
#include "common/utils/NebulaKeyUtils.h"
#include "kvstore/Common.h"
#include "storage/StorageFlags.h"

DEFINE_int32(stats_sleep_interval_ms,
0,
Expand Down Expand Up @@ -111,6 +112,8 @@ nebula::cpp2::ErrorCode StatsTask::genSubTask(GraphSpaceID spaceId,
std::unique_ptr<kvstore::KVIterator> tagIter;
auto edgePrefix = NebulaKeyUtils::edgePrefix(part);
std::unique_ptr<kvstore::KVIterator> edgeIter;
auto vertexPrefix = NebulaKeyUtils::vertexPrefix(part);
std::unique_ptr<kvstore::KVIterator> vertexIter;

// When the storage occurs leader change, continue to read data from the
// follower instead of reporting an error.
Expand All @@ -124,6 +127,13 @@ nebula::cpp2::ErrorCode StatsTask::genSubTask(GraphSpaceID spaceId,
LOG(INFO) << "Stats task failed";
return ret;
}
if (FLAGS_use_vertex_key) {
ret = env_->kvstore_->prefix(spaceId, part, vertexPrefix, &vertexIter, true);
if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
LOG(INFO) << "Stats task failed";
return ret;
}
}
std::unordered_map<TagID, int64_t> tagsVertices;
std::unordered_map<EdgeType, int64_t> edgetypeEdges;
std::unordered_map<PartitionID, int64_t> positiveRelevancy;
Expand Down Expand Up @@ -230,6 +240,14 @@ nebula::cpp2::ErrorCode StatsTask::genSubTask(GraphSpaceID spaceId,
edgeIter->next();
sleepIfScannedSomeRecord(++countToSleep);
}
int64_t verticesCountByVertexKey = 0;
if (FLAGS_use_vertex_key) {
while (vertexIter && vertexIter->valid()) {
verticesCountByVertexKey++;
vertexIter->next();
sleepIfScannedSomeRecord(++countToSleep);
}
}
nebula::meta::cpp2::StatsItem statsItem;

// convert tagId/edgeType to tagName/edgeName
Expand All @@ -246,7 +264,7 @@ nebula::cpp2::ErrorCode StatsTask::genSubTask(GraphSpaceID spaceId,
}
}

statsItem.space_vertices_ref() = spaceVertices;
statsItem.space_vertices_ref() = FLAGS_use_vertex_key ? verticesCountByVertexKey : spaceVertices;
statsItem.space_edges_ref() = spaceEdges;
using Correlativities = std::vector<nebula::meta::cpp2::Correlativity>;
Correlativities positiveCorrelativity;
Expand Down