From efa64fc864e44d7fff9587d0975a21c65d44cea1 Mon Sep 17 00:00:00 2001 From: niko4299 Date: Mon, 18 Jul 2022 15:28:52 +0200 Subject: [PATCH] Filtering --- src/query/interpreter.cpp | 3 ++- src/query/plan/operator.cpp | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/query/interpreter.cpp b/src/query/interpreter.cpp index 595fad46f..ee6da8e2f 100644 --- a/src/query/interpreter.cpp +++ b/src/query/interpreter.cpp @@ -959,11 +959,12 @@ PullPlan::PullPlan(const std::shared_ptr plan, const Parameters &par ctx_.evaluation_context.parameters = parameters; ctx_.evaluation_context.properties = NamesToProperties(plan->ast_storage().properties_, dba); ctx_.evaluation_context.labels = NamesToLabels(plan->ast_storage().labels_, dba); +#ifdef MG_ENTERPRISE if (username.has_value()) { memgraph::auth::User *user = interpreter_context->auth->GetUser(*username); ctx_.label_checker = new LabelChecker{user, dba}; } - +#endif if (interpreter_context->config.execution_timeout_sec > 0) { ctx_.timer = utils::AsyncTimer{interpreter_context->config.execution_timeout_sec}; } diff --git a/src/query/plan/operator.cpp b/src/query/plan/operator.cpp index e1e5a5a39..51a6ec542 100644 --- a/src/query/plan/operator.cpp +++ b/src/query/plan/operator.cpp @@ -394,8 +394,8 @@ class ScanAllCursor : public Cursor { while (!vertices_ || vertices_it_.value() == vertices_.value().end()) { if (!input_cursor_->Pull(frame, context)) return false; - // We need a getter function, because in case of exhausting a lazy - // iterable, we cannot simply reset it by calling begin(). + // We need a getter function, because in case of exhausting a lazy iterable, + // we cannot simply reset it by calling begin(). auto next_vertices = get_vertices_(frame, context); if (!next_vertices) continue; // Since vertices iterator isn't nothrow_move_assignable, we have to use @@ -405,17 +405,22 @@ class ScanAllCursor : public Cursor { vertices_it_.emplace(vertices_.value().begin()); } +#ifdef MG_ENTERPRISE while (vertices_it_.value() != vertices_.value().end()) { VertexAccessor vertex = *vertices_it_.value(); auto vertex_labels = vertex.Labels(memgraph::storage::View::NEW).GetValue(); if (!context.label_checker || context.label_checker->IsUserAuthorized(vertex_labels)) { - frame[output_symbol_] = *vertices_it_.value(); - ++vertices_it_.value(); - return true; + break; } ++vertices_it_.value(); } - return false; + if (vertices_it_.value() == vertices_.value().end()) return false; +#endif + + frame[output_symbol_] = *vertices_it_.value(); + ++vertices_it_.value(); + + return true; } void Shutdown() override { input_cursor_->Shutdown(); }