From bafc8da08d2a0ece54ac443aa4569974b319cccb Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 15 Jan 2014 03:01:33 +0400 Subject: [PATCH] Checkpoint object replacement with std::pair & support for incompatible database removal --- src/checkpoints.cpp | 41 ++++++++++----------------------- src/txdb-leveldb.cpp | 61 ++++++++++++++++++++++++++++++++++++++++++------- src/version.h | 2 +- 3 files changed, 66 insertions(+), 38 deletions(-) diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index b986de8..65451d1 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -13,22 +13,7 @@ namespace Checkpoints { - struct Checkpoint - { - uint256 hashCheckPoint; - unsigned int nTime; - }; - - typedef std::map MapCheckpoints; - - Checkpoint initCheckpoint(uint256 hashCheckPoint, unsigned int nTime) - { - Checkpoint item; - item.hashCheckPoint = hashCheckPoint; - item.nTime = nTime; - - return item; - } + typedef std::map > MapCheckpoints; // // What makes a good checkpoint block? @@ -39,18 +24,18 @@ namespace Checkpoints // static MapCheckpoints mapCheckpoints = boost::assign::map_list_of - ( 0, initCheckpoint(hashGenesisBlock, 1360105017) ) - ( 9690, initCheckpoint(uint256("0x00000000026561450859c46868099e0df6068a538f038cb18988fd8d47dcdaf5"), 1362791423) ) - ( 13560, initCheckpoint(uint256("0xa1591a0fcbf11f282d671581edb9f0aadcd06fee69761081e0a3245914c13729"), 1364674052) ) - ( 37092, initCheckpoint(uint256("0x0000000000a38c2f98556f46793b453e92d8fab2d31c0b93fd08bcf78e56099d"), 1376677203) ) - ( 44200, initCheckpoint(uint256("0xc9bda7232a18b9c1f5ff974a9e5566b2d1879ceb8fc0e9e61fba9038a25b8447"), 1380145962) ) - ( 65000, initCheckpoint(uint256("0xfb2b51a2fd65062c98a7a6053cde46aeaefebb95ba2f680e85a29ee25b1dcf05"), 1388526385) ) + ( 0, std::make_pair(hashGenesisBlock, 1360105017) ) + ( 9690, std::make_pair(uint256("0x00000000026561450859c46868099e0df6068a538f038cb18988fd8d47dcdaf5"), 1362791423) ) + ( 13560, std::make_pair(uint256("0xa1591a0fcbf11f282d671581edb9f0aadcd06fee69761081e0a3245914c13729"), 1364674052) ) + ( 37092, std::make_pair(uint256("0x0000000000a38c2f98556f46793b453e92d8fab2d31c0b93fd08bcf78e56099d"), 1376677203) ) + ( 44200, std::make_pair(uint256("0xc9bda7232a18b9c1f5ff974a9e5566b2d1879ceb8fc0e9e61fba9038a25b8447"), 1380145962) ) + ( 65000, std::make_pair(uint256("0xfb2b51a2fd65062c98a7a6053cde46aeaefebb95ba2f680e85a29ee25b1dcf05"), 1388526385) ) ; // TestNet has no checkpoints static MapCheckpoints mapCheckpointsTestnet = boost::assign::map_list_of - ( 0, initCheckpoint(hashGenesisBlockTestNet, 1360105017) ) + ( 0, std::make_pair(hashGenesisBlockTestNet, 1360105017) ) ; bool CheckHardened(int nHeight, const uint256& hash) @@ -59,7 +44,7 @@ namespace Checkpoints MapCheckpoints::const_iterator i = checkpoints.find(nHeight); if (i == checkpoints.end()) return true; - return hash == i->second.hashCheckPoint; + return hash == i->second.first; } int GetTotalBlocksEstimate() @@ -73,7 +58,7 @@ namespace Checkpoints { MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints); - return checkpoints.rbegin()->second.nTime; + return checkpoints.rbegin()->second.second; } CBlockIndex* GetLastCheckpoint(const std::map& mapBlockIndex) @@ -82,7 +67,7 @@ namespace Checkpoints BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, checkpoints) { - const uint256& hash = i.second.hashCheckPoint; + const uint256& hash = i.second.first; std::map::const_iterator t = mapBlockIndex.find(hash); if (t != mapBlockIndex.end()) return t->second; @@ -266,7 +251,7 @@ namespace Checkpoints bool ResetSyncCheckpoint() { LOCK(cs_hashSyncCheckpoint); - const uint256& hash = mapCheckpoints.rbegin()->second.hashCheckPoint; + const uint256& hash = mapCheckpoints.rbegin()->second.first; if (mapBlockIndex.count(hash) && !mapBlockIndex[hash]->IsInMainChain()) { // checkpoint block accepted but not yet in main chain @@ -290,7 +275,7 @@ namespace Checkpoints BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints) { - const uint256& hash = i.second.hashCheckPoint; + const uint256& hash = i.second.first; if (mapBlockIndex.count(hash) && mapBlockIndex[hash]->IsInMainChain()) { if (!WriteSyncCheckpoint(hash)) diff --git a/src/txdb-leveldb.cpp b/src/txdb-leveldb.cpp index 504f7e6..8367665 100644 --- a/src/txdb-leveldb.cpp +++ b/src/txdb-leveldb.cpp @@ -33,6 +33,36 @@ static leveldb::Options GetOptions() { return options; } +void init_blockindex(leveldb::Options& options, bool fRemoveOld = false) { + // First time init. + filesystem::path directory = GetDataDir() / "txleveldb"; + + if (fRemoveOld) { + filesystem::remove_all(directory); // remove directory + unsigned int nFile = 1; + + while (true) + { + filesystem::path strBlockFile = GetDataDir() / strprintf("blk%04u.dat", nFile); + + // Break if no such file + if( !filesystem::exists( strBlockFile ) ) + break; + + filesystem::remove(strBlockFile); + + nFile++; + } + } + + filesystem::create_directory(directory); + printf("Opening LevelDB in %s\n", directory.string().c_str()); + leveldb::Status status = leveldb::DB::Open(options, directory.string(), &txdb); + if (!status.ok()) { + throw runtime_error(strprintf("init_blockindex(): error opening database environment %s", status.ToString().c_str())); + } +} + // CDB subclasses are created and destroyed VERY OFTEN. That's why // we shouldn't treat this as a free operations. CTxDB::CTxDB(const char* pszMode) @@ -46,27 +76,40 @@ CTxDB::CTxDB(const char* pszMode) return; } - // First time init. - filesystem::path directory = GetDataDir() / "txleveldb"; bool fCreate = strchr(pszMode, 'c'); options = GetOptions(); options.create_if_missing = fCreate; options.filter_policy = leveldb::NewBloomFilterPolicy(10); - filesystem::create_directory(directory); - printf("Opening LevelDB in %s\n", directory.string().c_str()); - leveldb::Status status = leveldb::DB::Open(options, directory.string(), &txdb); - if (!status.ok()) { - throw runtime_error(strprintf("CDB(): error opening database environment %s", status.ToString().c_str())); - } + + init_blockindex(options); // Init directory pdb = txdb; if (Exists(string("version"))) { ReadVersion(nVersion); printf("Transaction index version is %d\n", nVersion); + + if (nVersion < DATABASE_VERSION) + { + printf("Required index version is %d, removing old database\n", DATABASE_VERSION); + + // Leveldb instance destruction + delete txdb; + txdb = pdb = NULL; + delete activeBatch; + activeBatch = NULL; + + init_blockindex(options, true); // Remove directory and create new database + pdb = txdb; + + bool fTmp = fReadOnly; + fReadOnly = false; + WriteVersion(DATABASE_VERSION); // Save transaction index version + fReadOnly = fTmp; + } } - else if(fCreate) + else if (fCreate) { bool fTmp = fReadOnly; fReadOnly = false; diff --git a/src/version.h b/src/version.h index 45c66db..e53f179 100644 --- a/src/version.h +++ b/src/version.h @@ -24,7 +24,7 @@ extern const std::string CLIENT_DATE; // // database format versioning // -static const int DATABASE_VERSION = 60011; +static const int DATABASE_VERSION = 70505; // // network protocol versioning -- 1.7.1