Merge pull request #650 from 0xPolygonHermez/fractasy_hashdb_64

Fix hashdb64 workflow test

src/hashdb64/database_64.hpp

@@ -23,7 +23,7 @@ using namespace std;
 
 /*
 
-A Tree (state) is made of a set of TreeChunks:
+A Tree (state) is made of a set of TreeChunks, each of them stored in one 4kB page:
 
       /\
      /__\
@@ -35,12 +35,12 @@ A Tree (state) is made of a set of TreeChunks:
        /__\
 
 When we want to read [key, value] for a given root:
-    - we call db.read(treeChunk.hash, treeChunk.data) starting from the root until we reach the [key, value] leaf node
+    - we search for the right page starting from the root until we reach the [key, value] leaf node in the final page
 
 When we want to write a new leaf node [key, newValue] on a given root and get the resulting newStateRoot
-    - we calculate the new position of [key, newValue], creating new chunks if needed
+    - we calculate the new position of [key, newValue], creating new pages if needed
     - we recalculate the hashes of all the modified and new chunks
-    - we call db.write(treeChunk.hash, treeChunk.data) of all the modified and new chunks
+    - we write every resulting hash in the proper position of the proper page
 
 Every time we write a [key, newValue] we are potentially creating a new Tree = SUM(TreeChunks) if newValue != oldValue
 Every new Tree represents a newer version of the state
@@ -60,51 +60,21 @@ The Forest takes note of the latest Tree hash to keep track of the current state
 
 */
 
-class DB64Query
-{
-public:
-    string key;
-    Goldilocks::Element keyFea[4];
-    string &value; // value can be an input in multiWrite(), or an output in multiRead()
-    DB64Query(const string &_key, const Goldilocks::Element (&_keyFea)[4], string &_value) : key(_key), value(_value)
-    {
-        keyFea[0] = _keyFea[0];
-        keyFea[1] = _keyFea[1];
-        keyFea[2] = _keyFea[2];
-        keyFea[3] = _keyFea[3];
-    }
-};
-
 class Database64
 {
-public:
-    Goldilocks &fr;
-    const Config &config;
-    PoseidonGoldilocks poseidon;
-
-    // Basic flags
-    bool bInitialized = false;
-    bool useRemoteDB = false;
-
-    uint64_t headerPageNumber;
-
-public:
-    //sem_t senderSem; // Semaphore to wakeup database sender thread when flush() is called
-    //sem_t getFlushDataSem; // Semaphore to unblock getFlushData() callers when new data is available
 private:
-    //pthread_t senderPthread; // Database sender thread
-    //pthread_t cacheSynchPthread; // Cache synchronization thread
 
-    // Tree64
-    zkresult CalculateHash (Child &result, std::vector<TreeChunk *> &chunks, vector<DB64Query> &dbQueries, int idChunk, int level, vector<HashValueGL> *hashValues);
+    bool     bInitialized = false;
+    uint64_t headerPageNumber;
+    pthread_mutex_t mutex;
+    uint64_t currentFlushId;
 
 public:
 
     // Constructor and destructor
     Database64(Goldilocks &fr, const Config &config);
     ~Database64();
 
-public:
     // Basic methods
     void init(void);
 
@@ -124,24 +94,13 @@ class Database64
     zkresult consolidateBlock (uint64_t blockNumber); // TODO: Who reports this block number?
     zkresult revertBlock      (uint64_t blockNumber);
 
-public:
     // Flush data pending to be stored permamently
     zkresult flush(uint64_t &flushId, uint64_t &lastSentFlushId);
     zkresult getFlushStatus(uint64_t &storedFlushId, uint64_t &storingFlushId, uint64_t &lastFlushId, uint64_t &pendingToFlushNodes, uint64_t &pendingToFlushProgram, uint64_t &storingNodes, uint64_t &storingProgram);
 
-    // Get flush data, written to database by dbSenderThread; it blocks
-    zkresult getFlushData(uint64_t flushId, uint64_t &lastSentFlushId, unordered_map<string, string> (&nodes), unordered_map<string, string> (&program), string &nodesStateRoot);
-
-    // Clear cache
-    void clearCache(void);
-
-
+    // Lock/Unlock
+    void Lock(void) { pthread_mutex_lock(&mutex); };
+    void Unlock(void) { pthread_mutex_unlock(&mutex); };
 };
 
