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

Fix LCP that broke with invisible merge conflict

Browse Source
This commit is contained in:
Tyler Neely 2022-11-29 09:07:18 +00:00
parent 9f10c3ea06
commit 4f18fa7431
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/query/v2/frontend/ast/ast.lcp
View File

@ -24,7 +24,7 @@
#include "query/v2/bindings/typed_value.hpp" #include "query/v2/bindings/typed_value.hpp"
#include "query/v2/db_accessor.hpp" #include "query/v2/db_accessor.hpp"
#include "query/v2/path.hpp" #include "query/v2/path.hpp"
#include "query/v2/shard_request_manager.hpp" #include "query/v2/request_router.hpp"
#include "utils/typeinfo.hpp" #include "utils/typeinfo.hpp"
#include "query/v2/conversions.hpp" #include "query/v2/conversions.hpp"
@ -838,14 +838,14 @@ cpp<#
:slk-load (slk-load-ast-vector "Expression")) :slk-load (slk-load-ast-vector "Expression"))
(function-name "std::string" :scope :public) (function-name "std::string" :scope :public)
(function "std::function<TypedValue(const TypedValue *, int64_t, (function "std::function<TypedValue(const TypedValue *, int64_t,
const functions::FunctionContext<ShardRequestManagerInterface> &)>" const functions::FunctionContext<RequestRouterInterface> &)>"
:scope :public :scope :public
:dont-save t :dont-save t
:clone :copy :clone :copy
:slk-load (lambda (member) :slk-load (lambda (member)
#>cpp #>cpp
self->${member} = functions::NameToFunction<TypedValue, self->${member} = functions::NameToFunction<TypedValue,
functions::FunctionContext<ShardRequestManagerInterface>, functions::FunctionContext<RequestRouterInterface>,
functions::QueryEngineTag, decltype(ValueToTypedValueFunctor)>(self->function_name_); functions::QueryEngineTag, decltype(ValueToTypedValueFunctor)>(self->function_name_);
cpp<#))) cpp<#)))
(:public (:public
@ -869,7 +869,7 @@ cpp<#
const std::vector<Expression *> &arguments) const std::vector<Expression *> &arguments)
: arguments_(arguments), : arguments_(arguments),
function_name_(function_name), function_name_(function_name),
function_(functions::NameToFunction<TypedValue, functions::FunctionContext<ShardRequestManagerInterface>, function_(functions::NameToFunction<TypedValue, functions::FunctionContext<RequestRouterInterface>,
functions::QueryEngineTag, decltype(ValueToTypedValueFunctor)>(function_name_)) { functions::QueryEngineTag, decltype(ValueToTypedValueFunctor)>(function_name_)) {
if (!function_) { if (!function_) {
throw SemanticException("Function '{}' doesn't exist.", function_name); throw SemanticException("Function '{}' doesn't exist.", function_name);