database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

fix(SM): check for duplicates (#3314)

Browse Source 
Co-authored-by: Roman Nozdrin <rnozdrin@mariadb.com>
This commit is contained in:
Alexey Antipovsky
2024-09-10 16:50:59 +02:00
committed by GitHub
parent 31aaa7df50
commit 4f49c7870a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
storage-manager/src/PrefixCache.cpp
View File

@@ -137,15 +137,24 @@ void PrefixCache::populate()
const bf::path& p = dir->path(); const bf::path& p = dir->path();
if (bf::is_regular_file(p)) if (bf::is_regular_file(p))
{ {
lru.push_back(p.filename().string()); auto fileName = p.filename().string();
if (m_lru.find(fileName) != m_lru.end())
{
logger->log(LOG_WARNING, "Cache: found a duplicate in the cache '%s'", p.string().c_str());
++dir;
continue;
}
lru.push_back(fileName);
auto last = lru.end(); auto last = lru.end();
m_lru.insert(--last); m_lru.insert(--last);
currentCacheSize += bf::file_size(*dir); currentCacheSize += bf::file_size(*dir);
newObjects.push_back(p.filename().string()); newObjects.push_back(p.filename().string());
} }
else if (p != cachePrefix / downloader->getTmpPath()) else if (p != cachePrefix / downloader->getTmpPath())
{
logger->log(LOG_WARNING, "Cache: found something in the cache that does not belong '%s'", logger->log(LOG_WARNING, "Cache: found something in the cache that does not belong '%s'",
p.string().c_str()); p.string().c_str());
}
++dir; ++dir;
} }
sync->newObjects(firstDir, newObjects); sync->newObjects(firstDir, newObjects);
@@ -471,7 +480,6 @@ void PrefixCache::_makeSpace(size_t size)
if (!bf::exists(cachePrefix / *it)) if (!bf::exists(cachePrefix / *it))
logger->log(LOG_WARNING, "PrefixCache::makeSpace(): doesn't exist, %s/%s", cachePrefix.string().c_str(), logger->log(LOG_WARNING, "PrefixCache::makeSpace(): doesn't exist, %s/%s", cachePrefix.string().c_str(),
((string)(*it)).c_str()); ((string)(*it)).c_str());
assert(bf::exists(cachePrefix / *it));
/* /*
tell Synchronizer that this key will be evicted tell Synchronizer that this key will be evicted
delete the file delete the file