Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

lmdb touchup && OutputsByUnlockBlock map -> unordered_map

Browse Source
This commit is contained in:
j-berman 2024-08-13 09:24:43 -07:00
parent 83d56597e2
commit 67f5546d10
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,14 +882,16 @@ void BlockchainLMDB::add_block(const block& blk, size_t block_weight, uint64_t l
CURSOR(locked_outputs) CURSOR(locked_outputs)
// Add the locked outputs from this block to the locked outputs table // Add the locked outputs from this block to the locked outputs table
for (const auto &locked_output : outs_by_unlock_block) for (const auto &unlock_block : outs_by_unlock_block)
{ {
MDB_val_set(k_block_id, locked_output.first); MDB_val_set(k_block_id, unlock_block.first);
MDB_val_set(v_output, locked_output.second); for (const auto &locked_output : unlock_block.second)
{
result = mdb_cursor_put(m_cur_locked_outputs, &k_block_id, &v_output, MDB_APPENDDUP); MDB_val_set(v_output, locked_output);
if (result != MDB_SUCCESS) result = mdb_cursor_put(m_cur_locked_outputs, &k_block_id, &v_output, MDB_APPENDDUP);
throw0(DB_ERROR(lmdb_error("Failed to add locked output: ", result).c_str())); if (result != MDB_SUCCESS)
throw0(DB_ERROR(lmdb_error("Failed to add locked output: ", result).c_str()));
}
} }
// we use weight as a proxy for size, since we don't have size but weight is >= size // we use weight as a proxy for size, since we don't have size but weight is >= size
@ -6718,14 +6720,12 @@ void BlockchainLMDB::migrate_5_6()
result = mdb_txn_begin(m_env, NULL, 0, txn); result = mdb_txn_begin(m_env, NULL, 0, txn);
if (result) if (result)
throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", result).c_str())); throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", result).c_str()));
lmdb_db_open(txn, LMDB_LOCKED_OUTPUTS, MDB_INTEGERKEY | MDB_DUPSORT | MDB_DUPFIXED | MDB_CREATE, m_locked_outputs, "Failed to open db handle for m_locked_outputs");
mdb_set_dupsort(txn, m_locked_outputs, compare_uint64);
lmdb_db_open(txn, "tmp_last_output", MDB_INTEGERKEY | MDB_CREATE, m_tmp_last_output, "Failed to open db handle for m_tmp_last_output"); lmdb_db_open(txn, "tmp_last_output", MDB_INTEGERKEY | MDB_CREATE, m_tmp_last_output, "Failed to open db handle for m_tmp_last_output");
txn.commit(); txn.commit();
if (!m_batch_transactions) if (!m_batch_transactions)
set_batch_transactions(true); set_batch_transactions(true);
const std::size_t BATCH_SIZE = 1000; const std::size_t BATCH_SIZE = 10000;
batch_start(BATCH_SIZE); batch_start(BATCH_SIZE);
txn.m_txn = m_write_txn->m_txn; txn.m_txn = m_write_txn->m_txn;
@ -6790,7 +6790,8 @@ void BlockchainLMDB::migrate_5_6()
if (result != MDB_NOTFOUND) if (result != MDB_NOTFOUND)
{ {
cached_last_o = *(const tmp_output_cache*)v_last_output.mv_data; cached_last_o = *(const tmp_output_cache*)v_last_output.mv_data;
MDEBUG("Found cached output " << cached_last_o.ok.output_id); MDEBUG("Found cached output " << cached_last_o.ok.output_id
<< ", migrated " << cached_last_o.n_outputs_read << " outputs already");
found_cached_output = true; found_cached_output = true;
// Set k and v so we can continue the migration from that output // Set k and v so we can continue the migration from that output
@ -6876,8 +6877,9 @@ void BlockchainLMDB::migrate_5_6()
MDB_val_set(k_block_id, unlock_block); MDB_val_set(k_block_id, unlock_block);
MDB_val_set(v_output, output_context); MDB_val_set(v_output, output_context);
// Can't use MDB_APPENDDUP because outputs aren't inserted in order sorted by unlock height // MDB_NODUPDATA because all output id's should be unique
result = mdb_cursor_put(c_locked_outputs, &k_block_id, &v_output, 0); // Can't use MDB_APPENDDUP because outputs aren't inserted in order sorted by output_id
result = mdb_cursor_put(c_locked_outputs, &k_block_id, &v_output, MDB_NODUPDATA);
if (result != MDB_SUCCESS) if (result != MDB_SUCCESS)
throw0(DB_ERROR(lmdb_error("Failed to add locked output: ", result).c_str())); throw0(DB_ERROR(lmdb_error("Failed to add locked output: ", result).c_str()));
} }

2
src/fcmp_pp/curve_trees.h
View File

@ -153,7 +153,7 @@ struct OutputContext final
static_assert(sizeof(OutputPair) == (32+32), "db expects 64 bytes for output pairs"); static_assert(sizeof(OutputPair) == (32+32), "db expects 64 bytes for output pairs");
static_assert(sizeof(OutputContext) == (8+32+32), "db expects 72 bytes for output context"); static_assert(sizeof(OutputContext) == (8+32+32), "db expects 72 bytes for output context");
using OutputsByUnlockBlock = std::map<uint64_t, std::vector<OutputContext>>; using OutputsByUnlockBlock = std::unordered_map<uint64_t, std::vector<OutputContext>>;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------

2
tests/unit_tests/hardfork.cpp
View File

@ -55,7 +55,7 @@ public:
, const uint64_t& coins_generated , const uint64_t& coins_generated
, uint64_t num_rct_outs , uint64_t num_rct_outs
, const crypto::hash& blk_hash , const crypto::hash& blk_hash
, const fcmp_pp::curve_trees::OutputsByUnlockBlock &outs_by_unlock_block , const fcmp_pp::curve_trees::OutputsByUnlockBlock& outs_by_unlock_block
) override { ) override {
blocks.push_back(blk); blocks.push_back(blk);
} }