Rename unique assocaitive cache

0xPolygonHermez · Jul 28, 2023 · 6e4dbd2 · 6e4dbd2
1 parent 4cdc014
commit 6e4dbd2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/src/hashdb/database.cpp b/src/hashdb/database.cpp
@@ -22,7 +22,7 @@
 // This will be used to store DB records in memory and it will be shared for all the instances of Database class
 // DatabaseCacheMT and DatabaseCacheProgram classes are thread-safe
 #ifdef DATABASE_USE_ASSOCIATIVE_CACHE
-DatabaseMTAssociativeCache2 Database::dbMTCache;
+DatabaseMTAssociativeCache Database::dbMTCache;
 //DatabaseMTAssociativeCache Database::dbMTCache;
 
 #else

diff --git a/src/hashdb/database.hpp b/src/hashdb/database.hpp
@@ -15,7 +15,7 @@
 #include "zkassert.hpp"
 #include "tree_position.hpp"
 #include "multi_write.hpp"
-#include "database_associative_cache_2.hpp"
+#include "database_associative_cache.hpp"
 
 using namespace std;
 
@@ -71,7 +71,7 @@ class Database
 #ifdef DATABASE_USE_CACHE
     // Cache static instances
 #ifdef DATABASE_USE_ASSOCIATIVE_CACHE
-    static DatabaseMTAssociativeCache2 dbMTCache;
+    static DatabaseMTAssociativeCache dbMTCache;
     //static DatabaseMTAssociativeCache dbMTCache;
 
 #else

diff --git a/src/hashdb/database_associative_cache_2.cpp → src/hashdb/database_associative_cache.cpp b/src/hashdb/database_associative_cache_2.cpp → src/hashdb/database_associative_cache.cpp
@@ -9,7 +9,7 @@
 
 
 
-DatabaseMTAssociativeCache2::DatabaseMTAssociativeCache2()
+DatabaseMTAssociativeCache::DatabaseMTAssociativeCache()
 {
     nKeyBits = 0;
     indicesSize = 0;
@@ -24,12 +24,12 @@ DatabaseMTAssociativeCache2::DatabaseMTAssociativeCache2()
     name = "";
 };
 
-DatabaseMTAssociativeCache2::DatabaseMTAssociativeCache2(int nKeyBits_, int cacheSize_, string name_)
+DatabaseMTAssociativeCache::DatabaseMTAssociativeCache(int nKeyBits_, int cacheSize_, string name_)
 {
     postConstruct(nKeyBits_, cacheSize_, name_);
 };
 
-DatabaseMTAssociativeCache2::~DatabaseMTAssociativeCache2()
+DatabaseMTAssociativeCache::~DatabaseMTAssociativeCache()
 {
     if (indices != NULL)
         delete[] indices;
@@ -41,12 +41,12 @@ DatabaseMTAssociativeCache2::~DatabaseMTAssociativeCache2()
         delete[] isLeaf;
 };
 
-void DatabaseMTAssociativeCache2::postConstruct(int nKeyBits_, int cacheSize_, string name_)
+void DatabaseMTAssociativeCache::postConstruct(int nKeyBits_, int cacheSize_, string name_)
 {
     nKeyBits = nKeyBits_;
     if (nKeyBits_ > 64)
     {
-        zklog.error("DatabaseMTAssociativeCache2::DatabaseMTAssociativeCache2() nKeyBits_ > 64");
+        zklog.error("DatabaseMTAssociativeCache::DatabaseMTAssociativeCache() nKeyBits_ > 64");
         exit(1);
     }
     indicesSize = 1 << nKeyBits;
@@ -70,15 +70,15 @@ void DatabaseMTAssociativeCache2::postConstruct(int nKeyBits_, int cacheSize_, s
     }
 };
 
-void DatabaseMTAssociativeCache2::addKeyValue(Goldilocks::Element (&key)[4], const vector<Goldilocks::Element> &value, bool update)
+void DatabaseMTAssociativeCache::addKeyValue(Goldilocks::Element (&key)[4], const vector<Goldilocks::Element> &value, bool update)
 {
     //
     //  Statistics
     //
     attempts++; // must be atomic operation!! makes it sence? not really
     if (attempts << 44 == 0)
     {
-        zklog.info("DatabaseMTAssociativeCache2::addKeyValue() name=" + name + " indicesSize=" + to_string(indicesSize) + " cacheSize=" + to_string(cacheSize) + " attempts=" + to_string(attempts) + " hits=" + to_string(hits) + " hit ratio=" + to_string(double(hits) * 100.0 / double(zkmax(attempts, 1))) + "%");
+        zklog.info("DatabaseMTAssociativeCache::addKeyValue() name=" + name + " indicesSize=" + to_string(indicesSize) + " cacheSize=" + to_string(cacheSize) + " attempts=" + to_string(attempts) + " hits=" + to_string(hits) + " hit ratio=" + to_string(double(hits) * 100.0 / double(zkmax(attempts, 1))) + "%");
     }
 
     //
@@ -178,7 +178,7 @@ void DatabaseMTAssociativeCache2::addKeyValue(Goldilocks::Element (&key)[4], con
     forcedInsertion(cacheIndex, iters);
 }
 
-void DatabaseMTAssociativeCache2::forcedInsertion(uint32_t index, int &iters)
+void DatabaseMTAssociativeCache::forcedInsertion(uint32_t index, int &iters)
 {
     //
     // avoid infinite loop
@@ -220,7 +220,7 @@ void DatabaseMTAssociativeCache2::forcedInsertion(uint32_t index, int &iters)
     forcedInsertion(minCacheIndex, iters);
 }
 
-bool DatabaseMTAssociativeCache2::findKey(Goldilocks::Element (&key)[4], vector<Goldilocks::Element> &value)
+bool DatabaseMTAssociativeCache::findKey(Goldilocks::Element (&key)[4], vector<Goldilocks::Element> &value)
 {
     for (int i = 0; i < 4; i++)
     {

diff --git a/src/hashdb/database_associative_cache_2.hpp → src/hashdb/database_associative_cache.hpp b/src/hashdb/database_associative_cache_2.hpp → src/hashdb/database_associative_cache.hpp
@@ -1,5 +1,5 @@
-#ifndef DATABASE_ASSOCIATIVE_CACHE_2_HPP
-#define DATABASE_ASSOCIATIVE_CACHE_2_HPP
+#ifndef DATABASE_ASSOCIATIVE_CACHE_HPP
+#define DATABASE_ASSOCIATIVE_CACHE_HPP
 #include <vector>
 #include "goldilocks_base_field.hpp"
 #include <nlohmann/json.hpp>
@@ -9,7 +9,7 @@
 
 using namespace std;
 using json = nlohmann::json;
-class DatabaseMTAssociativeCache2
+class DatabaseMTAssociativeCache
 {
     private:
         recursive_mutex mlock;
@@ -32,9 +32,9 @@ class DatabaseMTAssociativeCache2
 
     public:
 
-        DatabaseMTAssociativeCache2();
-        DatabaseMTAssociativeCache2(int nKeyBits_, int cacheSize_, string name_);
-        ~DatabaseMTAssociativeCache2();
+        DatabaseMTAssociativeCache();
+        DatabaseMTAssociativeCache(int nKeyBits_, int cacheSize_, string name_);
+        ~DatabaseMTAssociativeCache();
 
         void postConstruct(int nKeyBits_, int cacheSize_, string name_);
         void addKeyValue(Goldilocks::Element (&key)[4], const vector<Goldilocks::Element> &value, bool update);