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

Merge pull request #48571 from azat/dict/hashed/uncaught-exception-fix

Browse Source 
Fix uncaught exception in case of parallel loader for hashed dictionaries
This commit is contained in:
Alexey Milovidov 2023-04-10 23:11:01 +03:00 committed by GitHub
commit 93b8fc74ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Dictionaries/HashedDictionary.cpp
View File

@ -114,9 +114,18 @@ public:
~ParallelDictionaryLoader() ~ParallelDictionaryLoader()
{ {
for (auto & queue : shards_queues) try
queue->clearAndFinish(); {
pool.wait(); for (auto & queue : shards_queues)
queue->clearAndFinish();
/// NOTE: It is OK to not pass the exception next, since on success finish() should be called which will call wait()
pool.wait();
}
catch (...)
{
tryLogCurrentException(dictionary.log, "Exception had been thrown during parallel load of the dictionary");
}
} }
private: private: