Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to store removal of spend index. #740

Merged
merged 2 commits into from
Feb 23, 2025
Merged

Adapt to store removal of spend index. #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6196d6b
Initialize chaser_check::advanced_.
evoskuil Feb 23, 2025
3e78cf7
Adapt to store removal of spend index.
evoskuil Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions console/executor_dumps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ void executor::dump_body_sizes() const
query_.puts_body_size() %
query_.candidate_body_size() %
query_.confirmed_body_size() %
query_.spend_body_size() %
query_.prevout_body_size() %
query_.strong_tx_body_size() %
query_.validated_tx_body_size() %
Expand All @@ -115,7 +114,6 @@ void executor::dump_records() const
query_.point_records() %
query_.candidate_records() %
query_.confirmed_records() %
query_.spend_records() %
query_.prevout_records() %
query_.strong_tx_records() %
query_.address_records());
Expand All @@ -127,7 +125,7 @@ void executor::dump_buckets() const
query_.header_buckets() %
query_.txs_buckets() %
query_.tx_buckets() %
query_.spend_buckets() %
query_.point_buckets() %
query_.prevout_buckets() %
query_.strong_tx_buckets() %
query_.validated_tx_buckets() %
Expand All @@ -143,7 +141,7 @@ void executor::dump_collisions() const
(to_double(query_.header_records()) / query_.header_buckets()) %
(to_double(query_.header_records()) / query_.txs_buckets()) %
(to_double(query_.tx_records()) / query_.tx_buckets()) %
(to_double(query_.spend_records()) / query_.spend_buckets()) %
(to_double(query_.point_records()) / query_.point_buckets()) %
(to_double(query_.prevout_records()) / query_.prevout_buckets()) %
(to_double(query_.strong_tx_records()) / query_.strong_tx_buckets()) %
(to_double(query_.tx_records()) / query_.validated_tx_buckets()) %
Expand Down
14 changes: 7 additions & 7 deletions console/executor_scans.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,22 +193,22 @@ void executor::scan_buckets() const
filled = zero;
bucket = max_size_t;
start = logger::now();
while (!cancel_ && (++bucket < query_.spend_buckets()))
while (!cancel_ && (++bucket < query_.point_buckets()))
{
const auto top = query_.top_spend(bucket);
const auto top = query_.top_point(bucket);
if (!top.is_terminal())
++filled;

if (is_zero(bucket % put_frequency))
logger(format("spend" BN_READ_ROW) % bucket %
logger(format("point" BN_READ_ROW) % bucket %
duration_cast<seconds>(logger::now() - start).count());
}

if (cancel_)
logger(BN_OPERATION_CANCELED);

span = duration_cast<seconds>(logger::now() - start);
logger(format("spend" BN_READ_ROW) % (to_double(filled) / bucket) %
logger(format("point" BN_READ_ROW) % (to_double(filled) / bucket) %
span.count());
}

Expand Down Expand Up @@ -358,13 +358,13 @@ void executor::scan_collisions() const
strong_tx.clear();
strong_tx.shrink_to_fit();

// spend
// point
// ------------------------------------------------------------------------

auto total = zero;
index = max_size_t;
start = logger::now();
const auto spend_buckets = query_.spend_buckets();
const auto spend_buckets = query_.point_buckets();
std_vector<size_t> spend(spend_buckets, empty);
while (!cancel_ && (++index < query_.header_records()))
{
Expand All @@ -376,7 +376,7 @@ void executor::scan_collisions() const
for (const auto& point: points)
{
++total;
++spend.at(hash(query_.to_spend_key(point)) % spend_buckets);
++spend.at(hash(query_.get_point_key(point)) % spend_buckets);

if (is_zero(index % put_frequency))
logger(format("spend" BN_READ_ROW) % total %
Expand Down
24 changes: 11 additions & 13 deletions console/localize.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,24 +79,22 @@ namespace node {
" puts :%7%\n" \
" candidate :%8%\n" \
" confirmed :%9%\n" \
" spend :%10%\n" \
" prevout :%11%\n" \
" strong_tx :%12%\n" \
" valid_tx :%13%\n" \
" valid_bk :%14%\n" \
" address :%15%\n" \
" neutrino :%16%"
" prevout :%10%\n" \
" strong_tx :%11%\n" \
" valid_tx :%12%\n" \
" valid_bk :%13%\n" \
" address :%14%\n" \
" neutrino :%15%"
#define BN_MEASURE_RECORDS \
"Table records...\n" \
" header :%1%\n" \
" tx :%2%\n" \
" point :%3%\n" \
" candidate :%4%\n" \
" confirmed :%5%\n" \
" spend :%6%\n" \
" prevout :%7%\n" \
" strong_tx :%8%\n" \
" address :%9%"
" prevout :%6%\n" \
" strong_tx :%7%\n" \
" address :%8%"
#define BN_MEASURE_SLABS \
"Table slabs..."
#define BN_MEASURE_SLABS_ROW \
Expand All @@ -110,7 +108,7 @@ namespace node {
" header :%1%\n" \
" txs :%2%\n" \
" tx :%3%\n" \
" spend :%4%\n" \
" point :%4%\n" \
" prevout :%5%\n" \
" strong_tx :%6%\n" \
" valid_tx :%7%\n" \
Expand All @@ -122,7 +120,7 @@ namespace node {
" header :%1%\n" \
" txs :%2%\n" \
" tx :%3%\n" \
" spend :%4%\n" \
" point :%4%\n" \
" prevout :%5%\n" \
" strong_tx :%6%\n" \
" valid_tx :%7%\n" \
Expand Down
2 changes: 1 addition & 1 deletion src/chasers/chaser_check.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ code chaser_check::start() NOEXCEPT
{
start_tracking();
set_position(archive().get_fork());
requested_ = position();
requested_ = advanced_ = position();
const auto added = set_unassociated();
LOGN("Fork point (" << requested_ << ") unassociated (" << added << ").");

Expand Down
27 changes: 6 additions & 21 deletions src/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ parser::parser(system::chain::selection context) NOEXCEPT
configured.database.output_size = 25'300'000'000;
configured.database.output_rate = 5;

configured.database.point_buckets = 1'750'905'073;
configured.database.point_size = 21'100'000'000;
configured.database.point_rate = 5;

Expand All @@ -91,10 +92,6 @@ parser::parser(system::chain::selection context) NOEXCEPT
configured.database.puts_size = 3'700'000'000;
configured.database.puts_rate = 5;

configured.database.spend_buckets = 1'750'905'073;
configured.database.spend_size = 10'000'000'000;
configured.database.spend_rate = 5;

configured.database.tx_buckets = 688'193'037;
configured.database.tx_size = 17'050'000'000;
configured.database.tx_rate = 5;
Expand Down Expand Up @@ -696,6 +693,11 @@ options_metadata parser::load_settings() THROWS
)

/* point */
(
"database.point_buckets",
value<uint32_t>(&configured.database.point_buckets),
"The number of buckets in the spend table head, defaults to '1750905073'."
)
(
"database.point_size",
value<uint64_t>(&configured.database.point_size),
Expand Down Expand Up @@ -731,23 +733,6 @@ options_metadata parser::load_settings() THROWS
"The percentage expansion of the puts table body, defaults to '5'."
)

/* spend */
(
"database.spend_buckets",
value<uint32_t>(&configured.database.spend_buckets),
"The number of buckets in the spend table head, defaults to '1750905073'."
)
(
"database.spend_size",
value<uint64_t>(&configured.database.spend_size),
"The minimum allocation of the spend table body, defaults to '10000000000'."
)
(
"database.spend_rate",
value<uint16_t>(&configured.database.spend_rate),
"The percentage expansion of the spend table body, defaults to '5'."
)

/* tx */
(
"database.tx_buckets",
Expand Down
Loading