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

Merge pull request #49675 from ClickHouse/cache-cleanup-after-locking-rework

Browse Source 
Some cache cleanup after rework locking
This commit is contained in:
Kseniia Sumarokova 2023-05-09 11:29:45 +02:00 committed by GitHub
commit abde991cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/Cache/FileSegment.h
View File

@ -61,7 +61,7 @@ struct CreateFileSegmentSettings
: kind(kind_), unbounded(unbounded_) {} : kind(kind_), unbounded(unbounded_) {}
}; };
class FileSegment : private boost::noncopyable, public std::enable_shared_from_this<FileSegment> class FileSegment : private boost::noncopyable
{ {
friend struct LockedKey; friend struct LockedKey;
friend class FileCache; /// Because of reserved_size in tryReserve(). friend class FileCache; /// Because of reserved_size in tryReserve().

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

@ -1,8 +1,6 @@
#pragma once #pragma once
#include <mutex> #include <mutex>
#include <Interpreters/Cache/FileCache_fwd.h>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <map>
namespace DB namespace DB
{ {
@ -63,6 +61,8 @@ namespace DB
*/ */
struct CacheGuard : private boost::noncopyable struct CacheGuard : private boost::noncopyable
{ {
/// struct is used (not keyword `using`) to make CacheGuard::Lock non-interchangable with other guards locks
/// so, we wouldn't be able to pass CacheGuard::Lock to a function which accepts KeyGuard::Lock, for example
struct Lock : public std::unique_lock<std::mutex> struct Lock : public std::unique_lock<std::mutex>
{ {
explicit Lock(std::mutex & mutex_) : std::unique_lock<std::mutex>(mutex_) {} explicit Lock(std::mutex & mutex_) : std::unique_lock<std::mutex>(mutex_) {}

14
src/Interpreters/Cache/Metadata.cpp
View File

@ -208,10 +208,9 @@ LockedKeyPtr CacheMetadata::lockKeyMetadata(
chassert(key_not_found_policy == KeyNotFoundPolicy::CREATE_EMPTY); chassert(key_not_found_policy == KeyNotFoundPolicy::CREATE_EMPTY);
} }
/// Not we are at a case: /// Now we are at the case when the key was removed (key_state == KeyMetadata::KeyState::REMOVED)
/// key_state == KeyMetadata::KeyState::REMOVED /// but we need to return empty key (key_not_found_policy == KeyNotFoundPolicy::CREATE_EMPTY)
/// and KeyNotFoundPolicy == CREATE_EMPTY /// Retry
/// Retry.
return lockKeyMetadata(key, key_not_found_policy); return lockKeyMetadata(key, key_not_found_policy);
} }
@ -241,13 +240,6 @@ void CacheMetadata::doCleanup()
{ {
auto lock = guard.lock(); auto lock = guard.lock();
/// Let's mention this case.
/// This metadata cleanup is delayed so what is we marked key as deleted and
/// put it to deletion queue, but then the same key was added to cache before
/// we actually performed this delayed removal?
/// In this case it will work fine because on each attempt to add any key to cache
/// we perform this delayed removal.
FileCacheKey cleanup_key; FileCacheKey cleanup_key;
while (cleanup_queue->tryPop(cleanup_key)) while (cleanup_queue->tryPop(cleanup_key))
{ {