From 73748075a29f384d7dc62599000589c71362954e Mon Sep 17 00:00:00 2001 From: Yarik Briukhovetskyi <114298166+yariks5s@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:52:17 +0200 Subject: [PATCH] fix build --- src/Interpreters/ProcessList.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp index 2981ff9421c..8a5a46e5775 100644 --- a/src/Interpreters/ProcessList.cpp +++ b/src/Interpreters/ProcessList.cpp @@ -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); }