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

Remove unused block store functions

Browse source
This commit is contained in:
Piotr Wójcik 2024-11-17 00:06:58 +01:00
commit 4ad3629218
7 changed files with 20 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

15
nano/core_test/block_store.cpp
View file

@ -904,21 +904,6 @@ TEST (block_store, cemented_count_cache)
ASSERT_EQ (1, ledger.cemented_count ()); ASSERT_EQ (1, ledger.cemented_count ());
} }
TEST (block_store, block_random)
{
nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
{
nano::ledger_cache ledger_cache{ store->rep_weight };
auto transaction (store->tx_begin_write ());
store->initialize (transaction, ledger_cache, nano::dev::constants);
}
auto transaction (store->tx_begin_read ());
auto block (store->block.random (transaction));
ASSERT_NE (nullptr, block);
ASSERT_EQ (*block, *nano::dev::genesis);
}
TEST (block_store, pruned_random) TEST (block_store, pruned_random)
{ {
nano::logger logger; nano::logger logger;

18
nano/secure/ledger.cpp
View file

@ -1276,7 +1276,7 @@ bool nano::ledger::migrate_lmdb_to_rocksdb (std::filesystem::path const & data_p
if (std::filesystem::exists (rockdb_data_path)) if (std::filesystem::exists (rockdb_data_path))
{ {
logger.error (nano::log::type::ledger, "Existing RocksDb folder found in '{}'. Please remove it and try again.", rockdb_data_path.string ()); logger.error (nano::log::type::ledger, "Existing RocksDB folder found in '{}'. Please remove it and try again.", rockdb_data_path.string ());
return true; return true;
} }
@ -1423,7 +1423,8 @@ bool nano::ledger::migrate_lmdb_to_rocksdb (std::filesystem::path const & data_p
logger.info (nano::log::type::ledger, "{} entries converted ({}%)", count.load (), table_size > 0 ? count.load () * 100 / table_size : 100); logger.info (nano::log::type::ledger, "{} entries converted ({}%)", count.load (), table_size > 0 ? count.load () * 100 / table_size : 100);
logger.info (nano::log::type::ledger, "Finalizing migration..."); logger.info (nano::log::type::ledger, "Finalizing migration...");
auto lmdb_transaction (store.tx_begin_read ());
auto lmdb_transaction (tx_begin_read ());
auto version = store.version.get (lmdb_transaction); auto version = store.version.get (lmdb_transaction);
auto rocksdb_transaction (rocksdb_store->tx_begin_write ()); auto rocksdb_transaction (rocksdb_store->tx_begin_write ());
rocksdb_store->version.put (rocksdb_transaction, version); rocksdb_store->version.put (rocksdb_transaction, version);
@ -1447,10 +1448,14 @@ bool nano::ledger::migrate_lmdb_to_rocksdb (std::filesystem::path const & data_p
error |= store.version.get (lmdb_transaction) != rocksdb_store->version.get (rocksdb_transaction); error |= store.version.get (lmdb_transaction) != rocksdb_store->version.get (rocksdb_transaction);
// For large tables a random key is used instead and makes sure it exists // For large tables a random key is used instead and makes sure it exists
auto random_block (store.block.random (lmdb_transaction)); auto blocks = random_blocks (lmdb_transaction, 42);
error |= rocksdb_store->block.get (rocksdb_transaction, random_block->hash ()) == nullptr; release_assert (!blocks.empty ());
for (auto const & block : blocks)
{
auto const account = block->account ();
error |= rocksdb_store->block.get (rocksdb_transaction, block->hash ()) == nullptr;
auto account = random_block->account ();
nano::account_info account_info; nano::account_info account_info;
error |= rocksdb_store->account.get (rocksdb_transaction, account, account_info); error |= rocksdb_store->account.get (rocksdb_transaction, account, account_info);
@ -1460,8 +1465,9 @@ bool nano::ledger::migrate_lmdb_to_rocksdb (std::filesystem::path const & data_p
{ {
error |= rocksdb_store->confirmation_height.get (rocksdb_transaction, account, confirmation_height_info); error |= rocksdb_store->confirmation_height.get (rocksdb_transaction, account, confirmation_height_info);
} }
}
logger.info (nano::log::type::ledger, "Migration completed. Make sure to enable RocksDb in the config file under [node.rocksdb]"); logger.info (nano::log::type::ledger, "Migration completed. Make sure to enable RocksDB in the config file under [node.rocksdb]");
logger.info (nano::log::type::ledger, "After confirming correct node operation, the data.ldb file can be deleted if no longer required"); logger.info (nano::log::type::ledger, "After confirming correct node operation, the data.ldb file can be deleted if no longer required");
} }
else else

1
nano/store/block.hpp
View file

@ -30,7 +30,6 @@ public:
virtual std::optional<nano::block_hash> successor (transaction const & tx, nano::block_hash const &) const = 0; virtual std::optional<nano::block_hash> successor (transaction const & tx, nano::block_hash const &) const = 0;
virtual void successor_clear (write_transaction const & tx, nano::block_hash const &) = 0; virtual void successor_clear (write_transaction const & tx, nano::block_hash const &) = 0;
virtual std::shared_ptr<nano::block> get (transaction const & tx, nano::block_hash const &) const = 0; virtual std::shared_ptr<nano::block> get (transaction const & tx, nano::block_hash const &) const = 0;
virtual std::shared_ptr<nano::block> random (transaction const & tx) = 0;
virtual void del (write_transaction const & tx, nano::block_hash const &) = 0; virtual void del (write_transaction const & tx, nano::block_hash const &) = 0;
virtual bool exists (transaction const & tx, nano::block_hash const &) = 0; virtual bool exists (transaction const & tx, nano::block_hash const &) = 0;
virtual uint64_t count (transaction const & tx) = 0; virtual uint64_t count (transaction const & tx) = 0;

13
nano/store/lmdb/block.cpp
View file

@ -106,19 +106,6 @@ std::shared_ptr<nano::block> nano::store::lmdb::block::get (store::transaction c
return result; return result;
} }
std::shared_ptr<nano::block> nano::store::lmdb::block::random (store::transaction const & transaction)
{
nano::block_hash hash;
nano::random_pool::generate_block (hash.bytes.data (), hash.bytes.size ());
auto existing = begin (transaction, hash);
if (existing == end (transaction))
{
existing = begin (transaction);
}
debug_assert (existing != end (transaction));
return existing->second.block;
}
void nano::store::lmdb::block::del (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) void nano::store::lmdb::block::del (store::write_transaction const & transaction_a, nano::block_hash const & hash_a)
{ {
auto status = store.del (transaction_a, tables::blocks, hash_a); auto status = store.del (transaction_a, tables::blocks, hash_a);

1
nano/store/lmdb/block.hpp
View file

@ -27,7 +27,6 @@ public:
std::optional<nano::block_hash> successor (store::transaction const & transaction_a, nano::block_hash const & hash_a) const override; std::optional<nano::block_hash> successor (store::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
void successor_clear (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) override; void successor_clear (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) override;
std::shared_ptr<nano::block> get (store::transaction const & transaction_a, nano::block_hash const & hash_a) const override; std::shared_ptr<nano::block> get (store::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
std::shared_ptr<nano::block> random (store::transaction const & transaction_a) override;
void del (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) override; void del (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) override;
bool exists (store::transaction const & transaction_a, nano::block_hash const & hash_a) override; bool exists (store::transaction const & transaction_a, nano::block_hash const & hash_a) override;
uint64_t count (store::transaction const & transaction_a) override; uint64_t count (store::transaction const & transaction_a) override;

12
nano/store/rocksdb/block.cpp
View file

@ -106,18 +106,6 @@ std::shared_ptr<nano::block> nano::store::rocksdb::block::get (store::transactio
} }
return result; return result;
} }
std::shared_ptr<nano::block> nano::store::rocksdb::block::random (store::transaction const & transaction)
{
nano::block_hash hash;
nano::random_pool::generate_block (hash.bytes.data (), hash.bytes.size ());
auto existing = begin (transaction, hash);
if (existing == end (transaction))
{
existing = begin (transaction);
}
debug_assert (existing != end (transaction));
return existing->second.block;
}
void nano::store::rocksdb::block::del (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) void nano::store::rocksdb::block::del (store::write_transaction const & transaction_a, nano::block_hash const & hash_a)
{ {

1
nano/store/rocksdb/block.hpp
View file

@ -25,7 +25,6 @@ public:
std::optional<nano::block_hash> successor (store::transaction const & transaction_a, nano::block_hash const & hash_a) const override; std::optional<nano::block_hash> successor (store::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
void successor_clear (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) override; void successor_clear (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) override;
std::shared_ptr<nano::block> get (store::transaction const & transaction_a, nano::block_hash const & hash_a) const override; std::shared_ptr<nano::block> get (store::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
std::shared_ptr<nano::block> random (store::transaction const & transaction_a) override;
void del (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) override; void del (store::write_transaction const & transaction_a, nano::block_hash const & hash_a) override;
bool exists (store::transaction const & transaction_a, nano::block_hash const & hash_a) override; bool exists (store::transaction const & transaction_a, nano::block_hash const & hash_a) override;
uint64_t count (store::transaction const & transaction_a) override; uint64_t count (store::transaction const & transaction_a) override;