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

Safeguard in case ComputeExpression is called without opt

Browse Source
This commit is contained in:
jeremy 2022-10-24 15:44:57 +02:00
parent 386a0c5686
commit 51e6802aa7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/v3/expr.cpp
View File

@ -186,7 +186,7 @@ TypedValue ComputeExpression(DbAccessor &dba, const std::optional<memgraph::stor
expr::SymbolGenerator symbol_generator(&symbol_table, identifiers); expr::SymbolGenerator symbol_generator(&symbol_table, identifiers);
(std::any_cast<Expression *>(expr))->Accept(symbol_generator); (std::any_cast<Expression *>(expr))->Accept(symbol_generator);
if (node_identifier.symbol_pos_ != -1) { if (node_identifier.symbol_pos_ != -1 && v_acc.has_value()) {
MG_ASSERT(std::find_if(symbol_table.table().begin(), symbol_table.table().end(), MG_ASSERT(std::find_if(symbol_table.table().begin(), symbol_table.table().end(),
[&node_name](const std::pair<int32_t, Symbol> &position_symbol_pair) { [&node_name](const std::pair<int32_t, Symbol> &position_symbol_pair) {
return position_symbol_pair.second.name() == node_name; return position_symbol_pair.second.name() == node_name;
@ -195,7 +195,7 @@ TypedValue ComputeExpression(DbAccessor &dba, const std::optional<memgraph::stor
frame[symbol_table.at(node_identifier)] = *v_acc; frame[symbol_table.at(node_identifier)] = *v_acc;
} }
if (edge_identifier.symbol_pos_ != -1) { if (edge_identifier.symbol_pos_ != -1 && e_acc.has_value()) {
MG_ASSERT(std::find_if(symbol_table.table().begin(), symbol_table.table().end(), MG_ASSERT(std::find_if(symbol_table.table().begin(), symbol_table.table().end(),
[&edge_name](const std::pair<int32_t, Symbol> &position_symbol_pair) { [&edge_name](const std::pair<int32_t, Symbol> &position_symbol_pair) {
return position_symbol_pair.second.name() == edge_name; return position_symbol_pair.second.name() == edge_name;