-// Thread to send data to database
-//void *dbSenderThread64(void *arg);
-
-// Thread to synchronize cache from master hash DB server
-//void *dbCacheSynchThread64(void *arg);
-
 #endif

src/hashdb64/page/header_page.cpp

@@ -180,13 +180,10 @@ zkresult HeaderPage::WriteVersionData (uint64_t &headerPageNumber, const uint64_
     return KeyValuePage::Write(headerPage->versionDataPage, version2key(version), versionData2value(versionData), headerPageNumber);
 }
 
-zkresult HeaderPage::KeyValueHistoryRead (const uint64_t headerPageNumber, const string &key, const uint64_t version, mpz_class &value)
+zkresult HeaderPage::KeyValueHistoryRead (const uint64_t keyValueHistoryPage, const string &key, const uint64_t version, mpz_class &value)
 {
-    // Get header page
-    HeaderStruct * headerPage = (HeaderStruct *)pageManager.getPageAddress(headerPageNumber);
-
     // Call the specific method
-    return KeyValueHistoryPage::Read(headerPage->keyValueHistoryPage, key, version, value);
+    return KeyValueHistoryPage::Read(keyValueHistoryPage, key, version, value);
 }
 
 zkresult HeaderPage::KeyValueHistoryWrite (uint64_t &headerPageNumber, const string &key, const uint64_t version, const mpz_class &value)

src/hashdb64/page/header_page.hpp

@@ -53,7 +53,7 @@ class HeaderPage
     static zkresult WriteVersionData (      uint64_t &headerPageNumber, const uint64_t &version, const VersionDataStruct &versionData);
 
     // Key-Value-History methods
-    static zkresult KeyValueHistoryRead  (const uint64_t headerPageNumber,  const string &key, const uint64_t version,       mpz_class &value);
+    static zkresult KeyValueHistoryRead  (const uint64_t keyValueHistoryPage,  const string &key, const uint64_t version,       mpz_class &value);
     static zkresult KeyValueHistoryWrite (      uint64_t &headerPageNumber, const string &key, const uint64_t version, const mpz_class &value);
     static zkresult KeyValueHistoryCalculateHash (uint64_t &headerPageNumber, Goldilocks::Element (&hash)[4]);
 

src/hashdb64/page/key_value_history_page.cpp

