thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 10:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 01682_cache_dictionary_complex_key

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-08-06 13:06:05 +03:00
parent 13f95f3fdf
commit a0f9df4d87
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Dictionaries/CacheDictionary.cpp
View File

@ -487,25 +487,21 @@ template <DictionaryKeyType dictionary_key_type>
Pipe CacheDictionary<dictionary_key_type>::read(const Names & column_names, size_t max_block_size) const
{
Pipe pipe;
std::optional<DictionarySourceData> data;
{
/// Write lock on storage
const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
if constexpr (dictionary_key_type == DictionaryKeyType::simple)
pipe = Pipe(std::make_shared<DictionarySource>(
DictionarySourceData(shared_from_this(), cache_storage_ptr->getCachedSimpleKeys(), column_names),
max_block_size));
data.emplace(shared_from_this(), cache_storage_ptr->getCachedSimpleKeys(), column_names);
else
{
auto keys = cache_storage_ptr->getCachedComplexKeys();
pipe = Pipe(std::make_shared<DictionarySource>(
DictionarySourceData(shared_from_this(), keys, column_names),
max_block_size));
data.emplace(shared_from_this(), keys, column_names);
}
}
return pipe;
return Pipe(std::make_shared<DictionarySource>(std::move(*data), max_block_size));
}
template <DictionaryKeyType dictionary_key_type>