Merge pull request #3916 from fancyqlx/kill-query-fix

Fixed Segment Fault Caused by 'KILL QUERY SYNC'
ClickHouse · Dec 24, 2018 · e0eb527 · e0eb527
2 parents 082e6e0 + 416d6aa
commit e0eb527
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp b/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -221,8 +221,11 @@ BlockIO InterpreterKillQueryQuery::execute()
 
 Block InterpreterKillQueryQuery::getSelectFromSystemProcessesResult()
 {
-    String system_processes_query = "SELECT query_id, user, query FROM system.processes WHERE "
-        + queryToString(static_cast<ASTKillQueryQuery &>(*query_ptr).where_expression);
+    String system_processes_query = "SELECT query_id, user, query FROM system.processes";
+    auto & where_expression = static_cast<ASTKillQueryQuery &>(*query_ptr).where_expression;
+    if (where_expression)
+        system_processes_query += " WHERE " + queryToString(where_expression);
+
 
     BlockIO system_processes_io = executeQuery(system_processes_query, context, true);
     Block res = system_processes_io.in->read();

diff --git a/dbms/src/Parsers/ASTKillQueryQuery.h b/dbms/src/Parsers/ASTKillQueryQuery.h
@@ -15,8 +15,12 @@ class ASTKillQueryQuery : public ASTQueryWithOutput, public ASTQueryWithOnCluste
     ASTPtr clone() const override
     {
         auto clone = std::make_shared<ASTKillQueryQuery>(*this);
-        clone->where_expression = where_expression->clone();
-        clone->children = {clone->where_expression};
+        if (where_expression)
+        {
+            clone->where_expression = where_expression->clone();
+            clone->children = {clone->where_expression};
+        }
+
         return clone;
     }
 

diff --git a/dbms/src/Parsers/ParserKillQueryQuery.cpp b/dbms/src/Parsers/ParserKillQueryQuery.cpp
@@ -39,7 +39,8 @@ bool ParserKillQueryQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
         query->test = true;
 
     query->cluster = cluster_str;
-    query->children.emplace_back(query->where_expression);
+    if (query->where_expression)
+        query->children.emplace_back(query->where_expression);
     node = std::move(query);
     return true;
 }