hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

DirEntryList keeps its items sorted by key - this allows faster accesses

Browse Source
This commit is contained in:
Sebastian Messmer 2015-10-07 21:41:00 +02:00
parent 3f782a330f
commit bf3a028204
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/filesystem/fsblobstore/utils/DirEntryList.cpp
View File

@ -11,6 +11,9 @@ using blockstore::Key;
namespace cryfs {
namespace fsblobstore {
DirEntryList::DirEntryList() : _entries() {
}
Data DirEntryList::serialize() const {
Data serialized(_serializedSize());
unsigned int offset = 0;
@ -38,7 +41,7 @@ void DirEntryList::deserializeFrom(const void *data, uint64_t size) {
}
bool DirEntryList::_hasChild(const string &name) const {
auto found = std::find_if(_entries.begin(), _entries.end(), [name] (const DirEntry &entry) {
auto found = std::find_if(_entries.begin(), _entries.end(), [&name] (const DirEntry &entry) {
return entry.name == name;
});
return found != _entries.end();
@ -49,12 +52,14 @@ void DirEntryList::add(const string &name, const Key &blobKey, fspp::Dir::EntryT
if (_hasChild(name)) {
throw fspp::fuse::FuseErrnoException(EEXIST);
}
_entries.emplace_back(entryType, name, blobKey, mode, uid, gid);
auto insert_pos = std::upper_bound(_entries.begin(), _entries.end(), blobKey, [] (const Key &key, const DirEntry &item) {
return std::less<Key>()(key, item.key);
});
_entries.emplace(insert_pos, entryType, name, blobKey, mode, uid, gid);
}
const DirEntry &DirEntryList::get(const string &name) const {
auto found = std::find_if(_entries.begin(), _entries.end(), [name] (const DirEntry &entry) {
auto found = std::find_if(_entries.begin(), _entries.end(), [&name] (const DirEntry &entry) {
return entry.name == name;
});
if (found == _entries.end()) {
@ -73,10 +78,10 @@ void DirEntryList::remove(const Key &key) {
}
vector<DirEntry>::iterator DirEntryList::_find(const Key &key) {
auto found = std::find_if(_entries.begin(), _entries.end(), [key] (const DirEntry &entry) {
return entry.key == key;
auto found = std::lower_bound(_entries.begin(), _entries.end(), key, [] (const DirEntry &entry, const Key &key) {
return std::less<Key>()(entry.key, key);
});
if (found == _entries.end()) {
if (found == _entries.end() || found->key != key) {
throw fspp::fuse::FuseErrnoException(ENOENT);
}
return found;

4
src/filesystem/fsblobstore/utils/DirEntryList.h
View File

@ -14,6 +14,8 @@ namespace cryfs {
public:
using const_iterator = std::vector<DirEntry>::const_iterator;
DirEntryList();
cpputils::Data serialize() const;
void deserializeFrom(const void *data, uint64_t size);
@ -37,6 +39,8 @@ namespace cryfs {
std::vector<DirEntry>::const_iterator _find(const blockstore::Key &key) const;
std::vector<DirEntry> _entries;
DISALLOW_COPY_AND_ASSIGN(DirEntryList);
};
}