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

Fix deadlocks

Browse Source
This commit is contained in:
Antonio Andelic 2022-03-08 14:17:19 +00:00
parent c6664bbbdf
commit 16c20332cf
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/IO/ParallelReadBuffer.cpp
View File

@ -16,7 +16,6 @@ namespace ErrorCodes
ParallelReadBuffer::ParallelReadBuffer(std::unique_ptr<ReadBufferFactory> reader_factory_, size_t max_working_readers) ParallelReadBuffer::ParallelReadBuffer(std::unique_ptr<ReadBufferFactory> reader_factory_, size_t max_working_readers)
: SeekableReadBufferWithSize(nullptr, 0), pool(max_working_readers), reader_factory(std::move(reader_factory_)) : SeekableReadBufferWithSize(nullptr, 0), pool(max_working_readers), reader_factory(std::move(reader_factory_))
{ {
std::lock_guard<std::mutex> lock(mutex);
initializeWorkers(); initializeWorkers();
} }
@ -81,12 +80,11 @@ off_t ParallelReadBuffer::seek(off_t offset, int whence)
lock.unlock(); lock.unlock();
finishAndWait(); finishAndWait();
lock.lock();
reader_factory->seek(offset, whence); reader_factory->seek(offset, whence);
all_created = false; all_created = false;
all_completed = false; all_completed = false;
lock.unlock(); read_workers.clear();
current_position = offset; current_position = offset;
resetWorkingBuffer(); resetWorkingBuffer();
@ -170,6 +168,7 @@ void ParallelReadBuffer::processor()
if (!reader) if (!reader)
{ {
all_created = true; all_created = true;
next_condvar.notify_all();
break; break;
} }