tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cache vertex accessor for all vertices iterable

Browse Source 
Reviewers: teon.banek

Reviewed By: teon.banek

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2569
This commit is contained in:
Matej Ferencevic 2019-11-26 10:43:27 +01:00
parent df6ce53c67
commit c5def558e8
2 changed files with 9 additions and 10 deletions

18
src/storage/v2/storage.cpp
View File

@ -12,11 +12,12 @@ namespace storage {
auto AdvanceToVisibleVertex(utils::SkipList<Vertex>::Iterator it,
utils::SkipList<Vertex>::Iterator end,
std::optional<VertexAccessor> *vertex,
Transaction *tx, View view, Indices *indices,
Config::Items config) {
while (it != end) {
auto maybe_vertex = VertexAccessor::Create(&*it, tx, indices, config, view);
if (!maybe_vertex) {
*vertex = VertexAccessor::Create(&*it, tx, indices, config, view);
if (!*vertex) {
++it;
continue;
}
@ -29,21 +30,18 @@ AllVerticesIterable::Iterator::Iterator(AllVerticesIterable *self,
utils::SkipList<Vertex>::Iterator it)
: self_(self),
it_(AdvanceToVisibleVertex(it, self->vertices_accessor_.end(),
self->transaction_, self->view_,
self->indices_, self->config_)) {}
&self->vertex_, self->transaction_,
self->view_, self->indices_, self->config_)) {}
VertexAccessor AllVerticesIterable::Iterator::operator*() const {
// TODO: current vertex accessor could be cached to avoid reconstructing every
// time
return *VertexAccessor::Create(&*it_, self_->transaction_, self_->indices_,
self_->config_, self_->view_);
return *self_->vertex_;
}
AllVerticesIterable::Iterator &AllVerticesIterable::Iterator::operator++() {
++it_;
it_ = AdvanceToVisibleVertex(it_, self_->vertices_accessor_.end(),
self_->transaction_, self_->view_,
self_->indices_, self_->config_);
&self_->vertex_, self_->transaction_,
self_->view_, self_->indices_, self_->config_);
return *this;
}

1
src/storage/v2/storage.hpp
View File

@ -38,6 +38,7 @@ class AllVerticesIterable final {
View view_;
Indices *indices_;
Config::Items config_;
std::optional<VertexAccessor> vertex_;
public:
class Iterator final {