From c62141fd9870eabf6f987da8e2a82ff5a999ddcf Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 21 Mar 2017 06:15:49 -0700 Subject: Make controller do a simple write-through cache without revalidating. Means you must restart if files change on disk, but will decrease I/O considerably. --- controller/JSONDB.hpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'controller/JSONDB.hpp') diff --git a/controller/JSONDB.hpp b/controller/JSONDB.hpp index d2549173..00eeb8d8 100644 --- a/controller/JSONDB.hpp +++ b/controller/JSONDB.hpp @@ -63,12 +63,12 @@ public: inline bool put(const std::string &n1,const std::string &n2,const std::string &n3,const std::string &n4,const nlohmann::json &obj) { return this->put((n1 + "/" + n2 + "/" + n3 + "/" + n4),obj); } inline bool put(const std::string &n1,const std::string &n2,const std::string &n3,const std::string &n4,const std::string &n5,const nlohmann::json &obj) { return this->put((n1 + "/" + n2 + "/" + n3 + "/" + n4 + "/" + n5),obj); } - const nlohmann::json &get(const std::string &n,unsigned long maxSinceCheck = 0); + const nlohmann::json &get(const std::string &n); - inline const nlohmann::json &get(const std::string &n1,const std::string &n2,unsigned long maxSinceCheck = 0) { return this->get((n1 + "/" + n2),maxSinceCheck); } - inline const nlohmann::json &get(const std::string &n1,const std::string &n2,const std::string &n3,unsigned long maxSinceCheck = 0) { return this->get((n1 + "/" + n2 + "/" + n3),maxSinceCheck); } - inline const nlohmann::json &get(const std::string &n1,const std::string &n2,const std::string &n3,const std::string &n4,unsigned long maxSinceCheck = 0) { return this->get((n1 + "/" + n2 + "/" + n3 + "/" + n4),maxSinceCheck); } - inline const nlohmann::json &get(const std::string &n1,const std::string &n2,const std::string &n3,const std::string &n4,const std::string &n5,unsigned long maxSinceCheck = 0) { return this->get((n1 + "/" + n2 + "/" + n3 + "/" + n4 + "/" + n5),maxSinceCheck); } + inline const nlohmann::json &get(const std::string &n1,const std::string &n2) { return this->get((n1 + "/" + n2)); } + inline const nlohmann::json &get(const std::string &n1,const std::string &n2,const std::string &n3) { return this->get((n1 + "/" + n2 + "/" + n3)); } + inline const nlohmann::json &get(const std::string &n1,const std::string &n2,const std::string &n3,const std::string &n4) { return this->get((n1 + "/" + n2 + "/" + n3 + "/" + n4)); } + inline const nlohmann::json &get(const std::string &n1,const std::string &n2,const std::string &n3,const std::string &n4,const std::string &n5) { return this->get((n1 + "/" + n2 + "/" + n3 + "/" + n4 + "/" + n5)); } void erase(const std::string &n); @@ -78,11 +78,11 @@ public: inline void erase(const std::string &n1,const std::string &n2,const std::string &n3,const std::string &n4,const std::string &n5) { this->erase(n1 + "/" + n2 + "/" + n3 + "/" + n4 + "/" + n5); } template - inline void filter(const std::string &prefix,unsigned long maxSinceCheck,F func) + inline void filter(const std::string &prefix,F func) { for(std::map::iterator i(_db.lower_bound(prefix));i!=_db.end();) { if ((i->first.length() >= prefix.length())&&(!memcmp(i->first.data(),prefix.data(),prefix.length()))) { - if (!func(i->first,get(i->first,maxSinceCheck))) { + if (!func(i->first,get(i->first))) { std::map::iterator i2(i); ++i2; this->erase(i->first); i = i2; @@ -102,9 +102,6 @@ private: struct _E { nlohmann::json obj; - uint64_t lastModifiedOnDisk; - uint64_t lastCheck; - inline bool operator==(const _E &e) const { return (obj == e.obj); } inline bool operator!=(const _E &e) const { return (obj != e.obj); } }; -- cgit v1.2.3