thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 01:12:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Yarik Briukhovetskyi 2024-10-15 12:52:17 +02:00 committed by GitHub
parent c6caea5978
commit 73748075a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Interpreters/ProcessList.cpp
View File

@ -302,7 +302,7 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
processes.end(),
query);
CancellationChecker::getInstance().appendTask(query, query_context->getSettingsRef()[Setting::max_execution_time].totalMilliseconds());
CancellationChecker::getInstance().appendTask(query, query_context->getSettingsRef()[Setting::max_execution_time].totalMilliseconds(), query_context->getSettingsRef()[Setting::timeout_overflow_mode]);
increaseQueryKindAmount(query_kind);
@ -455,7 +455,7 @@ void QueryStatus::ExecutorHolder::remove()
executor = nullptr;
}
CancellationCode QueryStatus::cancelQuery(bool, CancelReason reason)
CancellationCode QueryStatus::cancelQuery(CancelReason reason)
{
if (is_killed.load())
return CancellationCode::CancelSent;
@ -590,7 +590,7 @@ QueryStatusPtr ProcessList::tryGetProcessListElement(const String & current_quer
}
CancellationCode ProcessList::sendCancelToQuery(const String & current_query_id, const String & current_user, bool kill)
CancellationCode ProcessList::sendCancelToQuery(const String & current_query_id, const String & current_user)
{
QueryStatusPtr elem;
@ -622,11 +622,11 @@ CancellationCode ProcessList::sendCancelToQuery(const String & current_query_id,
cancelled_cv.notify_all();
});
return elem->cancelQuery(kill);
return elem->cancelQuery(CancelReason::MANUAL_CANCEL);
}
CancellationCode ProcessList::sendCancelToQuery(QueryStatusPtr elem, bool kill)
CancellationCode ProcessList::sendCancelToQuery(QueryStatusPtr elem)
{
/// Cancelling the query should be done without the lock.
/// So here we first set is_cancelling, and later reset it.
@ -644,7 +644,7 @@ CancellationCode ProcessList::sendCancelToQuery(QueryStatusPtr elem, bool kill)
cancelled_cv.notify_all();
});
return elem->cancelQuery(kill);
return elem->cancelQuery(CancelReason::MANUAL_CANCEL);
}
@ -670,7 +670,7 @@ void ProcessList::killAllQueries()
}
for (auto & cancelled_process : cancelled_processes)
cancelled_process->cancelQuery(true);
cancelled_process->cancelQuery(CancelReason::MANUAL_CANCEL);
}