mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-12-11 17:02:25 +00:00
fixup! Add support for EXPLAIN ANALYZE in graph mode
This commit is contained in:
parent
29eb8281cb
commit
88eeba57f8
@ -245,8 +245,7 @@ struct ExecutionAnalysisSettings
|
||||
|
||||
constexpr static char name[] = "ANALYZE";
|
||||
|
||||
std::unordered_map<std::string, std::reference_wrapper<bool>> boolean_settings =
|
||||
{
|
||||
std::unordered_map<std::string, std::reference_wrapper<bool>> boolean_settings = {
|
||||
{"graph", graph},
|
||||
};
|
||||
|
||||
@ -631,19 +630,20 @@ QueryPipeline InterpreterExplainQuery::executeImpl()
|
||||
|
||||
break;
|
||||
}
|
||||
case ASTExplainQuery::ExecutionAnalysis:
|
||||
{
|
||||
if(dynamic_cast<const ASTSelectWithUnionQuery *>(ast.getExplainedQuery().get())) {
|
||||
case ASTExplainQuery::ExecutionAnalysis: {
|
||||
if (dynamic_cast<const ASTSelectWithUnionQuery *>(ast.getExplainedQuery().get()))
|
||||
{
|
||||
auto settings = checkAndGetSettings<ExecutionAnalysisSettings>(ast.getSettings());
|
||||
|
||||
BlockIO res;
|
||||
//Build Query Plan
|
||||
if(getContext()->getSettingsRef().allow_experimental_analyzer)
|
||||
if (getContext()->getSettingsRef().allow_experimental_analyzer)
|
||||
{
|
||||
InterpreterSelectQueryAnalyzer interpreter(ast.getExplainedQuery(), getContext(), options);
|
||||
res = interpreter.execute();
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), getContext(), options);
|
||||
res = interpreter.execute();
|
||||
}
|
||||
@ -652,13 +652,15 @@ QueryPipeline InterpreterExplainQuery::executeImpl()
|
||||
const auto & processors = pipeline.getProcessors();
|
||||
|
||||
PullingPipelineExecutor pulling_executor(pipeline, true);
|
||||
while(true) {
|
||||
while (true)
|
||||
{
|
||||
Block block;
|
||||
if(!pulling_executor.pull(block))
|
||||
if (!pulling_executor.pull(block))
|
||||
break;
|
||||
}
|
||||
|
||||
if(settings.graph) {
|
||||
if (settings.graph)
|
||||
{
|
||||
printExecutionAnalysis(processors, buf);
|
||||
}
|
||||
else
|
||||
|
@ -47,7 +47,7 @@ bool ParserExplainQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
|
||||
kind = ASTExplainQuery::ExplainKind::TableOverride;
|
||||
else if (s_current_transaction.ignore(pos, expected))
|
||||
kind = ASTExplainQuery::ExplainKind::CurrentTransaction;
|
||||
else if(s_analyze.ignore(pos, expected))
|
||||
else if (s_analyze.ignore(pos, expected))
|
||||
kind = ASTExplainQuery::ExplainKind::ExecutionAnalysis;
|
||||
}
|
||||
else
|
||||
|
@ -71,7 +71,9 @@ PipelineExecutor::PipelineExecutor(std::shared_ptr<Processors> & processors, Que
|
||||
}
|
||||
}
|
||||
|
||||
PipelineExecutor::PipelineExecutor(std::shared_ptr<Processors> & processors, QueryStatusPtr elem, bool profile_processors_): PipelineExecutor(processors, elem) {
|
||||
PipelineExecutor::PipelineExecutor(std::shared_ptr<Processors> & processors, QueryStatusPtr elem, bool profile_processors_)
|
||||
: PipelineExecutor(processors, elem)
|
||||
{
|
||||
profile_processors = profile_processors || profile_processors_;
|
||||
}
|
||||
|
||||
|
@ -174,7 +174,8 @@ void printPipelineCompact(const Processors & processors, WriteBuffer & out, bool
|
||||
out << "}\n";
|
||||
}
|
||||
|
||||
void printExecutionAnalysis(const Processors & processors, WriteBuffer & out) {
|
||||
void printExecutionAnalysis(const Processors & processors, WriteBuffer & out)
|
||||
{
|
||||
out << "digraph\n";
|
||||
out << "{\n";
|
||||
out << " rankdir=\"LR\";\n";
|
||||
@ -188,7 +189,8 @@ void printExecutionAnalysis(const Processors & processors, WriteBuffer & out) {
|
||||
};
|
||||
|
||||
|
||||
for(const auto & processor : processors) {
|
||||
for (const auto & processor : processors)
|
||||
{
|
||||
const auto & description = processor->getDescription();
|
||||
out << " n" << get_proc_id(*processor) << "[label=<\n";
|
||||
out << " <table border=\"0\" cellborder=\"1\" cellspacing=\"0\">\n";
|
||||
@ -196,9 +198,10 @@ void printExecutionAnalysis(const Processors & processors, WriteBuffer & out) {
|
||||
out << " <tr>\n";
|
||||
out << " <td>\n";
|
||||
out << " <table border=\"0\" cellborder=\"0\" cellspacing=\"0\">\n";
|
||||
out << " <tr><td>Input wait time(us): " << processor->getInputWaitElapsedNs() / 1000U << "</td></tr>\n";
|
||||
out << " <tr><td>Input wait time(us): " << processor->getInputWaitElapsedNs() / 1000U << "</td></tr>\n";
|
||||
out << " <tr><td>Execution time(us): " << processor->getElapsedNs() / 1000U << "</td></tr>\n";
|
||||
out << " <tr><td>Output wait time(us): " << processor->getOutputWaitElapsedNs() / 1000U << "</td></tr>\n";
|
||||
out << " <tr><td>Output wait time(us): " << processor->getOutputWaitElapsedNs() / 1000U
|
||||
<< "</td></tr>\n";
|
||||
out << " </table>\n";
|
||||
out << " </td>\n";
|
||||
out << " </tr>\n";
|
||||
@ -220,7 +223,8 @@ void printExecutionAnalysis(const Processors & processors, WriteBuffer & out) {
|
||||
const IProcessor & next = port.getInputPort().getProcessor();
|
||||
const auto curr_stats = curr.getProcessorDataStats();
|
||||
|
||||
out << " n" << get_proc_id(curr) << " -> n" << get_proc_id(next) << " [label=\"" << curr_stats.output_rows << " rows\n " << curr_stats.output_bytes << " bytes\"];\n";
|
||||
out << " n" << get_proc_id(curr) << " -> n" << get_proc_id(next) << " [label=\"" << curr_stats.output_rows << " rows\n "
|
||||
<< curr_stats.output_bytes << " bytes\"];\n";
|
||||
}
|
||||
}
|
||||
out << "}\n";
|
||||
|
Loading…
Reference in New Issue
Block a user