octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-02-03 02:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep cache path parameters as std::string (#2464)

Browse Source 
While some of these originate as char *, eventually they convert to
std::string in the std::map lookup.
This commit is contained in:
Andrew Gaul 2024-06-04 22:37:48 +09:00 committed by GitHub
parent a4f694c345
commit f3946a2310
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/cache.cpp
View File

@ -342,7 +342,7 @@ bool StatCache::AddStat(const std::string& key, const headers_t& meta, bool forc
if(stat_cache.end() != stat_cache.find(key)){
// found cache
DelStat(key.c_str(), AutoLock::ALREADY_LOCKED);
DelStat(key, AutoLock::ALREADY_LOCKED);
}else{
// check: need to truncate cache
if(stat_cache.size() > CacheSize){
@ -388,7 +388,7 @@ bool StatCache::AddStat(const std::string& key, const headers_t& meta, bool forc
if(!S_ISLNK(value.stbuf.st_mode)){
if(symlink_cache.end() != symlink_cache.find(key)){
// if symbolic link cache has key, thus remove it.
DelSymlink(key.c_str(), AutoLock::ALREADY_LOCKED);
DelSymlink(key, AutoLock::ALREADY_LOCKED);
}
}
@ -462,7 +462,7 @@ bool StatCache::AddNoObjectCache(const std::string& key)
if(stat_cache.end() != stat_cache.find(key)){
// found
DelStat(key.c_str(), AutoLock::ALREADY_LOCKED);
DelStat(key, AutoLock::ALREADY_LOCKED);
}else{
// check: need to truncate cache
if(stat_cache.size() > CacheSize){
@ -489,7 +489,7 @@ bool StatCache::AddNoObjectCache(const std::string& key)
// check symbolic link cache
if(symlink_cache.end() != symlink_cache.find(key)){
// if symbolic link cache has key, thus remove it.
DelSymlink(key.c_str(), AutoLock::ALREADY_LOCKED);
DelSymlink(key, AutoLock::ALREADY_LOCKED);
}
return true;
}
@ -577,12 +577,9 @@ bool StatCache::TruncateCache(AutoLock::Type locktype)
return true;
}
bool StatCache::DelStat(const char* key, AutoLock::Type locktype)
bool StatCache::DelStat(const std::string& key, AutoLock::Type locktype)
{
if(!key){
return false;
}
S3FS_PRN_INFO3("delete stat cache entry[path=%s]", key);
S3FS_PRN_INFO3("delete stat cache entry[path=%s]", key.c_str());
AutoLock lock(&StatCache::stat_cache_lock, locktype);
@ -591,7 +588,7 @@ bool StatCache::DelStat(const char* key, AutoLock::Type locktype)
stat_cache.erase(iter);
DelNotruncateCache(key);
}
if(0 < strlen(key) && 0 != strcmp(key, "/")){
if(!key.empty() && key != "/"){
std::string strpath = key;
if('/' == *strpath.rbegin()){
// If there is "path" cache, delete it.
@ -639,7 +636,7 @@ bool StatCache::GetSymlink(const std::string& key, std::string& value)
}
if(is_delete_cache){
DelSymlink(strpath.c_str(), AutoLock::ALREADY_LOCKED);
DelSymlink(strpath, AutoLock::ALREADY_LOCKED);
}
return false;
}
@ -655,7 +652,7 @@ bool StatCache::AddSymlink(const std::string& key, const std::string& value)
if(symlink_cache.end() != symlink_cache.find(key)){
// found
DelSymlink(key.c_str(), AutoLock::ALREADY_LOCKED);
DelSymlink(key, AutoLock::ALREADY_LOCKED);
}else{
// check: need to truncate cache
if(symlink_cache.size() > CacheSize){
@ -724,12 +721,9 @@ bool StatCache::TruncateSymlink(AutoLock::Type locktype)
return true;
}
bool StatCache::DelSymlink(const char* key, AutoLock::Type locktype)
bool StatCache::DelSymlink(const std::string& key, AutoLock::Type locktype)
{
if(!key){
return false;
}
S3FS_PRN_INFO3("delete symbolic link cache entry[path=%s]", key);
S3FS_PRN_INFO3("delete symbolic link cache entry[path=%s]", key.c_str());
AutoLock lock(&StatCache::stat_cache_lock, locktype);

8
src/cache.h
View File

@ -182,16 +182,12 @@ class StatCache
void ChangeNoTruncateFlag(const std::string& key, bool no_truncate);
// Delete stat cache
bool DelStat(const char* key, AutoLock::Type locktype = AutoLock::NONE);
bool DelStat(const std::string& key, AutoLock::Type locktype = AutoLock::NONE)
{
return DelStat(key.c_str(), locktype);
}
bool DelStat(const std::string& key, AutoLock::Type locktype = AutoLock::NONE);
// Cache for symbolic link
bool GetSymlink(const std::string& key, std::string& value);
bool AddSymlink(const std::string& key, const std::string& value);
bool DelSymlink(const char* key, AutoLock::Type locktype = AutoLock::NONE);
bool DelSymlink(const std::string& key, AutoLock::Type locktype = AutoLock::NONE);
// Cache for Notruncate file
bool GetNotruncateCache(const std::string& parentdir, notruncate_filelist_t& list);

4
src/s3fs.cpp
View File

@ -1361,7 +1361,7 @@ static int s3fs_rmdir(const char* _path)
S3fsCurl s3fscurl;
result = s3fscurl.DeleteRequest(strpath.c_str());
s3fscurl.DestroyCurlHandle();
StatCache::getStatCacheData()->DelStat(strpath.c_str());
StatCache::getStatCacheData()->DelStat(strpath);
// double check for old version(before 1.63)
// The old version makes "dir" object, newer version makes "dir/".
@ -1376,7 +1376,7 @@ static int s3fs_rmdir(const char* _path)
// Found "dir" object.
result = s3fscurl.DeleteRequest(strpath.c_str());
s3fscurl.DestroyCurlHandle();
StatCache::getStatCacheData()->DelStat(strpath.c_str());
StatCache::getStatCacheData()->DelStat(strpath);
}
}
// If there is no "dir" and "dir/" object(this case is made by s3cmd/s3sync),