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

Fix PipelineExecutor.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-01-15 21:32:19 +03:00
parent 5f5753941c
commit 4b86ef22b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Processors/Executors/PipelineExecutor.cpp
View File

@ -538,7 +538,7 @@ void PipelineExecutor::executeSingleThread(size_t thread_num, size_t num_threads
if (!task_queue.empty() && !threads_queue.empty() /*&& task_queue.quota() > threads_queue.size()*/) if (!task_queue.empty() && !threads_queue.empty() /*&& task_queue.quota() > threads_queue.size()*/)
{ {
auto thread_to_wake = task_queue.getAnyThreadWithTasks(thread_num == num_threads ? 0 : (thread_num + 1)); auto thread_to_wake = task_queue.getAnyThreadWithTasks(thread_num + 1 == num_threads ? 0 : (thread_num + 1));
if (threads_queue.has(thread_to_wake)) if (threads_queue.has(thread_to_wake))
threads_queue.pop(thread_to_wake); threads_queue.pop(thread_to_wake);
@ -630,7 +630,7 @@ void PipelineExecutor::executeSingleThread(size_t thread_num, size_t num_threads
if (!threads_queue.empty() /* && task_queue.quota() > threads_queue.size()*/) if (!threads_queue.empty() /* && task_queue.quota() > threads_queue.size()*/)
{ {
auto thread_to_wake = task_queue.getAnyThreadWithTasks(thread_num == num_threads ? 0 : (thread_num + 1)); auto thread_to_wake = task_queue.getAnyThreadWithTasks(thread_num + 1 == num_threads ? 0 : (thread_num + 1));
if (threads_queue.has(thread_to_wake)) if (threads_queue.has(thread_to_wake))
threads_queue.pop(thread_to_wake); threads_queue.pop(thread_to_wake);