Skip to content

Update table params, remove db.minimize config, add prevout to console dumps. #721

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

Merged
evoskuil merged 2 commits into from
Jan 29, 2025
Merged

Update table params, remove db.minimize config, add prevout to console dumps. #721

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
1a9076f
Add prevout reporting to console dumps.
evoskuil Jan 28, 2025
fdfa4a1
Update table parameters, remove database.minimize config.
evoskuil Jan 28, 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
4 changes: 4 additions & 0 deletions console/executor_dumps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ void executor::dump_body_sizes() const
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() %
query_.validated_bk_body_size() %
Expand All @@ -116,6 +117,7 @@ void executor::dump_records() const
query_.candidate_records() %
query_.confirmed_records() %
query_.spend_records() %
query_.prevout_records() %
query_.strong_tx_records() %
query_.address_records());
}
Expand All @@ -128,6 +130,7 @@ void executor::dump_buckets() const
query_.tx_buckets() %
query_.point_buckets() %
query_.spend_buckets() %
query_.prevout_buckets() %
query_.strong_tx_buckets() %
query_.validated_tx_buckets() %
query_.validated_bk_buckets() %
Expand All @@ -144,6 +147,7 @@ void executor::dump_collisions() const
(to_double(query_.tx_records()) / query_.tx_buckets()) %
(to_double(query_.point_records()) / query_.point_buckets()) %
(to_double(query_.spend_records()) / query_.spend_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()) %
(to_double(query_.header_records()) / query_.validated_bk_buckets()) %
Expand Down
38 changes: 21 additions & 17 deletions console/localize.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,12 @@ namespace node {
" candidate :%8%\n" \
" confirmed :%9%\n" \
" spend :%10%\n" \
" strong_tx :%11%\n" \
" valid_tx :%12%\n" \
" valid_bk :%13%\n" \
" address :%14%\n" \
" neutrino :%15%"
" prevout :%11%\n" \
" strong_tx :%12%\n" \
" valid_tx :%13%\n" \
" valid_bk :%14%\n" \
" address :%15%\n" \
" neutrino :%16%"
#define BN_MEASURE_RECORDS \
"Table records...\n" \
" header :%1%\n" \
Expand All @@ -93,8 +94,9 @@ namespace node {
" candidate :%4%\n" \
" confirmed :%5%\n" \
" spend :%6%\n" \
" strong_tx :%7%\n" \
" address :%8%"
" prevout :%7%\n" \
" strong_tx :%8%\n" \
" address :%9%"
#define BN_MEASURE_SLABS \
"Table slabs..."
#define BN_MEASURE_SLABS_ROW \
Expand All @@ -110,23 +112,25 @@ namespace node {
" tx :%3%\n" \
" point :%4%\n" \
" spend :%5%\n" \
" strong_tx :%6%\n" \
" valid_tx :%7%\n" \
" valid_bk :%8%\n" \
" address :%9%\n" \
" neutrino :%10%"
" prevout :%6%\n" \
" strong_tx :%7%\n" \
" valid_tx :%8%\n" \
" valid_bk :%9%\n" \
" address :%10%\n" \
" neutrino :%11%"
#define BN_MEASURE_COLLISION_RATES \
"Collision rates...\n" \
" header :%1%\n" \
" txs :%2%\n" \
" tx :%3%\n" \
" point :%4%\n" \
" spend :%5%\n" \
" strong_tx :%6%\n" \
" valid_tx :%7%\n" \
" valid_bk :%8%\n" \
" address :%9%\n" \
" neutrino :%10%"
" prevout :%6%\n" \
" strong_tx :%7%\n" \
" valid_tx :%8%\n" \
" valid_bk :%9%\n" \
" address :%10%\n" \
" neutrino :%11%"
#define BN_MEASURE_PROGRESS_START \
"Thinking..."
#define BN_MEASURE_PROGRESS \
Expand Down
109 changes: 50 additions & 59 deletions src/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,68 +70,64 @@ parser::parser(system::chain::selection context) NOEXCEPT
configured.network.services_maximum = service::node_network |
service::node_witness;

// database
// database (archive)

configured.database.minimize = false;

// archive

configured.database.header_buckets = 524'493;
configured.database.header_size = 20'397'669;
configured.database.header_buckets = 566'667;
configured.database.header_size = 21'000'000;
configured.database.header_rate = 5;

configured.database.input_size = 90'116'786'234;
configured.database.input_size = 93'050'000'000;
configured.database.input_rate = 5;

configured.database.output_size = 24'315'563'831;
configured.database.output_size = 25'300'000'000;
configured.database.output_rate = 5;

configured.database.point_buckets = 546'188'501;
configured.database.point_size = 8'389'074'978;
configured.database.point_buckets = 1'750'905'073;
configured.database.point_size = 24'000'000'000;
configured.database.point_rate = 5;

configured.database.puts_size = 6'059'682'874;
configured.database.puts_size = 6'300'000'000;
configured.database.puts_rate = 5;

configured.database.spend_buckets = 1'459'791'875;
configured.database.spend_size = 15'364'630'530;
configured.database.spend_buckets = 1'751'471'741;
configured.database.spend_size = 16'000'000'000;
configured.database.spend_rate = 5;

configured.database.tx_buckets = 551'320'125;
configured.database.tx_size = 15'435'744'998;
configured.database.tx_buckets = 688'193'037;
configured.database.tx_size = 16'150'000'000;
configured.database.tx_rate = 5;

configured.database.txs_buckets = 524'493;
configured.database.txs_size = 999'581'257;
configured.database.txs_buckets = 566'667;
configured.database.txs_size = 1'050'000'000;
configured.database.txs_rate = 5;

// indexes
// database (indexes)

configured.database.candidate_size = 2'523'423;
configured.database.candidate_size = 2'575'500;
configured.database.candidate_rate = 5;

configured.database.confirmed_size = 2'523'423;
configured.database.confirmed_size = 2'575'500;
configured.database.confirmed_rate = 5;

configured.database.strong_tx_buckets = 551'320'125;
configured.database.strong_tx_size = 2'987'563'554;
configured.database.strong_tx_buckets = 688'193'037;
configured.database.strong_tx_size = 3'150'000'000;
configured.database.strong_tx_rate = 5;

// caches
// database (caches)

configured.database.prevout_buckets = 850'000;
configured.database.prevout_size = 2'000'000'000;
configured.database.prevout_buckets = 850'001;
configured.database.prevout_size = 2'600'000'000;
configured.database.prevout_rate = 5;

configured.database.validated_tx_buckets = 551'320'125;
configured.database.validated_tx_size = 47'068'879;
configured.database.validated_tx_buckets = 0;
configured.database.validated_tx_size = 1;
configured.database.validated_tx_rate = 5;

configured.database.validated_bk_buckets = 524'493;
configured.database.validated_bk_size = 8'290;
configured.database.validated_bk_buckets = 566'667;
configured.database.validated_bk_size = 3'400'000;
configured.database.validated_bk_rate = 5;

// optionals
// database (optionals)

configured.database.address_buckets = 0;
configured.database.address_size = 1;
Expand Down Expand Up @@ -655,22 +651,17 @@ options_metadata parser::load_settings() THROWS
value<std::filesystem::path>(&configured.database.path),
"The blockchain database directory, defaults to 'blockchain'."
)
(
"database.minimize",
value<bool>(&configured.database.minimize),
"Minimize store, saves ~50GiB, requires high RAM to avoid thrashing, defaults to false."
)

/* header */
(
"database.header_buckets",
value<uint32_t>(&configured.database.header_buckets),
"The number of buckets in the header table head, defaults to '524493'."
"The number of buckets in the header table head, defaults to '566667'."
)
(
"database.header_size",
value<uint64_t>(&configured.database.header_size),
"The minimum allocation of the header table body, defaults to '20397669'."
"The minimum allocation of the header table body, defaults to '21000000'."
)
(
"database.header_rate",
Expand All @@ -682,7 +673,7 @@ options_metadata parser::load_settings() THROWS
(
"database.input_size",
value<uint64_t>(&configured.database.input_size),
"The minimum allocation of the input table body, defaults to '90116786234'."
"The minimum allocation of the input table body, defaults to '93050000000'."
)
(
"database.input_rate",
Expand All @@ -694,7 +685,7 @@ options_metadata parser::load_settings() THROWS
(
"database.output_size",
value<uint64_t>(&configured.database.output_size),
"The minimum allocation of the output table body, defaults to '24315563831'."
"The minimum allocation of the output table body, defaults to '25300000000'."
)
(
"database.output_rate",
Expand All @@ -706,12 +697,12 @@ options_metadata parser::load_settings() THROWS
(
"database.point_buckets",
value<uint32_t>(&configured.database.point_buckets),
"The number of buckets in the point table head, defaults to '546188501'."
"The number of buckets in the point table head, defaults to '1750905073'."
)
(
"database.point_size",
value<uint64_t>(&configured.database.point_size),
"The minimum allocation of the point table body, defaults to '8389074978'."
"The minimum allocation of the point table body, defaults to '24000000000'."
)
(
"database.point_rate",
Expand All @@ -723,7 +714,7 @@ options_metadata parser::load_settings() THROWS
(
"database.puts_size",
value<uint64_t>(&configured.database.puts_size),
"The minimum allocation of the puts table body, defaults to '6059682874'."
"The minimum allocation of the puts table body, defaults to '6300000000'."
)
(
"database.puts_rate",
Expand All @@ -735,12 +726,12 @@ options_metadata parser::load_settings() THROWS
(
"database.spend_buckets",
value<uint32_t>(&configured.database.spend_buckets),
"The number of buckets in the spend table head, defaults to '1459791875'."
"The number of buckets in the spend table head, defaults to '1751471741'."
)
(
"database.spend_size",
value<uint64_t>(&configured.database.spend_size),
"The minimum allocation of the spend table body, defaults to '15364630530'."
"The minimum allocation of the spend table body, defaults to '16000000000'."
)
(
"database.spend_rate",
Expand All @@ -752,12 +743,12 @@ options_metadata parser::load_settings() THROWS
(
"database.tx_buckets",
value<uint32_t>(&configured.database.tx_buckets),
"The number of buckets in the tx table head, defaults to '551320125'."
"The number of buckets in the tx table head, defaults to '688193037'."
)
(
"database.tx_size",
value<uint64_t>(&configured.database.tx_size),
"The minimum allocation of the tx table body, defaults to '15435744998'."
"The minimum allocation of the tx table body, defaults to '16150000000'."
)
(
"database.tx_rate",
Expand All @@ -769,12 +760,12 @@ options_metadata parser::load_settings() THROWS
(
"database.txs_buckets",
value<uint32_t>(&configured.database.txs_buckets),
"The number of buckets in the txs table head, defaults to '524493'."
"The number of buckets in the txs table head, defaults to '566667'."
)
(
"database.txs_size",
value<uint64_t>(&configured.database.txs_size),
"The minimum allocation of the txs table body, defaults to '999581257'."
"The minimum allocation of the txs table body, defaults to '1050000000'."
)
(
"database.txs_rate",
Expand All @@ -786,7 +777,7 @@ options_metadata parser::load_settings() THROWS
(
"database.candidate_size",
value<uint64_t>(&configured.database.candidate_size),
"The minimum allocation of the candidate table body, defaults to '2523423'."
"The minimum allocation of the candidate table body, defaults to '2575500'."
)
(
"database.candidate_rate",
Expand All @@ -798,7 +789,7 @@ options_metadata parser::load_settings() THROWS
(
"database.confirmed_size",
value<uint64_t>(&configured.database.confirmed_size),
"The minimum allocation of the candidate table body, defaults to '2523423'."
"The minimum allocation of the candidate table body, defaults to '2575500'."
)
(
"database.confirmed_rate",
Expand All @@ -810,12 +801,12 @@ options_metadata parser::load_settings() THROWS
(
"database.strong_tx_buckets",
value<uint32_t>(&configured.database.strong_tx_buckets),
"The number of buckets in the strong_tx table head, defaults to '551320125'."
"The number of buckets in the strong_tx table head, defaults to '688193037'."
)
(
"database.strong_tx_size",
value<uint64_t>(&configured.database.strong_tx_size),
"The minimum allocation of the strong_tx table body, defaults to '2987563554'."
"The minimum allocation of the strong_tx table body, defaults to '3150000000'."
)
(
"database.strong_tx_rate",
Expand All @@ -827,12 +818,12 @@ options_metadata parser::load_settings() THROWS
(
"database.prevout_buckets",
value<uint32_t>(&configured.database.prevout_buckets),
"The minimum number of buckets in the prevout table head, defaults to '850000'."
"The minimum number of buckets in the prevout table head, defaults to '850001'."
)
(
"database.prevout_size",
value<uint64_t>(&configured.database.prevout_size),
"The minimum allocation of the prevout table body, defaults to '2000000000'."
"The minimum allocation of the prevout table body, defaults to '2600000000'."
)
(
"database.prevout_rate",
Expand All @@ -844,12 +835,12 @@ options_metadata parser::load_settings() THROWS
(
"database.validated_tx_buckets",
value<uint32_t>(&configured.database.validated_tx_buckets),
"The number of buckets in the validated_tx table head, defaults to '551320125'."
"The number of buckets in the validated_tx table head, defaults to '0' (0 disables)."
)
(
"database.validated_tx_size",
value<uint64_t>(&configured.database.validated_tx_size),
"The minimum allocation of the validated_tx table body, defaults to '47068879'."
"The minimum allocation of the validated_tx table body, defaults to '1'."
)
(
"database.validated_tx_rate",
Expand All @@ -861,12 +852,12 @@ options_metadata parser::load_settings() THROWS
(
"database.validated_bk_buckets",
value<uint32_t>(&configured.database.validated_bk_buckets),
"The number of buckets in the validated_bk table head, defaults to '524493'."
"The number of buckets in the validated_bk table head, defaults to '566667'."
)
(
"database.validated_bk_size",
value<uint64_t>(&configured.database.validated_bk_size),
"The minimum allocation of the validated_bk table body, defaults to '8290'."
"The minimum allocation of the validated_bk table body, defaults to '3400000'."
)
(
"database.validated_bk_rate",
Expand Down
1 change: 0 additions & 1 deletion test/configuration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ BOOST_AUTO_TEST_CASE(configuration__construct1__none_context__expected)
BOOST_REQUIRE(!instance.write);

// Just a sample of settings.
BOOST_REQUIRE(instance.database.minimize);
BOOST_REQUIRE(instance.node.headers_first);
BOOST_REQUIRE_EQUAL(instance.network.threads, 1_u32);
BOOST_REQUIRE_EQUAL(instance.bitcoin.first_version, 1_u32);
Expand Down
Loading