GithubStar/MMKV
1
0
Fork 0
mirror of https://github.com/Tencent/MMKV.git synced 2026-10-17 04:30:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

support correct filename on custom root path

Browse Source
This commit is contained in:
guoling
2024-12-24 19:29:07 +08:00
parent 3b8c11d944
commit 0bd466efe3
4 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/MMKV_Android.cpp
+14 -2
View File
@@ -40,7 +40,7 @@ extern unordered_map<string, MMKV *> *g_instanceDic;
extern ThreadLock *g_instanceLock;
MMKV::MMKV(const string &mmapID, int size, MMKVMode mode, const string *cryptKey, const string *rootPath, size_t expectedCapacity)
: m_mmapID((mode & MMKV_BACKUP) ? mmapID : mmapedKVKey(mmapID, rootPath)) // historically Android mistakenly use mmapKey as mmapID
: m_mmapID(mmapID)
, m_mode(mode)
, m_path(mappedKVPathWithID(m_mmapID, mode, rootPath))
, m_crcPath(crcPathWithID(m_mmapID, mode, rootPath))
@@ -157,7 +157,18 @@ MMKV *MMKV::mmkvWithID(const string &mmapID, int size, MMKVMode mode, const stri
}
MMKVInfo("prepare to load %s (id %s) from rootPath %s", mmapID.c_str(), mmapKey.c_str(), rootPath->c_str());
}
auto kv = new MMKV(mmapID, size, mode, cryptKey, rootPath, expectedCapacity);
string realID;
auto correctPath = mappedKVPathWithID(mmapID, mode, rootPath);
if ((mode & MMKV_BACKUP) || (rootPath && isFileExist(correctPath))) {
// it's successfully migrated to the correct path by newer version of MMKV
realID = mmapID;
} else {
// historically Android mistakenly use mmapKey as mmapID
realID = mmapKey;
}
auto kv = new MMKV(realID, size, mode, cryptKey, rootPath, expectedCapacity);
kv->m_mmapKey = mmapKey;
(*g_instanceDic)[mmapKey] = kv;
return kv;
}
@@ -178,6 +189,7 @@ MMKV *MMKV::mmkvWithAshmemFD(const string &mmapID, int fd, int metaFD, const str
return kv;
}
auto kv = new MMKV(mmapID, fd, metaFD, cryptKey);
kv->m_mmapKey = mmapID;
(*g_instanceDic)[mmapID] = kv;
return kv;
}