4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-15 04:46:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add batch support to BlockchainLMDB::get_output_key

Browse Source 
This allows blockchain_import to work with batch and verify modes enabled
(the default).
This commit is contained in:
warptangent 2015-07-15 07:21:48 -07:00
parent 94ea3e8ed2
commit 71793ef43f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2293,16 +2293,21 @@ void BlockchainLMDB::get_output_key(const uint64_t &amount, const std::vector<ui
if (global_indices.size() > 0) if (global_indices.size() > 0)
{ {
mdb_txn_safe txn; mdb_txn_safe txn;
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn)) mdb_txn_safe* txn_ptr = &txn;
throw0(DB_ERROR("Failed to create a transaction for the db")); if (m_batch_active)
txn_ptr = m_write_txn;
else
{
if (mdb_txn_begin(m_env, NULL, MDB_RDONLY, txn))
throw0(DB_ERROR("Failed to create a transaction for the db"));
}
for (const uint64_t &index : global_indices) for (const uint64_t &index : global_indices)
{ {
MDB_val_copy<uint64_t> k(index); MDB_val_copy<uint64_t> k(index);
MDB_val v; MDB_val v;
auto get_result = mdb_get(txn, m_output_keys, &k, &v); auto get_result = mdb_get(*txn_ptr, m_output_keys, &k, &v);
if (get_result != 0) if (get_result != 0)
throw0(DB_ERROR("Attempting to get output pubkey by global index, but key does not exist")); throw0(DB_ERROR("Attempting to get output pubkey by global index, but key does not exist"));
else if (get_result) else if (get_result)
@ -2312,7 +2317,8 @@ void BlockchainLMDB::get_output_key(const uint64_t &amount, const std::vector<ui
outputs.push_back(data); outputs.push_back(data);
} }
txn.commit(); if (!m_batch_active)
txn.commit();
} }
TIME_MEASURE_FINISH(db3); TIME_MEASURE_FINISH(db3);