Skip to content

Adapt to store changes. #752

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 1 commit into from
Apr 4, 2025
+129 −82
Merged

Adapt to store changes. #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions console/executor_dumps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,14 @@ void executor::dump_body_sizes() const
query_.outs_body_size() %
query_.candidate_body_size() %
query_.confirmed_body_size() %
query_.duplicate_body_size() %
query_.prevout_body_size() %
query_.strong_tx_body_size() %
query_.validated_tx_body_size() %
query_.validated_bk_body_size() %
query_.address_body_size() %
query_.neutrino_body_size());
query_.validated_tx_body_size() %
query_.filter_bk_body_size() %
query_.filter_tx_body_size() %
query_.address_body_size());
}

void executor::dump_records() const
Expand All @@ -117,8 +119,9 @@ void executor::dump_records() const
query_.outs_records() %
query_.candidate_records() %
query_.confirmed_records() %
query_.prevout_records() %
query_.duplicate_records() %
query_.strong_tx_records() %
query_.filter_bk_records() %
query_.address_records());
}

Expand All @@ -129,12 +132,14 @@ void executor::dump_buckets() const
query_.txs_buckets() %
query_.tx_buckets() %
query_.point_buckets() %
query_.duplicate_buckets() %
query_.prevout_buckets() %
query_.strong_tx_buckets() %
query_.validated_tx_buckets() %
query_.validated_bk_buckets() %
query_.address_buckets() %
query_.neutrino_buckets());
query_.validated_tx_buckets() %
query_.filter_bk_buckets() %
query_.filter_tx_buckets() %
query_.address_buckets());
}

// txs, validated_tx, validated_bk collision rates assume 1:1 records.
Expand All @@ -145,26 +150,21 @@ void executor::dump_collisions() const
(to_double(query_.header_records()) / query_.txs_buckets()) %
(to_double(query_.tx_records()) / query_.tx_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()) %
(to_double(query_.header_records()) / query_.validated_bk_buckets()) %
(query_.address_enabled() ? (to_double(query_.address_records()) /
query_.address_buckets()) : 0) %
(query_.neutrino_enabled() ? (to_double(query_.header_records()) /
query_.neutrino_buckets()) : 0));
(to_double(query_.tx_records()) / query_.validated_tx_buckets()) %
(query_.address_enabled() ?
(to_double(query_.address_records()) / query_.address_buckets()) : zero));
}

