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

Fixed tests

Browse Source
This commit is contained in:
Maksim Kita 2021-02-18 21:39:10 +03:00
parent 2a5a9c6ca4
commit 8138ced862
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Dictionaries/CacheDictionaryStorage.h
View File

@ -34,6 +34,8 @@ struct CacheDictionaryStorageConfiguration
Cell in LRUCache consists of allocated size and place in arena were columns serialized data is stored.
Columns are serialized by rows.
When cell is removed from LRUCache data associated with it is also removed from arena.
In case of complex key we also store key data in arena and it is removed from arena.
@ -152,12 +154,14 @@ private:
if (now > cell.deadline + std::chrono::seconds(configuration.strict_max_lifetime_seconds))
{
result.not_found_or_expired_keys.emplace_back(key);
result.not_found_or_expired_keys_indexes.emplace_back(key_index);
continue;
}
else if (now > cell.deadline)
{
result.expired_keys_to_fetched_columns_index[key] = fetched_columns_index;
result.not_found_or_expired_keys.emplace_back(key);
result.not_found_or_expired_keys_indexes.emplace_back(key_index);
}
else
result.found_keys_to_fetched_columns_index[key] = fetched_columns_index;

23
src/Dictionaries/SSDCacheDictionaryStorage.h
View File

@ -915,13 +915,13 @@ private:
struct KeyToBlockOffset
{
KeyToBlockOffset(KeyType key_, size_t offset_in_block_, bool is_expired_)
: key(key_)
KeyToBlockOffset(size_t key_index_, size_t offset_in_block_, bool is_expired_)
: key_index(key_index_)
, offset_in_block(offset_in_block_)
, is_expired(is_expired_)
{}
KeyType key;
size_t key_index;
size_t offset_in_block;
bool is_expired;
};
@ -944,6 +944,7 @@ private:
if (now > cell.deadline + std::chrono::seconds(configuration.strict_max_lifetime_seconds))
{
result.not_found_or_expired_keys.emplace_back(key);
result.not_found_or_expired_keys_indexes.emplace_back(key_index);
continue;
}
else if (now > cell.deadline)
@ -954,11 +955,13 @@ private:
char * serialized_columns_place = partition.getPlace(cell.index);
deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, serialized_columns_place);
result.expired_keys_to_fetched_columns_index[key] = fetched_columns_index;
result.not_found_or_expired_keys.emplace_back(key);
result.not_found_or_expired_keys_indexes.emplace_back(key_index);
++fetched_columns_index;
}
else
{
block_to_keys_map[cell.index.block_index].emplace_back(key, cell.index.offset_in_block, true);
block_to_keys_map[cell.index.block_index].emplace_back(key_index, cell.index.offset_in_block, true);
unique_blocks_to_request.insert(cell.index.block_index);
}
}
@ -974,7 +977,7 @@ private:
}
else
{
block_to_keys_map[cell.index.block_index].emplace_back(key, cell.index.offset_in_block, false);
block_to_keys_map[cell.index.block_index].emplace_back(key_index, cell.index.offset_in_block, false);
unique_blocks_to_request.insert(cell.index.block_index);
}
}
@ -1001,14 +1004,22 @@ private:
for (auto & key_in_block : keys_in_block)
{
auto key = keys[key_in_block.key_index];
char * key_data = block_data + key_in_block.offset_in_block;
deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, key_data);
auto & found_key_hash_map
= key_in_block.is_expired ? result.expired_keys_to_fetched_columns_index : result.found_keys_to_fetched_columns_index;
found_key_hash_map[key_in_block.key] = fetched_columns_index;
found_key_hash_map[key] = fetched_columns_index;
++fetched_columns_index;
if (key_in_block.is_expired)
{
result.not_found_or_expired_keys.emplace_back(key);
result.not_found_or_expired_keys_indexes.emplace_back(key_in_block.key_index);
}
}
});
}