Skip to content

Update table names, settings, and command output. #1064

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 4 commits into from
Oct 13, 2026
Merged

Update table names, settings, and command output. #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49dd310
Run ci on branch pushes.
evoskuil Oct 13, 2026
762f5fb
Rename strong_tx table to strong.
evoskuil Oct 13, 2026
49bd169
Add wtxid table settings.
evoskuil Oct 13, 2026
0087d3a
Use the same table names in all command output.
evoskuil Oct 13, 2026
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ on:
- 'src/**'
- 'test/**'
push:
branches:
- "**"
tags-ignore:
- "**"
paths:
Expand Down
18 changes: 11 additions & 7 deletions console/executor_dumps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,12 @@ void executor::dump_body_sizes() const
query_.silent1_prefix_body_size(),
query_.prevout_body_size(),
query_.duplicate_body_size(),
query_.strong_tx_body_size(),
query_.strong_body_size(),
query_.scan_body_size(),
query_.scan_prefix_body_size(),
query_.state_body_size(),
query_.pool_body_size(),
query_.wtxid_body_size(),
query_.spends_body_size(),
query_.filter_bk_body_size(),
query_.filter_tx_body_size()));
Expand Down Expand Up @@ -195,11 +196,12 @@ void executor::dump_records() const
query_.silent0_prefix_records(),
query_.silent1_prefix_records(),
query_.duplicate_records(),
query_.strong_tx_records(),
query_.strong_records(),
query_.scan_records(),
query_.scan_prefix_records(),
query_.state_records(),
query_.pool_records(),
query_.wtxid_records(),
query_.spends_records(),
query_.filter_bk_records()));
}
Expand All @@ -214,8 +216,9 @@ void executor::dump_buckets() const
query_.outs_buckets(),
query_.prevout_buckets(),
query_.duplicate_buckets(),
query_.strong_tx_buckets(),
query_.strong_buckets(),
query_.pool_buckets(),
query_.wtxid_buckets(),
query_.filter_bk_buckets(),
query_.filter_tx_buckets()));
}
Expand All @@ -230,19 +233,20 @@ void executor::dump_collisions() const
const auto header = rate(query_.header_records(), query_.header_buckets());
const auto tx = rate(query_.tx_records(), query_.tx_buckets());
const auto ins = rate(query_.ins_records(), query_.ins_buckets());
const auto strong = rate(query_.strong_tx_records(), query_.strong_tx_buckets());
const auto strong = rate(query_.strong_records(), query_.strong_buckets());
const auto pool = rate(query_.pool_records(), query_.pool_buckets());
const auto wtxid = rate(query_.wtxid_records(), query_.wtxid_buckets());

if (query_.address_enabled())
{
const auto outs = rate(query_.outs_records(), query_.outs_buckets());
logger(std::format(BS_INFORMATION_COLLISION_RATES_ADDRESS,
header, tx, ins, outs, strong, pool));
logger(std::format(BS_INFORMATION_COLLISION_RATES_OUTS,
header, tx, ins, outs, strong, pool, wtxid));
return;
}

logger(std::format(BS_INFORMATION_COLLISION_RATES,
header, tx, ins, strong, pool));
header, tx, ins, strong, pool, wtxid));
}

void executor::dump_progress() const
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 @@ -131,8 +131,8 @@ void executor::scan_buckets() const
scan_buckets("header", store_.header, query_.header_records());
scan_buckets("tx", store_.tx, query_.tx_records());
scan_buckets("ins", store_.ins, query_.ins_records());
scan_buckets("address", store_.outs, query_.outs_records());
scan_buckets("strong_tx", store_.strong_tx, query_.strong_tx_records());
scan_buckets("outs", store_.outs, query_.outs_records());
scan_buckets("strong", store_.strong, query_.strong_records());
scan_buckets("duplicate", store_.duplicate, query_.duplicate_records());
scan_buckets("pool", store_.pool, query_.pool_records());
scan_buckets("wtxid", store_.wtxid, query_.wtxid_records());
Expand Down Expand Up @@ -372,13 +372,13 @@ void executor::scan_collisions()
tx_link::integer>(index));
});