void executor::dump_progress() const
{
logger(format(BN_MEASURE_PROGRESS) %
query_.get_fork() %
query_.get_top_confirmed() %
encode_hash(query_.get_header_key(query_.to_confirmed(
query_.get_top_confirmed()))) %
encode_hash(query_.get_header_key(query_.to_confirmed(query_.get_top_confirmed()))) %
query_.get_top_candidate() %
encode_hash(query_.get_header_key(query_.to_candidate(
query_.get_top_candidate()))) %
encode_hash(query_.get_header_key(query_.to_candidate(query_.get_top_candidate()))) %
query_.get_top_associated() %
(query_.get_top_candidate() - query_.get_unassociated_count()) %
query_.get_confirmed_size() %
Expand Down
41 changes: 22 additions & 19 deletions console/localize.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,27 +77,30 @@ namespace node {
" input :%5%\n" \
" output :%6%\n" \
" ins :%7%\n" \
" puts :%8%\n" \
" outs :%8%\n" \
" candidate :%9%\n" \
" confirmed :%10%\n" \
" prevout :%11%\n" \
" strong_tx :%12%\n" \
" valid_tx :%13%\n" \
" duplicate :%11%\n" \
" prevout :%12%\n" \
" strong_tx :%13%\n" \
" valid_bk :%14%\n" \
" address :%15%\n" \
" neutrino :%16%"
" valid_tx :%15%\n" \
" filter_bk :%16%\n" \
" filter_tx :%17%\n" \
" address :%18%"
#define BN_MEASURE_RECORDS \
"Table records...\n" \
" header :%1%\n" \
" tx :%2%\n" \
" point :%3%\n" \
" ins :%4%\n" \
" puts :%5%\n" \
" outs :%5%\n" \
" candidate :%6%\n" \
" confirmed :%7%\n" \
" prevout :%8%\n" \
" duplicate :%8%\n" \
" strong_tx :%9%\n" \
" address :%10%"
" filter_bk :%10%\n" \
" address :%11%"
#define BN_MEASURE_SLABS \
"Table slabs..."
#define BN_MEASURE_SLABS_ROW \
Expand All @@ -112,24 +115,24 @@ namespace node {
" txs :%2%\n" \
" tx :%3%\n" \
" point :%4%\n" \
" prevout :%5%\n" \
" strong_tx :%6%\n" \
" valid_tx :%7%\n" \
" duplicate :%5%\n" \
" prevout :%6%\n" \
" strong_tx :%7%\n" \
" valid_bk :%8%\n" \
" address :%9%\n" \
" neutrino :%10%"
" valid_tx :%9%\n" \
" filter_bk :%10%\n" \
" filter_tx :%11%\n" \
" address :%12%"
#define BN_MEASURE_COLLISION_RATES \
"Collision rates...\n" \
" header :%1%\n" \
" txs :%2%\n" \
" tx :%3%\n" \
" point :%4%\n" \
" prevout :%5%\n" \
" strong_tx :%6%\n" \
" strong_tx :%5%\n" \
" valid_bk :%6%\n" \
" valid_tx :%7%\n" \
" valid_bk :%8%\n" \
" address :%9%\n" \
" neutrino :%10%"
" address :%8%"
#define BN_MEASURE_PROGRESS_START \
"Thinking..."
#define BN_MEASURE_PROGRESS \
Expand Down
10 changes: 5 additions & 5 deletions src/chasers/chaser_confirm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,11 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
return;
}

if (!query.set_filter_head(link))
{
fault(error::confirm9);
return;
}
////if (!query.set_filter_head(link))
////{
//// fault(error::confirm9);
//// return;
////}

if (!set_organized(link, height))
{
Expand Down
10 changes: 5 additions & 5 deletions src/chasers/chaser_validate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ chaser_validate::chaser_validate(full_node& node) NOEXCEPT
subsidy_interval_(node.config().bitcoin.subsidy_interval_blocks),
initial_subsidy_(node.config().bitcoin.initial_subsidy()),
maximum_backlog_(node.config().node.maximum_concurrency_()),
filter_(node.archive().neutrino_enabled())
filter_(node.archive().filter_enabled())
{
}

Expand Down Expand Up @@ -227,10 +227,10 @@ void chaser_validate::validate_block(const header_link& link,
if (!query.set_block_unconfirmable(link))
ec = error::validate4;
}
else if (!query.set_filter_body(link, *block))
{
ec = error::validate5;
}
////else if (!query.set_filter_body(link, *block))
////{
//// ec = error::validate5;
////}

backlog_.fetch_sub(one, std::memory_order_relaxed);

Expand Down
116 changes: 80 additions & 36 deletions src/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,27 +114,37 @@ parser::parser(system::chain::selection context) NOEXCEPT

// database (caches)

configured.database.duplicate_buckets = 10;
configured.database.duplicate_size = 44;
configured.database.duplicate_rate = 5;

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

configured.database.validated_tx_buckets = 1;
configured.database.validated_tx_size = 1;
configured.database.validated_tx_rate = 5;

configured.database.validated_bk_buckets = 740'001;
configured.database.validated_bk_size = 3'400'000;
configured.database.validated_bk_rate = 5;

configured.database.validated_tx_buckets = 1;
configured.database.validated_tx_size = 1;
configured.database.validated_tx_rate = 5;

// database (optionals)

configured.database.address_buckets = 1;
configured.database.address_size = 1;
configured.database.address_rate = 5;

configured.database.neutrino_buckets = 1;
configured.database.neutrino_size = 1;
configured.database.neutrino_rate = 5;
// also disabled by filter_tx
configured.database.filter_bk_buckets = 0;
configured.database.filter_bk_size = 1;
configured.database.filter_bk_rate = 5;

// also disabled by filter_bk
configured.database.filter_tx_buckets = 0;
configured.database.filter_tx_size = 1;
configured.database.filter_tx_rate = 5;
}

options_metadata parser::load_options() THROWS
Expand Down Expand Up @@ -808,6 +818,23 @@ options_metadata parser::load_settings() THROWS
"The percentage expansion of the strong_tx table body, defaults to '5'."
)

/* duplicate */
(
"database.duplicate_buckets",
value<uint16_t>(&configured.database.duplicate_buckets),
"The minimum number of buckets in the duplicate table head, defaults to '10'."
)
(
"database.duplicate_size",
value<uint64_t>(&configured.database.duplicate_size),
"The minimum allocation of the duplicate table body, defaults to '44'."
)
(
"database.duplicate_rate",
value<uint16_t>(&configured.database.duplicate_rate),
"The percentage expansion of the duplicate table, defaults to '5'."
)

/* prevout */
(
"database.prevout_buckets",
Expand All @@ -822,24 +849,7 @@ options_metadata parser::load_settings() THROWS
(
"database.prevout_rate",
value<uint16_t>(&configured.database.prevout_rate),
"The percentage expansion of the prevout table and body, defaults to '5'."
)

/* validated_tx */
(
"database.validated_tx_buckets",
value<uint32_t>(&configured.database.validated_tx_buckets),
"The number of buckets in the validated_tx table head, defaults to '1' (0|1 disables)."
)
(
"database.validated_tx_size",
value<uint64_t>(&configured.database.validated_tx_size),
"The minimum allocation of the validated_tx table body, defaults to '1'."
)
(
"database.validated_tx_rate",
value<uint16_t>(&configured.database.validated_tx_rate),
"The percentage expansion of the validated_tx table body, defaults to '5'."
"The percentage expansion of the prevout table, defaults to '5'."
)

/* validated_bk */
Expand All @@ -859,6 +869,23 @@ options_metadata parser::load_settings() THROWS
"The percentage expansion of the validated_bk table body, defaults to '5'."
)

/* validated_tx */
(
"database.validated_tx_buckets",
value<uint32_t>(&configured.database.validated_tx_buckets),
"The number of buckets in the validated_tx table head, defaults to '1'."
)
(
"database.validated_tx_size",
value<uint64_t>(&configured.database.validated_tx_size),
"The minimum allocation of the validated_tx table body, defaults to '1'."
)
(
"database.validated_tx_rate",
value<uint16_t>(&configured.database.validated_tx_rate),
"The percentage expansion of the validated_tx table body, defaults to '5'."
)

/* address */
(
"database.address_buckets",
Expand All @@ -873,24 +900,41 @@ options_metadata parser::load_settings() THROWS
(
"database.address_rate",
value<uint16_t>(&configured.database.address_rate),
"The percentage expansion of the address table body, defaults to '0'."
"The percentage expansion of the address table body, defaults to '5'."
)

/* filter_bk */
(
"database.filter_bk_buckets",
value<uint32_t>(&configured.database.filter_bk_buckets),
"The log2 number of buckets in the filter_bk table head, defaults to '0' (0 disables)."
)
(
"database.filter_bk_size",
value<uint64_t>(&configured.database.filter_bk_size),
"The minimum allocation of the filter_bk table body, defaults to '1'."
)
(
"database.filter_bk_rate",
value<uint16_t>(&configured.database.filter_bk_rate),
"The percentage expansion of the filter_bk table body, defaults to '5'."
)

/* neutrino */
/* filter_tx */
(
"database.neutrino_buckets",
value<uint32_t>(&configured.database.neutrino_buckets),
"The log2 number of buckets in the neutrino table head, defaults to '1' (0|1 disables)."
"database.filter_tx_buckets",
value<uint32_t>(&configured.database.filter_tx_buckets),
"The log2 number of buckets in the filter_tx table head, defaults to '0' (0 disables)."
)
(
"database.neutrino_size",
value<uint64_t>(&configured.database.neutrino_size),
"The minimum allocation of the neutrino table body, defaults to '1'."
"database.filter_tx_size",
value<uint64_t>(&configured.database.filter_tx_size),
"The minimum allocation of the filter_tx table body, defaults to '1'."
)
(
"database.neutrino_rate",
value<uint16_t>(&configured.database.neutrino_rate),
"The percentage expansion of the neutrino table body, defaults to '0'."
"database.filter_tx_rate",
value<uint16_t>(&configured.database.filter_tx_rate),
"The percentage expansion of the filter_tx table body, defaults to '5'."
)

/* [node] */
Expand Down
Loading