From ba9770ce95e7990f79ba30dde77f52fe2514626e Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Tue, 20 Sep 2022 04:22:09 +0200
Subject: [PATCH] Fixed caching of databases during runtime (#7275)

* Fixes #7268
Thanks to @jmsngls
---
 src/common/database.hpp | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/common/database.hpp b/src/common/database.hpp
index 6ef08d83d7..c79414ff34 100644
--- a/src/common/database.hpp
+++ b/src/common/database.hpp
@@ -111,7 +111,7 @@ public:
 		}
 	}
 
-	void put( keytype key, std::shared_ptr<datatype> ptr ){
+	virtual void put( keytype key, std::shared_ptr<datatype> ptr ){
 		this->data[key] = ptr;
 	}
 
@@ -135,7 +135,7 @@ public:
 		return rathena::util::umap_random( this->data );
 	}
 
-	void erase(keytype key) {
+	virtual void erase(keytype key) {
 		this->data.erase(key);
 	}
 };
@@ -143,20 +143,22 @@ public:
 template <typename keytype, typename datatype> class TypesafeCachedYamlDatabase : public TypesafeYamlDatabase<keytype, datatype>{
 private:
 	std::vector<std::shared_ptr<datatype>> cache;
+	bool loaded;
 
 public:
 	TypesafeCachedYamlDatabase( const std::string& type_, uint16 version_, uint16 minimumVersion_ ) : TypesafeYamlDatabase<keytype, datatype>( type_, version_, minimumVersion_ ){
-
+		this->loaded = false;
 	}
 
 	TypesafeCachedYamlDatabase( const std::string& type_, uint16 version_ ) : TypesafeYamlDatabase<keytype, datatype>( type_, version_, version_ ){
-
+		this->loaded = false;
 	}
 
 	void clear() override{
 		TypesafeYamlDatabase<keytype, datatype>::clear();
 		cache.clear();
 		cache.shrink_to_fit();
+		this->loaded = false;
 	}
 
 	std::shared_ptr<datatype> find( keytype key ) override{
@@ -206,6 +208,26 @@ public:
 				break;
 			}
 		}
+
+		this->loaded = true;
+	}
+
+	void erase( keytype key ) override{
+		TypesafeYamlDatabase<keytype, datatype>::erase( key );
+
+		// Prevent excessive usage during loading
+		if( this->loaded ){
+			this->cache[this->calculateCacheKey( key )] = nullptr;
+		}
+	}
+
+	void put( keytype key, std::shared_ptr<datatype> ptr ) override{
+		TypesafeYamlDatabase<keytype, datatype>::put( key, ptr );
+
+		// Prevent excessive usage during loading
+		if( this->loaded ){
+			this->cache[this->calculateCacheKey( key )] = ptr;
+		}
 	}
 };