kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #628

Browse source 
b8cc6d4 BlockchainBDB: Continue when tx has no outputs (warptangent)
b870746 BlockchainBDB: When removing, find amount output index fast by starting at end (warptangent)
1a5c3fa BlockchainBDB: Remove tx outputs in reverse order (warptangent)
This commit is contained in:
Riccardo Spagni 2016-01-29 19:23:48 +02:00
commit bfb907c704
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/blockchain_db/berkeleydb/db_bdb.cpp
View file

@ -354,9 +354,11 @@ void BlockchainBDB::remove_transaction_data(const crypto::hash& tx_hash, const t
remove_tx_outputs(tx_hash, tx); remove_tx_outputs(tx_hash, tx);
if (m_tx_outputs->del(DB_DEFAULT_TX, &val_h, 0)) auto result = m_tx_outputs->del(DB_DEFAULT_TX, &val_h, 0);
if (result == DB_NOTFOUND)
LOG_PRINT_L1("tx has no outputs to remove: " << tx_hash);
else if (result)
throw1(DB_ERROR("Failed to add removal of tx outputs to db transaction")); throw1(DB_ERROR("Failed to add removal of tx outputs to db transaction"));
} }
void BlockchainBDB::add_output(const crypto::hash& tx_hash, const tx_out& tx_output, const uint64_t& local_index, const uint64_t unlock_time) void BlockchainBDB::add_output(const crypto::hash& tx_hash, const tx_out& tx_output, const uint64_t& local_index, const uint64_t unlock_time)
@ -411,7 +413,7 @@ void BlockchainBDB::remove_tx_outputs(const crypto::hash& tx_hash, const transac
auto result = cur->get(&k, &v, DB_SET); auto result = cur->get(&k, &v, DB_SET);
if (result == DB_NOTFOUND) if (result == DB_NOTFOUND)
{ {
throw0(OUTPUT_DNE("Attempting to remove a tx's outputs, but none found.")); LOG_PRINT_L2("tx has no outputs, so no global output indices");
} }
else if (result) else if (result)
{ {
@ -419,16 +421,26 @@ void BlockchainBDB::remove_tx_outputs(const crypto::hash& tx_hash, const transac
} }
else else
{ {
result = cur->get(&k, &v, DB_NEXT_NODUP);
if (result != 0 && result != DB_NOTFOUND)
throw0(DB_ERROR("DB error attempting to get next non-duplicate tx hash"));
if (result == 0)
result = cur->get(&k, &v, DB_PREV);
else if (result == DB_NOTFOUND)
result = cur->get(&k, &v, DB_LAST);
db_recno_t num_elems = 0; db_recno_t num_elems = 0;
cur->count(&num_elems, 0); cur->count(&num_elems, 0);
for (uint64_t i = 0; i < num_elems; ++i) // remove in order: from newest to oldest
for (uint64_t i = num_elems; i > 0; --i)
{ {
const tx_out tx_output = tx.vout[i]; const tx_out tx_output = tx.vout[i-1];
remove_output(v, tx_output.amount); remove_output(v, tx_output.amount);
if (i < num_elems - 1) if (i > 1)
{ {
cur->get(&k, &v, DB_NEXT_DUP); cur->get(&k, &v, DB_PREV_DUP);
} }
} }
} }
@ -504,20 +516,43 @@ void BlockchainBDB::remove_amount_output_index(const uint64_t amount, const uint
db_recno_t num_elems = 0; db_recno_t num_elems = 0;
cur->count(&num_elems, 0); cur->count(&num_elems, 0);
// workaround for Berkeley DB to start at end of k's duplicate list:
// if next key exists:
// - move cursor to start of next key's duplicate list, then move back one
// duplicate element to reach the end of the original key's duplicate
// list.
//
// else if the next key doesn't exist:
// - that means we're already on the last key.
// - move cursor to last element in the db, which is the last element of
// the desired key's duplicate list.
result = cur->get(&k, &v, DB_NEXT_NODUP);
if (result != 0 && result != DB_NOTFOUND)
throw0(DB_ERROR("DB error attempting to get next non-duplicate output amount"));
if (result == 0)
result = cur->get(&k, &v, DB_PREV);
else if (result == DB_NOTFOUND)
result = cur->get(&k, &v, DB_LAST);
bool found_index = false;
uint64_t amount_output_index = 0; uint64_t amount_output_index = 0;
uint64_t goi = 0; uint64_t goi = 0;
bool found_index = false;
for (uint64_t i = 0; i < num_elems; ++i) for (uint64_t i = num_elems; i > 0; --i)
{ {
goi = v; goi = v;
if (goi == global_output_index) if (goi == global_output_index)
{ {
amount_output_index = i; amount_output_index = i-1;
found_index = true; found_index = true;
break; break;
} }
cur->get(&k, &v, DB_NEXT_DUP); if (i > 1)
cur->get(&k, &v, DB_PREV_DUP);
} }
if (found_index) if (found_index)
{ {
// found the amount output index // found the amount output index