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

Reduce code complexity and thanks to @antaljanosbenjamin's suggestion

Browse Source
This commit is contained in:
Jiebin Sun 2024-11-27 20:03:27 +08:00
parent 75a6dcdf3f
commit e25a4465a9
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Common/OvercommitTracker.cpp
View File

@ -115,19 +115,20 @@ void OvercommitTracker::tryContinueQueryExecutionAfterFree(Int64 amount)
if (OvercommitTrackerBlockerInThread::isBlocked())
return;
std::shared_lock read_lock(overcommit_m);
{
std::shared_lock read_lock(overcommit_m);
if (cancellation_state == QueryCancellationState::NONE)
return;
}
read_lock.unlock();
std::lock_guard lk(overcommit_m);
if (cancellation_state != QueryCancellationState::NONE)
{
read_lock.unlock();
{
std::lock_guard lk(overcommit_m);
if (cancellation_state != QueryCancellationState::NONE)
{
freed_memory += amount;
if (freed_memory >= required_memory)
releaseThreads();
}
}
freed_memory += amount;
if (freed_memory >= required_memory)
releaseThreads();
}
}
@ -135,19 +136,21 @@ void OvercommitTracker::onQueryStop(MemoryTracker * tracker)
{
DENY_ALLOCATIONS_IN_SCOPE;
std::shared_lock read_lock(overcommit_m);
{
std::shared_lock read_lock(overcommit_m);
if (picked_tracker != tracker)
return;
}
read_lock.unlock();
std::lock_guard lk(overcommit_m);
if (picked_tracker == tracker)
{
read_lock.unlock();
{
std::lock_guard lk(overcommit_m);
if (picked_tracker == tracker)
{
reset();
cv.notify_all();
}
}
reset();
cv.notify_all();
}
}
void OvercommitTracker::releaseThreads()