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

Apply TSA, pt. II

Browse Source
This commit is contained in:
Robert Schulze 2022-12-16 13:07:14 +00:00
parent 56d9882b43
commit fe5cd9e601
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Interpreters/Cache/QueryResultCache.cpp
View File

@ -93,7 +93,6 @@ QueryResultCache::Writer::Writer(std::mutex & mutex_, Cache & cache_, const Key
, min_query_duration(min_query_duration_)
, skip_insert(false)
{
std::lock_guard lock(mutex);
if (auto it = cache.find(key); it != cache.end() && !is_stale(it->first))
skip_insert = true; /// Do nothing if key exists in cache and it is not expired
}
@ -126,7 +125,7 @@ try
if (auto it = cache.find(key); it != cache.end() && !is_stale(it->first))
return; /// same check as in ctor
auto sufficient_space_in_cache = [this]()
auto sufficient_space_in_cache = [this]() TSA_REQUIRES(mutex)
{
return (cache_size_in_bytes + new_entry_size_in_bytes <= max_cache_size_in_bytes) && (cache.size() + 1 <= max_entries);
};
@ -177,7 +176,6 @@ void QueryResultCache::Writer::buffer(Chunk && chunk)
if ((new_entry_size_in_bytes > max_entry_size_in_bytes) || (new_entry_size_in_rows > max_entry_size_in_rows))
skip_insert = true;
}
QueryResultCache::Reader::Reader(const Cache & cache_, const Key & key)

4
src/Interpreters/Cache/QueryResultCache.h
View File

@ -77,9 +77,9 @@ public:
void buffer(Chunk && chunk);
private:
std::mutex & mutex;
Cache & cache;
Cache & cache TSA_GUARDED_BY(mutex);
const Key key;
size_t & cache_size_in_bytes;
size_t & cache_size_in_bytes TSA_GUARDED_BY(mutex);
const size_t max_cache_size_in_bytes;
const size_t max_entries;
size_t new_entry_size_in_bytes;