From aa167a34cef236d5cf0ae890d5932869c4fe0e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:23:55 +0200 Subject: [PATCH] Remove unnecessary transaction constness --- nano/store/lmdb/lmdb.cpp | 38 +++++++++++++++++----------------- nano/store/lmdb/lmdb.hpp | 6 +++--- nano/store/rocksdb/rocksdb.cpp | 30 +++++++++++++-------------- nano/store/rocksdb/rocksdb.hpp | 8 +++---- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/nano/store/lmdb/lmdb.cpp b/nano/store/lmdb/lmdb.cpp index d25aaa52..6c3c5a79 100644 --- a/nano/store/lmdb/lmdb.cpp +++ b/nano/store/lmdb/lmdb.cpp @@ -209,10 +209,10 @@ void nano::store::lmdb::component::open_databases (bool & error_a, store::transa error_a |= mdb_dbi_open (env.tx (transaction_a), "rep_weights", flags, &rep_weight_store.rep_weights_handle) != 0; } -bool nano::store::lmdb::component::do_upgrades (store::write_transaction & transaction_a, nano::ledger_constants & constants, bool & needs_vacuuming) +bool nano::store::lmdb::component::do_upgrades (store::write_transaction & transaction, nano::ledger_constants & constants, bool & needs_vacuuming) { auto error (false); - auto version_l = version.get (transaction_a); + auto version_l = version.get (transaction); if (version_l < version_minimum) { logger.critical (nano::log::type::lmdb, "The version of the ledger ({}) is lower than the minimum ({}) which is supported for upgrades. Either upgrade a node first or delete the ledger.", version_l, version_minimum); @@ -221,13 +221,13 @@ bool nano::store::lmdb::component::do_upgrades (store::write_transaction & trans switch (version_l) { case 21: - upgrade_v21_to_v22 (transaction_a); + upgrade_v21_to_v22 (transaction); [[fallthrough]]; case 22: - upgrade_v22_to_v23 (transaction_a); + upgrade_v22_to_v23 (transaction); [[fallthrough]]; case 23: - upgrade_v23_to_v24 (transaction_a); + upgrade_v23_to_v24 (transaction); [[fallthrough]]; case 24: break; @@ -239,24 +239,24 @@ bool nano::store::lmdb::component::do_upgrades (store::write_transaction & trans return error; } -void nano::store::lmdb::component::upgrade_v21_to_v22 (store::write_transaction const & transaction_a) +void nano::store::lmdb::component::upgrade_v21_to_v22 (store::write_transaction & transaction) { logger.info (nano::log::type::lmdb, "Upgrading database from v21 to v22..."); MDB_dbi unchecked_handle{ 0 }; - release_assert (!mdb_dbi_open (env.tx (transaction_a), "unchecked", MDB_CREATE, &unchecked_handle)); - release_assert (!mdb_drop (env.tx (transaction_a), unchecked_handle, 1)); // del = 1, to delete it from the environment and close the DB handle. - version.put (transaction_a, 22); + release_assert (!mdb_dbi_open (env.tx (transaction), "unchecked", MDB_CREATE, &unchecked_handle)); + release_assert (!mdb_drop (env.tx (transaction), unchecked_handle, 1)); // del = 1, to delete it from the environment and close the DB handle. + version.put (transaction, 22); logger.info (nano::log::type::lmdb, "Upgrading database from v21 to v22 completed"); } // Fill rep_weights table with all existing representatives and their vote weight -void nano::store::lmdb::component::upgrade_v22_to_v23 (store::write_transaction const & transaction_a) +void nano::store::lmdb::component::upgrade_v22_to_v23 (store::write_transaction & transaction) { logger.info (nano::log::type::lmdb, "Upgrading database from v22 to v23..."); - drop (transaction_a, tables::rep_weights); - auto i{ make_iterator (transaction_a, tables::accounts) }; + drop (transaction, tables::rep_weights); + auto i{ make_iterator (transaction, tables::accounts) }; auto end{ store::iterator (nullptr) }; uint64_t processed_accounts = 0; for (; i != end; ++i) @@ -265,13 +265,13 @@ void nano::store::lmdb::component::upgrade_v22_to_v23 (store::write_transaction { nano::uint128_t total{ 0 }; nano::store::lmdb::db_val value; - auto status = get (transaction_a, tables::rep_weights, i->second.representative, value); + auto status = get (transaction, tables::rep_weights, i->second.representative, value); if (success (status)) { total = nano::amount{ value }.number (); } total += i->second.balance.number (); - status = put (transaction_a, tables::rep_weights, i->second.representative, nano::amount{ total }); + status = put (transaction, tables::rep_weights, i->second.representative, nano::amount{ total }); release_assert_success (status); } processed_accounts++; @@ -281,18 +281,18 @@ void nano::store::lmdb::component::upgrade_v22_to_v23 (store::write_transaction } } logger.info (nano::log::type::lmdb, "Processed {} accounts", processed_accounts); - version.put (transaction_a, 23); + version.put (transaction, 23); logger.info (nano::log::type::lmdb, "Upgrading database from v22 to v23 completed"); } -void nano::store::lmdb::component::upgrade_v23_to_v24 (store::write_transaction const & transaction_a) +void nano::store::lmdb::component::upgrade_v23_to_v24 (store::write_transaction & transaction) { logger.info (nano::log::type::lmdb, "Upgrading database from v23 to v24..."); MDB_dbi frontiers_handle{ 0 }; - release_assert (!mdb_dbi_open (env.tx (transaction_a), "frontiers", MDB_CREATE, &frontiers_handle)); - release_assert (!mdb_drop (env.tx (transaction_a), frontiers_handle, 1)); // del = 1, to delete it from the environment and close the DB handle. - version.put (transaction_a, 24); + release_assert (!mdb_dbi_open (env.tx (transaction), "frontiers", MDB_CREATE, &frontiers_handle)); + release_assert (!mdb_drop (env.tx (transaction), frontiers_handle, 1)); // del = 1, to delete it from the environment and close the DB handle. + version.put (transaction, 24); logger.info (nano::log::type::lmdb, "Upgrading database from v23 to v24 completed"); } diff --git a/nano/store/lmdb/lmdb.hpp b/nano/store/lmdb/lmdb.hpp index 8cf9d94b..290b19f8 100644 --- a/nano/store/lmdb/lmdb.hpp +++ b/nano/store/lmdb/lmdb.hpp @@ -112,9 +112,9 @@ public: private: bool do_upgrades (store::write_transaction &, nano::ledger_constants & constants, bool &); - void upgrade_v21_to_v22 (store::write_transaction const &); - void upgrade_v22_to_v23 (store::write_transaction const &); - void upgrade_v23_to_v24 (store::write_transaction const &); + void upgrade_v21_to_v22 (store::write_transaction &); + void upgrade_v22_to_v23 (store::write_transaction &); + void upgrade_v23_to_v24 (store::write_transaction &); void open_databases (bool &, store::transaction const &, unsigned); diff --git a/nano/store/rocksdb/rocksdb.cpp b/nano/store/rocksdb/rocksdb.cpp index a403ac93..2bd4aae5 100644 --- a/nano/store/rocksdb/rocksdb.cpp +++ b/nano/store/rocksdb/rocksdb.cpp @@ -210,10 +210,10 @@ void nano::store::rocksdb::component::open (bool & error_a, std::filesystem::pat error_a |= !s.ok (); } -bool nano::store::rocksdb::component::do_upgrades (store::write_transaction const & transaction_a) +bool nano::store::rocksdb::component::do_upgrades (store::write_transaction & transaction) { bool error_l{ false }; - auto version_l = version.get (transaction_a); + auto version_l = version.get (transaction); switch (version_l) { case 1: @@ -240,13 +240,13 @@ bool nano::store::rocksdb::component::do_upgrades (store::write_transaction cons case 19: case 20: case 21: - upgrade_v21_to_v22 (transaction_a); + upgrade_v21_to_v22 (transaction); [[fallthrough]]; case 22: - upgrade_v22_to_v23 (transaction_a); + upgrade_v22_to_v23 (transaction); [[fallthrough]]; case 23: - upgrade_v23_to_v24 (transaction_a); + upgrade_v23_to_v24 (transaction); [[fallthrough]]; case 24: break; @@ -258,7 +258,7 @@ bool nano::store::rocksdb::component::do_upgrades (store::write_transaction cons return error_l; } -void nano::store::rocksdb::component::upgrade_v21_to_v22 (store::write_transaction const & transaction_a) +void nano::store::rocksdb::component::upgrade_v21_to_v22 (store::write_transaction & transaction) { logger.info (nano::log::type::rocksdb, "Upgrading database from v21 to v22..."); @@ -279,20 +279,20 @@ void nano::store::rocksdb::component::upgrade_v21_to_v22 (store::write_transacti logger.debug (nano::log::type::rocksdb, "Finished removing unchecked table"); } - version.put (transaction_a, 22); + version.put (transaction, 22); logger.info (nano::log::type::rocksdb, "Upgrading database from v21 to v22 completed"); } // Fill rep_weights table with all existing representatives and their vote weight -void nano::store::rocksdb::component::upgrade_v22_to_v23 (store::write_transaction const & transaction_a) +void nano::store::rocksdb::component::upgrade_v22_to_v23 (store::write_transaction & transaction) { logger.info (nano::log::type::rocksdb, "Upgrading database from v22 to v23..."); if (column_family_exists ("rep_weights")) { logger.info (nano::log::type::rocksdb, "Dropping existing rep_weights table"); - drop (transaction_a, tables::rep_weights); + drop (transaction, tables::rep_weights); } logger.info (nano::log::type::rocksdb, "Creating table rep_weights"); @@ -301,7 +301,7 @@ void nano::store::rocksdb::component::upgrade_v22_to_v23 (store::write_transacti ::rocksdb::Status status = db->CreateColumnFamily (new_cf_options, "rep_weights", &new_cf_handle); handles.emplace_back (new_cf_handle); - auto i{ make_iterator (transaction_a, tables::accounts) }; + auto i{ make_iterator (transaction, tables::accounts) }; auto end{ store::iterator (nullptr) }; uint64_t processed_accounts = 0; for (; i != end; ++i) @@ -310,13 +310,13 @@ void nano::store::rocksdb::component::upgrade_v22_to_v23 (store::write_transacti { nano::uint128_t total{ 0 }; nano::store::rocksdb::db_val value; - auto status = get (transaction_a, tables::rep_weights, i->second.representative, value); + auto status = get (transaction, tables::rep_weights, i->second.representative, value); if (success (status)) { total = nano::amount{ value }.number (); } total += i->second.balance.number (); - status = put (transaction_a, tables::rep_weights, i->second.representative, nano::amount{ total }); + status = put (transaction, tables::rep_weights, i->second.representative, nano::amount{ total }); release_assert_success (status); } processed_accounts++; @@ -326,11 +326,11 @@ void nano::store::rocksdb::component::upgrade_v22_to_v23 (store::write_transacti } } logger.info (nano::log::type::rocksdb, "Processed {} accounts", processed_accounts); - version.put (transaction_a, 23); + version.put (transaction, 23); logger.info (nano::log::type::rocksdb, "Upgrading database from v22 to v23 completed"); } -void nano::store::rocksdb::component::upgrade_v23_to_v24 (store::write_transaction const & transaction_a) +void nano::store::rocksdb::component::upgrade_v23_to_v24 (store::write_transaction & transaction) { logger.info (nano::log::type::rocksdb, "Upgrading database from v23 to v24..."); @@ -351,7 +351,7 @@ void nano::store::rocksdb::component::upgrade_v23_to_v24 (store::write_transacti logger.debug (nano::log::type::rocksdb, "Finished removing frontiers table"); } - version.put (transaction_a, 24); + version.put (transaction, 24); logger.info (nano::log::type::rocksdb, "Upgrading database from v23 to v24 completed"); } diff --git a/nano/store/rocksdb/rocksdb.hpp b/nano/store/rocksdb/rocksdb.hpp index 0b6f11cb..5d8b22bb 100644 --- a/nano/store/rocksdb/rocksdb.hpp +++ b/nano/store/rocksdb/rocksdb.hpp @@ -148,10 +148,10 @@ private: void open (bool & error_a, std::filesystem::path const & path_a, bool open_read_only_a, ::rocksdb::Options const & options_a, std::vector<::rocksdb::ColumnFamilyDescriptor> column_families); - bool do_upgrades (store::write_transaction const &); - void upgrade_v21_to_v22 (store::write_transaction const &); - void upgrade_v22_to_v23 (store::write_transaction const &); - void upgrade_v23_to_v24 (store::write_transaction const &); + bool do_upgrades (store::write_transaction &); + void upgrade_v21_to_v22 (store::write_transaction &); + void upgrade_v22_to_v23 (store::write_transaction &); + void upgrade_v23_to_v24 (store::write_transaction &); void construct_column_family_mutexes (); ::rocksdb::Options get_db_options ();