dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

clear_send_ids in vacuum/snapshot is using wrong txn object (#3146)

Browse source 
* clear_send_ids in vacuum is using wrong txn object
* Make parameter const
This commit is contained in:
Wesley Shillingford 2021-03-16 16:25:36 +00:00 • committed by GitHub
commit af2c6a9011
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nano/node/cli.cpp
View file

@ -9,7 +9,7 @@
namespace namespace
{ {
void reset_confirmation_heights (nano::write_transaction & transaction, nano::block_store & store); void reset_confirmation_heights (nano::write_transaction const & transaction, nano::block_store & store);
bool is_using_rocksdb (boost::filesystem::path const & data_path, boost::program_options::variables_map const & vm, std::error_code & ec); bool is_using_rocksdb (boost::filesystem::path const & data_path, boost::program_options::variables_map const & vm, std::error_code & ec);
} }
@ -209,7 +209,7 @@ void database_write_lock_error (std::error_code & ec)
bool copy_database (boost::filesystem::path const & data_path, boost::program_options::variables_map const & vm, boost::filesystem::path const & output_path, std::error_code & ec) bool copy_database (boost::filesystem::path const & data_path, boost::program_options::variables_map const & vm, boost::filesystem::path const & output_path, std::error_code & ec)
{ {
bool success = false; bool success = false;
bool needs_to_write = vm.count ("unchecked_clear") || vm.count ("clear_send_ids") || vm.count ("online_weight_clear") || vm.count ("peer_clear") || vm.count ("confirmation_height_clear") || vm.count ("final_vote_clear") || vm.count ("rebuild_database") || vm.count ("vacuum"); bool needs_to_write = vm.count ("unchecked_clear") || vm.count ("clear_send_ids") || vm.count ("online_weight_clear") || vm.count ("peer_clear") || vm.count ("confirmation_height_clear") || vm.count ("final_vote_clear") || vm.count ("rebuild_database");
auto node_flags = nano::inactive_node_flag_defaults (); auto node_flags = nano::inactive_node_flag_defaults ();
node_flags.read_only = !needs_to_write; node_flags.read_only = !needs_to_write;
@ -217,34 +217,34 @@ bool copy_database (boost::filesystem::path const & data_path, boost::program_op
nano::inactive_node node (data_path, node_flags); nano::inactive_node node (data_path, node_flags);
if (!node.node->init_error ()) if (!node.node->init_error ())
{ {
auto transaction (node.node->store.tx_begin_write ()); auto & store (node.node->store);
if (vm.count ("unchecked_clear")) if (vm.count ("unchecked_clear"))
{ {
node.node->store.unchecked_clear (transaction); node.node->store.unchecked_clear (store.tx_begin_write ());
} }
if (vm.count ("clear_send_ids")) if (vm.count ("clear_send_ids"))
{ {
node.node->wallets.clear_send_ids (transaction); node.node->wallets.clear_send_ids (node.node->wallets.tx_begin_write ());
} }
if (vm.count ("online_weight_clear")) if (vm.count ("online_weight_clear"))
{ {
node.node->store.online_weight_clear (transaction); node.node->store.online_weight_clear (store.tx_begin_write ());
} }
if (vm.count ("peer_clear")) if (vm.count ("peer_clear"))
{ {
node.node->store.peer_clear (transaction); node.node->store.peer_clear (store.tx_begin_write ());
} }
if (vm.count ("confirmation_height_clear")) if (vm.count ("confirmation_height_clear"))
{ {
reset_confirmation_heights (transaction, node.node->store); reset_confirmation_heights (store.tx_begin_write (), store);
} }
if (vm.count ("final_vote_clear")) if (vm.count ("final_vote_clear"))
{ {
node.node->store.final_vote_clear (transaction); node.node->store.final_vote_clear (store.tx_begin_write ());
} }
if (vm.count ("rebuild_database")) if (vm.count ("rebuild_database"))
{ {
node.node->store.rebuild_db (transaction); node.node->store.rebuild_db (store.tx_begin_write ());
} }
success = node.node->copy_with_compaction (output_path); success = node.node->copy_with_compaction (output_path);
@ -1300,7 +1300,7 @@ std::unique_ptr<nano::inactive_node> nano::default_inactive_node (boost::filesys
namespace namespace
{ {
void reset_confirmation_heights (nano::write_transaction & transaction, nano::block_store & store) void reset_confirmation_heights (nano::write_transaction const & transaction, nano::block_store & store)
{ {
// First do a clean sweep // First do a clean sweep
store.confirmation_height_clear (transaction); store.confirmation_height_clear (transaction);