gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-14 13:56:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #415

Browse Source 
180bcde build: default to Berkeley DB for 32 bit and ARM (moneromooo-monero)
791d8cb db_bdb: fix hard fork keys (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2015-10-06 10:50:20 +02:00
parent ad1c3a715b 180bcde866
commit 2ce54a0d3e
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blockchain_db/berkeleydb/db_bdb.cpp
View File

@@ -1865,7 +1865,7 @@ void BlockchainBDB::set_hard_fork_starting_height(uint8_t version, uint64_t heig
LOG_PRINT_L3("BlockchainBDB::" << __func__);
check_open();
Dbt_copy<uint8_t> val_key(version);
Dbt_copy<uint32_t> val_key(version + 1);
Dbt_copy<uint64_t> val(height);
if (m_hf_starting_heights->put(DB_DEFAULT_TX, &val_key, &val, 0))
throw1(DB_ERROR("Error adding hard fork starting height to db transaction."));
@@ -1876,7 +1876,7 @@ uint64_t BlockchainBDB::get_hard_fork_starting_height(uint8_t version) const
LOG_PRINT_L3("BlockchainBDB::" << __func__);
check_open();
Dbt_copy<uint8_t> key(version);
Dbt_copy<uint32_t> key(version + 1);
Dbt_copy<uint64_t> result;
auto get_result = m_hf_starting_heights->get(DB_DEFAULT_TX, &key, &result, 0);
@@ -1893,7 +1893,7 @@ void BlockchainBDB::set_hard_fork_version(uint64_t height, uint8_t version)
LOG_PRINT_L3("BlockchainBDB::" << __func__);
check_open();
Dbt_copy<uint64_t> val_key(height);
Dbt_copy<uint32_t> val_key(height + 1);
Dbt_copy<uint8_t> val(version);
if (m_hf_versions->put(DB_DEFAULT_TX, &val_key, &val, 0))
throw1(DB_ERROR("Error adding hard fork version to db transaction."));
@@ -1904,7 +1904,7 @@ uint8_t BlockchainBDB::get_hard_fork_version(uint64_t height) const
LOG_PRINT_L3("BlockchainBDB::" << __func__);
check_open();
Dbt_copy<uint64_t> key(height);
Dbt_copy<uint32_t> key(height + 1);
Dbt_copy<uint8_t> result;
auto get_result = m_hf_versions->get(DB_DEFAULT_TX, &key, &result, 0);

2
src/daemon/command_line_args.h
View File

@@ -73,7 +73,7 @@ namespace daemon_args
const command_line::arg_descriptor<std::string> arg_db_type = {
"db-type"
, "Specify database type"
, "lmdb"
, DEFAULT_DB_TYPE
};
const command_line::arg_descriptor<uint64_t> arg_prep_blocks_threads = {
"prep-blocks-threads"