Use allways Normalized key

0xPolygonHermez · Aug 28, 2023 · ac3e504 · ac3e504
1 parent f4ef6c4
commit ac3e504
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/hashdb/database.cpp b/src/hashdb/database.cpp
@@ -333,7 +333,7 @@ zkresult Database::write(const string &_key, const Goldilocks::Element* vkey, co
         if(usingAssociativeCache()){
             Goldilocks::Element vkeyf[4];
             if(vkey == NULL){
-                string2key(fr, _key, vkeyf);
+                string2key(fr, key, vkeyf);
             }else{
                 vkeyf[0] = vkey[0];
                 vkeyf[1] = vkey[1];
@@ -2039,7 +2039,8 @@ void loadDb2MemCache(const Config &config)
             hash = treeMapIterator->second[i];
             dbValue.clear();
             Goldilocks::Element vhash[4];
-            if(pHashDB->db.usingAssociativeCache()) string2key(fr, hash, vhash);
+            string hashNorm = NormalizeToNFormat(hash, 64);
+            if(pHashDB->db.usingAssociativeCache()) string2key(fr, hashNorm, vhash);
             zkresult zkr = pHashDB->db.read(hash, vhash, dbValue, NULL, true);
 
             if (zkr != ZKR_SUCCESS)

diff --git a/src/hashdb/database_associative_cache.cpp b/src/hashdb/database_associative_cache.cpp
@@ -265,7 +265,7 @@ bool DatabaseMTAssociativeCache::findKey(Goldilocks::Element (&key)[4], vector<G
     //
     if (attempts<<40 == 0)
     {
-        zklog.info("DatabaseMTAssociativeCache::addKeyValue() name=" + name + " indexesSize=" + to_string(indexesSize) + " 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::findKey() name=" + name + " indexesSize=" + to_string(indexesSize) + " cacheSize=" + to_string(cacheSize) + " attempts=" + to_string(attempts) + " hits=" + to_string(hits) + " hit ratio=" + to_string(double(hits) * 100.0 / double(zkmax(attempts, 1))) + "%");
     }
     //
     // Find the value

diff --git a/src/utils/scalar.cpp b/src/utils/scalar.cpp
@@ -81,7 +81,7 @@ void string2key(Goldilocks &fr, const string& os, Goldilocks::Element (&fea)[4])
     Goldilocks::Element fe;
     if (os.size() != 64)
     {
-        zklog.error("Database::string2fea() found incorrect DATA column size: " + to_string(os.size()));
+        zklog.error("Database::string2key() found incorrect DATA column size: " + to_string(os.size()));
         exitProcess();
     }
     int ii=0;