@@ -168,7 +168,6 @@ zkresult KeyValueHistoryPage::Write (uint64_t &pageNumber, const string &key, co
 
             uint64_t insertionRawDataPage = headerPage->rawDataPage;
             uint64_t insertionRawDataOffset = RawDataPage::GetOffset(insertionRawDataPage);
-            uint64_t rawDataPage = insertionRawDataPage;
 
             string keyAndValue = key + scalar2ba32(value);  // TODO: Check that value size=32
             zkr = RawDataPage::Write(headerPage->rawDataPage, keyAndValue);
@@ -183,9 +182,6 @@ zkresult KeyValueHistoryPage::Write (uint64_t &pageNumber, const string &key, co
             page->keyValueEntry[index][1] = (insertionRawDataOffset << 48) + insertionRawDataPage;
             page->keyValueEntry[index][2] = 0; // Mask as no hash has been calculated
 
-            // Update header
-            headerPage->rawDataPage = rawDataPage;
-
             return ZKR_SUCCESS;            
         }
         // Leaf node
@@ -254,10 +250,9 @@ zkresult KeyValueHistoryPage::Write (uint64_t &pageNumber, const string &key, co
                 // Get the current rawDataPage and offset
                 uint64_t insertionRawDataPage = headerPage->rawDataPage;
                 uint64_t insertionRawDataOffset = RawDataPage::GetOffset(headerPage->rawDataPage);
-                uint64_t rawDataPage = insertionRawDataPage;
 
                 string keyAndValue = key + valueBa;
-                zkr = RawDataPage::Write(rawDataPage, keyAndValue);
+                zkr = RawDataPage::Write(headerPage->rawDataPage, keyAndValue);
                 if (zkr != ZKR_SUCCESS)
                 {
                     zklog.error("KeyValueHistoryPage::Write() failed calling RawDataPage.Write result=" + zkresult2string(zkr) + " rawDataPage=" + to_string(rawDataPage) + " rawDataOffset=" + to_string(rawDataOffset) + " key=" + ba2string(key) + " version=" + to_string(version) + " level=" + to_string(level) + " index=" + to_string(index));
@@ -269,9 +264,6 @@ zkresult KeyValueHistoryPage::Write (uint64_t &pageNumber, const string &key, co
                 page->keyValueEntry[index][1] = (insertionRawDataOffset << 48) + (insertionRawDataPage & U64Mask48);
                 page->keyValueEntry[index][2] = 0;
 
-                // Update header
-                headerPage->rawDataPage = rawDataOffset;
-
                 return ZKR_SUCCESS;
             }
 
@@ -418,13 +410,12 @@ zkresult KeyValueHistoryPage::calculatePageHash (const uint64_t pageNumber, cons
                     // Get the current rawDataPage and offset
                     uint64_t insertionRawDataPage = headerPage->rawDataPage;
                     uint64_t insertionRawDataOffset = RawDataPage::GetOffset(headerPage->rawDataPage);
-                    uint64_t rawDataPage = insertionRawDataPage;
 
                     // Store the hash in raw page
                     string hashBa;
                     hashBa = string2ba(fea2string(fr, hash));
                     zkassert(hashBa.size() == 32);
-                    zkr = RawDataPage::Write(rawDataPage, hashBa);
+                    zkr = RawDataPage::Write(headerPage->rawDataPage, hashBa);
                     if (zkr != ZKR_SUCCESS)
                     {
                         zklog.error("KeyValueHistoryPage::calculatePageHash() failed calling RawDataPage.Write result=" + zkresult2string(zkr) + " insertionRawDataPage=" + to_string(insertionRawDataPage) + " insertionRawDataOffset=" + to_string(insertionRawDataOffset) + " level=" + to_string(level) + " index=" + to_string(index));
@@ -433,9 +424,6 @@ zkresult KeyValueHistoryPage::calculatePageHash (const uint64_t pageNumber, cons
 
                     // Record the new hash and its raw data
                     page->keyValueEntry[index][2] = (insertionRawDataOffset << 48) | (insertionRawDataPage & U64Mask48);
-
-                    // Update the header
-                    headerPage->rawDataPage = rawDataPage;
                 }
                 // If hash was calculated, get it from raw data
                 else
@@ -499,13 +487,12 @@ zkresult KeyValueHistoryPage::calculatePageHash (const uint64_t pageNumber, cons
             // Get the current rawDataPage and offset
             uint64_t insertionRawDataPage = headerPage->rawDataPage;
             uint64_t insertionRawDataOffset = RawDataPage::GetOffset(headerPage->rawDataPage);
-            uint64_t rawDataPage = insertionRawDataPage;
 
             // Store the hash in raw page
             string hashBa;
             hashBa = string2ba(fea2string(fr, hash));
             zkassert(hashBa.size() == 32);
-            zkr = RawDataPage::Write(rawDataPage, hashBa);
+            zkr = RawDataPage::Write(headerPage->rawDataPage, hashBa);
             if (zkr != ZKR_SUCCESS)
             {
                 zklog.error("KeyValueHistoryPage::calculatePageHash() failed calling RawDataPage.Write result=" + zkresult2string(zkr) + " insertionRawDataPage=" + to_string(insertionRawDataPage) + " insertionRawDataOffset=" + to_string(insertionRawDataOffset) + " level=" + to_string(level) + " index=" + to_string(index));
@@ -514,9 +501,6 @@ zkresult KeyValueHistoryPage::calculatePageHash (const uint64_t pageNumber, cons
 
             // Record the new hash and its raw data
             page->keyValueEntry[index][2] = (insertionRawDataOffset << 48) | (insertionRawDataPage & U64Mask48);
-
-            // Update header page
-            headerPage->rawDataPage = rawDataPage;
         }
     }
 

src/hashdb64/state_manager_64.cpp

@@ -5,6 +5,7 @@
 #include "timer.hpp"
 #include "persistence.hpp"
 #include "definitions.hpp"
+#include "zkglobals.hpp"
 
 Goldilocks frSM64;
 PoseidonGoldilocks poseidonSM64;
@@ -638,7 +639,7 @@ zkresult StateManager64::purge (const string &batchUUID, const string &_newState
                 continue;
             }
 
-            zkr = purgeTxPersistence(txState.persistence[persistence], db.config);
+            zkr = purgeTxPersistence(txState.persistence[persistence], config);
             if (zkr != ZKR_SUCCESS)
             {
                 zklog.error("StateManager64::purge() failed calling purgeTxPersistence() zkr=" + zkresult2string(zkr) +
@@ -1019,7 +1020,7 @@ zkresult StateManager64::set (const string &batchUUID, uint64_t tx, Database64 &
 
     zkresult zkr;
 
-    bool bUseStateManager = db.config.stateManager && (batchUUID.size() > 0);
+    bool bUseStateManager = config.stateManager && (batchUUID.size() > 0);
 
     if (bUseStateManager)
     {
@@ -1081,7 +1082,7 @@ zkresult StateManager64::get (const string &batchUUID, Database64 &db, const Gol
     zklog.info("StateManager64::get() called with root=" + fea2string(fr,root) + " and key=" + fea2string(fr,key));
 #endif
 
-    bool bUseStateManager = db.config.stateManager && (batchUUID.size() > 0);
+    bool bUseStateManager = config.stateManager && (batchUUID.size() > 0);
 
     string keyString = fea2string(fr, key);
     mpz_class value;

src/service/hashdb/hashdb.cpp

@@ -399,7 +399,8 @@ zkresult HashDB::getFlushData(uint64_t flushId, uint64_t &lastSentFlushId, unord
 
     if (config.hashDB64)
     {
-        zkr = db64.getFlushData(flushId, lastSentFlushId, nodes, program, nodesStateRoot);
+        zklog.error("HashDB::getFlushData() called with config.hashDB64=true");
+        return ZKR_DB_ERROR;
     }
     else
     {
@@ -413,7 +414,7 @@ void HashDB::clearCache(void)
 {
     if (config.hashDB64)
     {
-        db64.clearCache();
+        // We don't use cache in HashDB64
     }
     else
     {

test/service/executor/executor_client.cpp

@@ -196,7 +196,6 @@ bool ExecutorClient::ProcessBatch (void)
         if (config.hashDB64)
         {
             Database64 &db = hashDB.db64;
-            db.clearCache();
 
             CheckTreeCounters64 checkTreeCounters;
 

test/service/hashdb/hashdb64_workflow_test.cpp

@@ -128,7 +128,7 @@ uint64_t HashDB64WorkflowTest (const Config& config)
             for (uint64_t i=0; i<4; i++) root[i] = consolidatedStateRoot[i];
 
             // Wait for data to be sent
-            /*while (true)
+            while (true)
             {
                 uint64_t storedFlushId, storingFlushId, lastFlushId, pendingToFlushNodes, pendingToFlushProgram, storingNodes, storingProgram;
                 string proverId;
@@ -141,7 +141,7 @@ uint64_t HashDB64WorkflowTest (const Config& config)
                 }
                 sleep(1);
             }
-            zklog.info("FLUSHED");*/
+            zklog.info("FLUSHED");
 
             // Call ReadTree with the old state root to get the hashes of the initial values of all read or written keys
             /*vector<HashValueGL> oldHashValues;

test/utils/check_tree_64.cpp

@@ -2,6 +2,7 @@
 #include "zkmax.hpp"
 #include "scalar.hpp"
 #include "tree_chunk.hpp"
+#include "zkglobals.hpp"
 
 zkresult CheckTree64 (Database64 &db, const string &key, uint64_t level, CheckTreeCounters64 &checkTreeCounters)
 {
@@ -11,7 +12,7 @@ zkresult CheckTree64 (Database64 &db, const string &key, uint64_t level, CheckTr
 
     TreeChunk treeChunk(poseidon);
     Goldilocks::Element keyFea[4];
-    string2fea(db.fr, key, keyFea);
+    string2fea(fr, key, keyFea);
     zkresult result = ZKR_UNSPECIFIED; // = db.read(key, keyFea, treeChunk.data, NULL, false);
     if (result != ZKR_SUCCESS)
     {
@@ -38,7 +39,7 @@ zkresult CheckTree64 (Database64 &db, const string &key, uint64_t level, CheckTr
             case INTERMEDIATE:
             {
                 checkTreeCounters.intermediateNodes++;
-                result = CheckTree64(db, fea2string(db.fr, treeChunk.getChild(i).intermediate.hash), level+1, checkTreeCounters);
+                result = CheckTree64(db, fea2string(fr, treeChunk.getChild(i).intermediate.hash), level+1, checkTreeCounters);
                 if (zkr != ZKR_SUCCESS)
                 {
                     return zkr;