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

Misc blockstore code improvements (#1040)

Browse source
This commit is contained in:
cryptocode 2018-08-24 17:48:47 +02:00 • committed by Roy Keene
commit a7da0c40be
1 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

37
rai/secure/blockstore.cpp
View file

@ -477,12 +477,8 @@ int rai::block_store::version_get (MDB_txn * transaction_a)
rai::uint256_union version_key (1);
rai::mdb_val data;
auto error (mdb_get (transaction_a, meta, rai::mdb_val (version_key), data));
int result;
if (error == MDB_NOTFOUND)
{
result = 1;
}
else
int result (1);
if (error != MDB_NOTFOUND)
{
rai::uint256_union version_value (data);
assert (version_value.qwords[2] == 0 && version_value.qwords[1] == 0 && version_value.qwords[0] == 0);
@ -633,7 +629,6 @@ void rai::block_store::upgrade_v4_to_v5 (MDB_txn * transaction_a)
auto hash (block->hash ());
if (block_successor (transaction_a, hash).is_zero () && !successor.is_zero ())
{
//std::cerr << boost::str (boost::format ("Adding successor for account %1%, block %2%, successor %3%\n") % account.to_account () % hash.to_string () % successor.to_string ());
block_put (transaction_a, hash, *block, successor);
}
successor = hash;
@ -736,7 +731,6 @@ void rai::block_store::upgrade_v9_to_v10 (MDB_txn * transaction_a)
}
}
}
//std::cerr << boost::str (boost::format ("Database upgrade is completed\n"));
}
void rai::block_store::upgrade_v10_to_v11 (MDB_txn * transaction_a)
@ -1367,12 +1361,8 @@ bool rai::block_store::block_info_get (MDB_txn * transaction_a, rai::block_hash
rai::mdb_val value;
auto status (mdb_get (transaction_a, blocks_info, rai::mdb_val (hash_a), value));
assert (status == 0 || status == MDB_NOTFOUND);
bool result;
if (status == MDB_NOTFOUND)
{
result = true;
}
else
bool result (true);
if (status != MDB_NOTFOUND)
{
result = false;
assert (value.size () == sizeof (block_info_a.account.bytes) + sizeof (block_info_a.balance.bytes));
@ -1390,7 +1380,7 @@ rai::uint128_t rai::block_store::representation_get (MDB_txn * transaction_a, ra
rai::mdb_val value;
auto status (mdb_get (transaction_a, representation, rai::mdb_val (account_a), value));
assert (status == 0 || status == MDB_NOTFOUND);
rai::uint128_t result;
rai::uint128_t result = 0;
if (status == 0)
{
rai::uint128_union rep;
@ -1399,10 +1389,6 @@ rai::uint128_t rai::block_store::representation_get (MDB_txn * transaction_a, ra
assert (!error);
result = rep.number ();
}
else
{
result = 0;
}
return result;
}
@ -1518,7 +1504,7 @@ bool rai::block_store::checksum_get (MDB_txn * transaction_a, uint64_t prefix, u
rai::mdb_val value;
auto status (mdb_get (transaction_a, checksum, rai::mdb_val (sizeof (key), &key), value));
assert (status == 0 || status == MDB_NOTFOUND);
bool result;
bool result (true);
if (status == 0)
{
result = false;
@ -1526,10 +1512,6 @@ bool rai::block_store::checksum_get (MDB_txn * transaction_a, uint64_t prefix, u
auto error (rai::read (stream, hash_a));
assert (!error);
}
else
{
result = true;
}
return result;
}
@ -1608,12 +1590,9 @@ std::shared_ptr<rai::vote> rai::block_store::vote_max (MDB_txn * transaction_a,
std::lock_guard<std::mutex> lock (cache_mutex);
auto current (vote_current (transaction_a, vote_a->account));
auto result (vote_a);
if (current != nullptr)
if (current != nullptr && current->sequence > result->sequence)
{
if (current->sequence > result->sequence)
{
result = current;
}
result = current;
}
vote_cache[vote_a->account] = result;
return result;