thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

use enum for KILL query type [#CLICKHOUSE-3912]

Browse Source
This commit is contained in:
Alexey Zatelepin 2019-02-05 16:15:11 +03:00
parent d482f3e5d0
commit 4b4539139b
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
View File

@ -182,7 +182,9 @@ BlockIO InterpreterKillQueryQuery::execute()
return executeDDLQueryOnCluster(query_ptr, context, {"system"});
BlockIO res_io;
if (!query.is_kill_mutation)
switch (query.type)
{
case ASTKillQueryQuery::Type::Query:
{
Block processes_block = getSelectResult("query_id, user, query", "system.processes");
if (!processes_block)
@ -217,8 +219,10 @@ BlockIO InterpreterKillQueryQuery::execute()
res_io.in = std::make_shared<SyncKillQueryInputStream>(
process_list, std::move(queries_to_stop), std::move(processes_block), header);
}
break;
}
else
case ASTKillQueryQuery::Type::Mutation:
{
/// TODO: check permissions
@ -255,6 +259,9 @@ BlockIO InterpreterKillQueryQuery::execute()
}
res_io.in = std::make_shared<OneBlockInputStream>(header.cloneWithColumns(std::move(res_columns)));
break;
}
}
return res_io;

2
dbms/src/Parsers/ASTKillQueryQuery.cpp
View File

@ -11,7 +11,7 @@ String ASTKillQueryQuery::getID(char delim) const
void ASTKillQueryQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
{
settings.ostr << (settings.hilite ? hilite_keyword : "") << "KILL "
<< (is_kill_mutation ? "MUTATION" : "QUERY");
<< (type == Type::Query ? "QUERY" : "MUTATION");
formatOnCluster(settings);

8
dbms/src/Parsers/ASTKillQueryQuery.h
View File

@ -8,7 +8,13 @@ namespace DB
class ASTKillQueryQuery : public ASTQueryWithOutput, public ASTQueryWithOnCluster
{
public:
bool is_kill_mutation = false; // if the query is KILL MUTATION.
enum class Type
{
Query, /// KILL QUERY
Mutation, /// KILL MUTATION
};
Type type = Type::Query;
ASTPtr where_expression; // expression to filter processes from system.processes table
bool sync = false; // SYNC or ASYNC mode
bool test = false; // does it TEST mode? (doesn't cancel queries just checks and shows them)

4
dbms/src/Parsers/ParserKillQueryQuery.cpp
View File

@ -28,9 +28,9 @@ bool ParserKillQueryQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
return false;
if (p_query.ignore(pos, expected))
query->is_kill_mutation = false;
query->type = ASTKillQueryQuery::Type::Query;
else if (p_mutation.ignore(pos, expected))
query->is_kill_mutation = true;
query->type = ASTKillQueryQuery::Type::Mutation;
else
return false;