scan_collisions<table::strong_tx>("strong_tx",
query_.strong_tx_records(), query_.strong_tx_buckets(),
store_.strong_tx.filter_k(), distributions, filters,
scan_collisions<table::strong>("strong",
query_.strong_records(), query_.strong_buckets(),
store_.strong.filter_k(), distributions, filters,
[&](size_t index)
{
return store_.strong_tx.get_key(possible_narrow_cast<
table::strong_tx::link::integer>(index));
return store_.strong.get_key(possible_narrow_cast<
table::strong::link::integer>(index));
});

scan_collisions<table::ins>("ins", query_.ins_records(),
Expand Down
169 changes: 87 additions & 82 deletions console/localize.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,97 +128,102 @@
// --information
#define BS_INFORMATION_START \
"Configuration...\n" \
" dirty :{:d}\n" \
" interval :{}"
" dirty :{:d}\n" \
" interval :{}"
#define BS_INFORMATION_SIZES \
"Body sizes...\n" \
" header :{}\n" \
" txs :{}\n" \
" tx :{}\n" \
" input :{}\n" \
" output :{}\n" \
" ins :{}\n" \
" outs :{}\n" \
" candidate :{}\n" \
" confirmed :{}\n" \
" ecdsa0 :{}\n" \
" ecdsa1 :{}\n" \
" schnorr0 :{}\n" \
" schnorr1 :{}\n" \
" prevalid0 :{}\n" \
" prevalid1 :{}\n" \
" presilent0:{}\n" \
" presilent1:{}\n" \
" silent0 :{}\n" \
" silent1 :{}\n" \
" silent0pfx:{}\n" \
" silent1pfx:{}\n" \
" prevout :{}\n" \
" duplicate :{}\n" \
" strong_tx :{}\n" \
" scan :{}\n" \
" scanprefix:{}\n" \
" state :{}\n" \
" pool :{}\n" \
" spends :{}\n" \
" filter_bk :{}\n" \
" filter_tx :{}"
" header :{}\n" \
" txs :{}\n" \
" tx :{}\n" \
" input :{}\n" \
" output :{}\n" \
" ins :{}\n" \
" outs :{}\n" \
" candidate :{}\n" \
" confirmed :{}\n" \
" ecdsa0 :{}\n" \
" ecdsa1 :{}\n" \
" schnorr0 :{}\n" \
" schnorr1 :{}\n" \
" prevalid0 :{}\n" \
" prevalid1 :{}\n" \
" presilent0 :{}\n" \
" presilent1 :{}\n" \
" silent0 :{}\n" \
" silent1 :{}\n" \
" silent0_prefix:{}\n" \
" silent1_prefix:{}\n" \
" prevout :{}\n" \
" duplicate :{}\n" \
" strong :{}\n" \
" scan :{}\n" \
" scan_prefix :{}\n" \
" state :{}\n" \
" pool :{}\n" \
" wtxid :{}\n" \
" spends :{}\n" \
" filter_bk :{}\n" \
" filter_tx :{}"
#define BS_INFORMATION_RECORDS \
"Table records...\n" \
" header :{}\n" \
" tx :{}\n" \
" ins :{}\n" \
" outs :{}\n" \
" candidate :{}\n" \
" confirmed :{}\n" \
" ecdsa0 :{}\n" \
" ecdsa1 :{}\n" \
" schnorr0 :{}\n" \
" schnorr1 :{}\n" \
" prevalid0 :{}\n" \
" prevalid1 :{}\n" \
" presilent0:{}\n" \
" presilent1:{}\n" \
" silent0 :{}\n" \
" silent1 :{}\n" \
" silent0pfx:{}\n" \
" silent1pfx:{}\n" \
" duplicate :{}\n" \
" strong_tx :{}\n" \
" scan :{}\n" \
" scanprefix:{}\n" \
" state :{}\n" \
" pool :{}\n" \
" spends :{}\n" \
" filter_bk :{}"
" header :{}\n" \
" tx :{}\n" \
" ins :{}\n" \
" outs :{}\n" \
" candidate :{}\n" \
" confirmed :{}\n" \
" ecdsa0 :{}\n" \
" ecdsa1 :{}\n" \
" schnorr0 :{}\n" \
" schnorr1 :{}\n" \
" prevalid0 :{}\n" \
" prevalid1 :{}\n" \
" presilent0 :{}\n" \
" presilent1 :{}\n" \
" silent0 :{}\n" \
" silent1 :{}\n" \
" silent0_prefix:{}\n" \
" silent1_prefix:{}\n" \
" duplicate :{}\n" \
" strong :{}\n" \
" scan :{}\n" \
" scan_prefix :{}\n" \
" state :{}\n" \
" pool :{}\n" \
" wtxid :{}\n" \
" spends :{}\n" \
" filter_bk :{}"
#define BS_INFORMATION_BUCKETS \
"Head buckets...\n" \
" header :{}\n" \
" txs :{}\n" \
" tx :{}\n" \
" ins :{}\n" \
" outs :{}\n" \
" prevout :{}\n" \
" duplicate :{}\n" \
" strong_tx :{}\n" \
" pool :{}\n" \
" filter_bk :{}\n" \
" filter_tx :{}"
" header :{}\n" \
" txs :{}\n" \
" tx :{}\n" \
" ins :{}\n" \
" outs :{}\n" \
" prevout :{}\n" \
" duplicate :{}\n" \
" strong :{}\n" \
" pool :{}\n" \
" wtxid :{}\n" \
" filter_bk :{}\n" \
" filter_tx :{}"
#define BS_INFORMATION_COLLISION_RATES \
"Collision rates...\n" \
" header :{}\n" \
" tx :{}\n" \
" ins :{}\n" \
" strong_tx :{}\n" \
" pool :{}"
#define BS_INFORMATION_COLLISION_RATES_ADDRESS \
" header :{}\n" \
" tx :{}\n" \
" ins :{}\n" \
" strong :{}\n" \
" pool :{}\n" \
" wtxid :{}"
#define BS_INFORMATION_COLLISION_RATES_OUTS \
"Collision rates...\n" \
" header :{}\n" \
" tx :{}\n" \
" ins :{}\n" \
" outs :{}\n" \
" strong_tx :{}\n" \
" pool :{}"
" header :{}\n" \
" tx :{}\n" \
" ins :{}\n" \
" outs :{}\n" \
" strong :{}\n" \
" pool :{}\n" \
" wtxid :{}"
#define BS_INFORMATION_PROGRESS_START \
"Thinking..."
#define BS_INFORMATION_PROGRESS \
Expand Down
Loading
Loading