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

Correctly prepare Explain and Profile

Browse Source 
Summary: Also test Explain and Profile through Intepreter.

Reviewers: mferencevic

Reviewed By: mferencevic

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2546
This commit is contained in:
Teon Banek
2019-11-12 15:58:05 +01:00
parent 329818b1b0
commit b4df6ba0a9
2 changed files with 108 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/query/interpreter.cpp
View File

@@ -696,9 +696,9 @@ PreparedQuery PrepareExplainQuery(
<< "Cypher grammar should not allow other queries in EXPLAIN";
auto cypher_query_plan = CypherQueryToPlan(
parsed_query.stripped_query.hash(), std::move(parsed_query.ast_storage),
utils::Downcast<CypherQuery>(parsed_query.query), parsed_query.parameters,
&interpreter_context->plan_cache, dba);
parsed_inner_query.stripped_query.hash(),
std::move(parsed_inner_query.ast_storage), cypher_query,
parsed_inner_query.parameters, &interpreter_context->plan_cache, dba);
std::stringstream printed_plan;
plan::PrettyPrint(*dba, &cypher_query_plan->plan(), &printed_plan);
@@ -739,7 +739,7 @@ PreparedQuery PrepareProfileQuery(
throw ProfileInMulticommandTxException();
}
if (interpreter_context->is_tsc_available) {
if (!interpreter_context->is_tsc_available) {
throw QueryException("TSC support is missing for PROFILE");
}
@@ -759,9 +759,9 @@ PreparedQuery PrepareProfileQuery(
<< "Cypher grammar should not allow other queries in PROFILE";
auto cypher_query_plan = CypherQueryToPlan(
parsed_query.stripped_query.hash(), std::move(parsed_query.ast_storage),
utils::Downcast<CypherQuery>(parsed_query.query), parsed_query.parameters,
&interpreter_context->plan_cache, dba);
parsed_inner_query.stripped_query.hash(),
std::move(parsed_inner_query.ast_storage), cypher_query,
parsed_inner_query.parameters, &interpreter_context->plan_cache, dba);
return PreparedQuery{
{"OPERATOR", "ACTUAL HITS", "RELATIVE TIME", "ABSOLUTE TIME"},