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

Remove uncommented, useless code

Browse Source
This commit is contained in:
gvolfing 2023-02-06 15:47:18 +01:00
parent a1a612899c
commit 7e99f32adb
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/query/v2/interpreter.cpp
View File

@ -812,8 +812,7 @@ std::optional<plan::ProfilingStatsWithTotalTime> PullPlan::PullMultiple(AnyStrea
std::optional<plan::ProfilingStatsWithTotalTime> PullPlan::Pull(AnyStream *stream, std::optional<int> n, std::optional<plan::ProfilingStatsWithTotalTime> PullPlan::Pull(AnyStream *stream, std::optional<int> n,
const std::vector<Symbol> &output_symbols, const std::vector<Symbol> &output_symbols,
std::map<std::string, TypedValue> *summary) { std::map<std::string, TypedValue> *summary) {
// auto should_pull_multiple = false; // TODO on the long term, we will only use PullMultiple auto should_pull_multiple = false; // TODO on the long term, we will only use PullMultiple
auto should_pull_multiple = false;
if (should_pull_multiple) { if (should_pull_multiple) {
return PullMultiple(stream, n, output_symbols, summary); return PullMultiple(stream, n, output_symbols, summary);
} }

37
src/query/v2/plan/operator.cpp
View File

@ -761,7 +761,7 @@ class DistributedScanByPrimaryKeyCursor : public Cursor {
output_frame[output_symbol_] = TypedValue(it->second); output_frame[output_symbol_] = TypedValue(it->second);
populated_any = true; populated_any = true;
++output_frame_it; ++output_frame_it;
} }
own_frames_it_->MakeInvalid(); own_frames_it_->MakeInvalid();
} }
break; break;
@ -1350,19 +1350,6 @@ bool IsExpansionOk(Frame &frame, const Symbol &expand_symbol, const std::vector<
bool EdgeUniquenessFilter::EdgeUniquenessFilterCursor::Pull(Frame &frame, ExecutionContext &context) { bool EdgeUniquenessFilter::EdgeUniquenessFilterCursor::Pull(Frame &frame, ExecutionContext &context) {
SCOPED_PROFILE_OP("EdgeUniquenessFilter"); SCOPED_PROFILE_OP("EdgeUniquenessFilter");
// // TODO (gvolfing) Make the simple Pull method use the function instead of the lambda as well.
// auto expansion_ok = [&]() {
// const auto &expand_value = frame[self_.expand_symbol_];
// for (const auto &previous_symbol : self_.previous_symbols_) {
// const auto &previous_value = frame[previous_symbol];
// // This shouldn't raise a TypedValueException, because the planner
// // makes sure these are all of the expected type. In case they are not
// // an error should be raised long before this code is executed.
// if (ContainsSameEdge(previous_value, expand_value)) return false;
// }
// return true;
// };
while (input_cursor_->Pull(frame, context)) while (input_cursor_->Pull(frame, context))
if (IsExpansionOk(frame, self_.expand_symbol_, self_.previous_symbols_)) return true; if (IsExpansionOk(frame, self_.expand_symbol_, self_.previous_symbols_)) return true;
return false; return false;
@ -1422,28 +1409,6 @@ bool EdgeUniquenessFilter::EdgeUniquenessFilterCursor::PullMultiple(MultiFrame &
own_frames_it_->MakeInvalid(); own_frames_it_->MakeInvalid();
} }
++output_frame_it; ++output_frame_it;
/////////////////////////////////////////////////
/*
ExpressionEvaluator evaluator(&*own_frames_it_, context.symbol_table, context.evaluation_context,
context.request_router, storage::v3::View::NEW);
std::vector<msgs::Value> pk;
for (auto *primary_property : primary_key_) {
pk.push_back(TypedValueToValue(primary_property->Accept(evaluator)));
}
const msgs::Label label = {.id = msgs::LabelId::FromUint(label_.AsUint())};
auto vertex_id = std::make_pair(label, std::move(pk));
if (const auto it = id_to_accessor_mapping_.find(vertex_id); it != id_to_accessor_mapping_.end()) {
output_frame = *own_frames_it_;
output_frame[output_symbol_] = TypedValue(it->second);
populated_any = true;
++output_frame_it;
}
own_frames_it_->MakeInvalid();
*/
} }
break; break;
} }