Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3987

Browse Source 
2d10830 db_ldmb: print db version when complaining about incompatibility (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-27 16:23:17 -05:00
commit cbfa0a2a7e
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@ -1306,20 +1306,21 @@ void BlockchainLMDB::open(const std::string& filename, const int db_flags)
auto get_result = mdb_get(txn, m_properties, &k, &v); auto get_result = mdb_get(txn, m_properties, &k, &v);
if(get_result == MDB_SUCCESS) if(get_result == MDB_SUCCESS)
{ {
if (*(const uint32_t*)v.mv_data > VERSION) const uint32_t db_version = *(const uint32_t*)v.mv_data;
if (db_version > VERSION)
{ {
MWARNING("Existing lmdb database was made by a later version. We don't know how it will change yet."); MWARNING("Existing lmdb database was made by a later version (" << db_version << "). We don't know how it will change yet.");
compatible = false; compatible = false;
} }
#if VERSION > 0 #if VERSION > 0
else if (*(const uint32_t*)v.mv_data < VERSION) else if (db_version < VERSION)
{ {
// Note that there was a schema change within version 0 as well. // Note that there was a schema change within version 0 as well.
// See commit e5d2680094ee15889934fe28901e4e133cda56f2 2015/07/10 // See commit e5d2680094ee15889934fe28901e4e133cda56f2 2015/07/10
// We don't handle the old format previous to that commit. // We don't handle the old format previous to that commit.
txn.commit(); txn.commit();
m_open = true; m_open = true;
migrate(*(const uint32_t *)v.mv_data); migrate(db_version);
return; return;
} }
#endif #endif