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

Merge pull request #35984 from ClickHouse/fix-url-data-race

Browse Source 
Fix data race in StorageURL
This commit is contained in:
Antonio Andelic 2022-04-06 14:36:19 +02:00 committed by GitHub
commit cda8a18fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Storages/StorageURL.cpp
View File

@ -224,16 +224,14 @@ namespace
} }
Chunk chunk; Chunk chunk;
std::lock_guard lock(reader_mutex);
if (reader->pull(chunk)) if (reader->pull(chunk))
return chunk; return chunk;
{
std::lock_guard lock(reader_mutex);
pipeline->reset(); pipeline->reset();
reader.reset(); reader.reset();
} }
} }
}
static std::unique_ptr<ReadBuffer> getFirstAvailableURLReadBuffer( static std::unique_ptr<ReadBuffer> getFirstAvailableURLReadBuffer(
std::vector<String>::const_iterator & option, std::vector<String>::const_iterator & option,