highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-13 20:16:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Force on-the-fly compaction during pertxout upgrade

Browse Source
This commit is contained in:
Pieter Wuille
2017-06-02 17:52:37 -07:00
parent 0c70e845aa
commit efeb273305
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/txdb.cpp
View File

@ -375,12 +375,13 @@ bool CCoinsViewDB::Upgrade() {
CDBBatch batch(db);
uiInterface.SetProgressBreakAction(StartShutdown);
int reportDone = 0;
std::pair<unsigned char, uint256> key;
std::pair<unsigned char, uint256> prev_key = {DB_COINS, uint256()};
while (pcursor->Valid()) {
boost::this_thread::interruption_point();
if (ShutdownRequested()) {
break;
}
std::pair<unsigned char, uint256> key;
if (pcursor->GetKey(key) && key.first == DB_COINS) {
if (count++ % 256 == 0) {
uint32_t high = 0x100 * *key.second.begin() + *(key.second.begin() + 1);
@ -409,6 +410,8 @@ bool CCoinsViewDB::Upgrade() {
if (batch.SizeEstimate() > batch_size) {
db.WriteBatch(batch);
batch.Clear();
db.CompactRange(prev_key, key);
prev_key = key;
}
pcursor->Next();
} else {
@ -416,6 +419,7 @@ bool CCoinsViewDB::Upgrade() {
}
}
db.WriteBatch(batch);
db.CompactRange({DB_COINS, uint256()}, key);
uiInterface.SetProgressBreakAction(std::function<void(void)>());
LogPrintf("[%s].\n", ShutdownRequested() ? "CANCELLED" : "DONE");
return true;