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

Merge pull request #561

Browse source 
ffcf6bd BlockchainLMDB: When removing, find amount output index fast by starting at end (warptangent)
f11def0 BlockchainLMDB: Remove tx outputs in reverse order (warptangent)
This commit is contained in:
Riccardo Spagni 2015-12-25 21:48:48 +02:00
commit 6f71918a12
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/blockchain_db/lmdb/db_lmdb.cpp
View file

@ -722,15 +722,15 @@ void BlockchainLMDB::remove_tx_outputs(const crypto::hash& tx_hash, const transa
size_t num_elems = 0; size_t num_elems = 0;
mdb_cursor_count(cur, &num_elems); mdb_cursor_count(cur, &num_elems);
mdb_cursor_get(cur, &k, &v, MDB_FIRST_DUP); mdb_cursor_get(cur, &k, &v, MDB_LAST_DUP);
for (uint64_t i = 0; i < num_elems; ++i) 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(*(const uint64_t*)v.mv_data, tx_output.amount); remove_output(*(const uint64_t*)v.mv_data, tx_output.amount);
if (i < num_elems - 1) if (i > 1)
{ {
mdb_cursor_get(cur, &k, &v, MDB_NEXT_DUP); mdb_cursor_get(cur, &k, &v, MDB_PREV_DUP);
} }
} }
} }
@ -806,22 +806,23 @@ void BlockchainLMDB::remove_amount_output_index(const uint64_t amount, const uin
size_t num_elems = 0; size_t num_elems = 0;
mdb_cursor_count(cur, &num_elems); mdb_cursor_count(cur, &num_elems);
mdb_cursor_get(cur, &k, &v, MDB_FIRST_DUP); mdb_cursor_get(cur, &k, &v, MDB_LAST_DUP);
uint64_t amount_output_index = 0; uint64_t amount_output_index = 0;
uint64_t goi = 0; uint64_t goi = 0;
bool found_index = false; bool found_index = false;
for (uint64_t i = 0; i < num_elems; ++i) for (uint64_t i = num_elems; i > 0; --i)
{ {
mdb_cursor_get(cur, &k, &v, MDB_GET_CURRENT); mdb_cursor_get(cur, &k, &v, MDB_GET_CURRENT);
goi = *(const uint64_t *)v.mv_data; goi = *(const uint64_t *)v.mv_data;
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;
} }
mdb_cursor_get(cur, &k, &v, MDB_NEXT_DUP); if (i > 1)
mdb_cursor_get(cur, &k, &v, MDB_PREV_DUP);
} }
if (found_index) if (found_index)
{ {