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

Moved the peer LMDB table handler to its store class

Browse source
This commit is contained in:
Thiago Silva 2022-04-11 17:15:00 -03:00
commit 3e55895c05
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nano/node/lmdb/lmdb.cpp
View file

@ -214,7 +214,7 @@ void nano::lmdb::store::open_databases (bool & error_a, nano::transaction const
error_a |= mdb_dbi_open (env.tx (transaction_a), "unchecked", flags, &unchecked_handle) != 0; error_a |= mdb_dbi_open (env.tx (transaction_a), "unchecked", flags, &unchecked_handle) != 0;
error_a |= mdb_dbi_open (env.tx (transaction_a), "online_weight", flags, &online_weight_store.online_weight_handle) != 0; error_a |= mdb_dbi_open (env.tx (transaction_a), "online_weight", flags, &online_weight_store.online_weight_handle) != 0;
error_a |= mdb_dbi_open (env.tx (transaction_a), "meta", flags, &meta_handle) != 0; error_a |= mdb_dbi_open (env.tx (transaction_a), "meta", flags, &meta_handle) != 0;
error_a |= mdb_dbi_open (env.tx (transaction_a), "peers", flags, &peers_handle) != 0; error_a |= mdb_dbi_open (env.tx (transaction_a), "peers", flags, &peer_store.peers_handle) != 0;
error_a |= mdb_dbi_open (env.tx (transaction_a), "pruned", flags, &pruned_store.pruned_handle) != 0; error_a |= mdb_dbi_open (env.tx (transaction_a), "pruned", flags, &pruned_store.pruned_handle) != 0;
error_a |= mdb_dbi_open (env.tx (transaction_a), "confirmation_height", flags, &confirmation_height_handle) != 0; error_a |= mdb_dbi_open (env.tx (transaction_a), "confirmation_height", flags, &confirmation_height_handle) != 0;
error_a |= mdb_dbi_open (env.tx (transaction_a), "accounts", flags, &account_store.accounts_v0_handle) != 0; error_a |= mdb_dbi_open (env.tx (transaction_a), "accounts", flags, &account_store.accounts_v0_handle) != 0;
@ -875,7 +875,7 @@ MDB_dbi nano::lmdb::store::table_to_dbi (tables table_a) const
case tables::meta: case tables::meta:
return meta_handle; return meta_handle;
case tables::peers: case tables::peers:
return peers_handle; return peer_store.peers_handle;
case tables::pruned: case tables::pruned:
return pruned_store.pruned_handle; return pruned_store.pruned_handle;
case tables::confirmation_height: case tables::confirmation_height:
@ -884,7 +884,7 @@ MDB_dbi nano::lmdb::store::table_to_dbi (tables table_a) const
return final_votes_handle; return final_votes_handle;
default: default:
release_assert (false); release_assert (false);
return peers_handle; return peer_store.peers_handle;
} }
} }

6
nano/node/lmdb/lmdb.hpp
View file

@ -148,12 +148,6 @@ namespace lmdb
*/ */
MDB_dbi meta_handle{ 0 }; MDB_dbi meta_handle{ 0 };
/*
* Endpoints for peers
* nano::endpoint_key -> no_value
*/
MDB_dbi peers_handle{ 0 };
/* /*
* Confirmation height of an account, and the hash for the block at that height * Confirmation height of an account, and the hash for the block at that height
* nano::account -> uint64_t, nano::block_hash * nano::account -> uint64_t, nano::block_hash

8
nano/node/lmdb/peer_store.hpp
View file

@ -2,6 +2,8 @@
#include <nano/secure/store.hpp> #include <nano/secure/store.hpp>
#include <lmdb/libraries/liblmdb/lmdb.h>
namespace nano namespace nano
{ {
namespace lmdb namespace lmdb
@ -21,6 +23,12 @@ namespace lmdb
void clear (nano::write_transaction const & transaction_a) override; void clear (nano::write_transaction const & transaction_a) override;
nano::store_iterator<nano::endpoint_key, nano::no_value> begin (nano::transaction const & transaction_a) const override; nano::store_iterator<nano::endpoint_key, nano::no_value> begin (nano::transaction const & transaction_a) const override;
nano::store_iterator<nano::endpoint_key, nano::no_value> end () const override; nano::store_iterator<nano::endpoint_key, nano::no_value> end () const override;
/*
* Endpoints for peers
* nano::endpoint_key -> no_value
*/
MDB_dbi peers_handle{ 0 };
}; };
} }
} }