Skip to content

Restore batch columns and split silent and scan tables by cardinality. #1009

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
Oct 11, 2026
Merged

Restore batch columns and split silent and scan tables by cardinality. #1009

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
adc442e
Restore batch columns and split silent and scan tables by cardinality.
evoskuil Oct 11, 2026
8202375
Write silent drain prefixes and outputs while the points compute.
evoskuil Oct 11, 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
27 changes: 20 additions & 7 deletions include/bitcoin/database/impl/query/batch/ecdsa.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,29 @@ bool CLASS::verify_ecdsa_signatures(const stopper& cancel,
{
auto& bank_table = store_.ecdsa_bank(bank);
const auto correlate_ptr = bank_table.correlate.get_memory();
const auto row_ptr = bank_table.row.get_memory();
const auto digest_ptr = bank_table.digest.get_memory();
const auto compressed_ptr = bank_table.compressed.get_memory();
const auto signature_ptr = bank_table.signature.get_memory();

using correlate_t = const system::ecdsa::batch::correlate_t;
using row_t = const system::ecdsa::batch::row_t;
using digest_t = const table::ecdsa_digest::span;
using compressed_t = const table::ecdsa_compressed::span;
using signature_t = const table::ecdsa_signature::span;

using namespace system;
const auto correlate = pointer_cast<correlate_t>(correlate_ptr.data());
const auto row = pointer_cast<row_t>(row_ptr.data());
const auto digest = pointer_cast<digest_t>(digest_ptr.data());
const auto compressed = pointer_cast<compressed_t>(compressed_ptr.data());
const auto signature = pointer_cast<signature_t>(signature_ptr.data());

// Shortest column.
const auto count = bank_table.count();
const ecdsa::batch batch
{
.correlates = { correlate, count },
.rows = { row, count }
.digests = { digest, count },
.points = { compressed, count },
.signatures = { signature, count }
};

// False return only implies canceled.
Expand All @@ -76,7 +85,9 @@ bool CLASS::set_signatures(const system::chain::ecdsa_signatures& sigs,
const header_link& link, bool bank) NOEXCEPT
{
using correlate_t = table::ecdsa_correlate::put_signatures;
using row_t = table::ecdsa_row::put_signatures;
using digest_t = table::ecdsa_digest::put_signatures;
using compressed_t = table::ecdsa_compressed::put_signatures;
using signature_t = table::ecdsa_signature::put_signatures;

if (sigs.empty())
return true;
Expand All @@ -97,10 +108,12 @@ bool CLASS::set_signatures(const system::chain::ecdsa_signatures& sigs,
// Guard against remap (required for nomaps::put(fk)).
const auto guard = bank_table.guard();

// Write the accumulator to the columns, expanding group bands.
// Deinterleave the accumulator into the columns, expanding group bands.
return
bank_table.correlate.put(fk, correlate_t{ {}, link, sigs }) &&
bank_table.row.put(fk, row_t{ {}, sigs });
bank_table.digest.put(fk, digest_t{ {}, sigs }) &&
bank_table.compressed.put(fk, compressed_t{ {}, sigs }) &&
bank_table.signature.put(fk, signature_t{ {}, sigs });
// ========================================================================
}

Expand Down
27 changes: 20 additions & 7 deletions include/bitcoin/database/impl/query/batch/schnorr.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,29 @@ bool CLASS::verify_schnorr_signatures(const stopper& cancel,
{
auto& bank_table = store_.schnorr_bank(bank);
const auto correlate_ptr = bank_table.correlate.get_memory();
const auto row_ptr = bank_table.row.get_memory();
const auto digest_ptr = bank_table.digest.get_memory();
const auto xonly_ptr = bank_table.xonly.get_memory();
const auto signature_ptr = bank_table.signature.get_memory();

using correlate_t = const system::schnorr::batch::correlate_t;
using row_t = const system::schnorr::batch::row_t;
using digest_t = const table::schnorr_digest::span;
using xonly_t = const table::schnorr_xonly::span;
using signature_t = const table::schnorr_signature::span;

using namespace system;
const auto correlate = pointer_cast<correlate_t>(correlate_ptr.data());
const auto row = pointer_cast<row_t>(row_ptr.data());
const auto digest = pointer_cast<digest_t>(digest_ptr.data());
const auto xonly = pointer_cast<xonly_t>(xonly_ptr.data());
const auto signature = pointer_cast<signature_t>(signature_ptr.data());

// Shortest column.
const auto count = bank_table.count();
const schnorr::batch batch
{
.correlates = { correlate, count },
.rows = { row, count }
.digests = { digest, count },
.points = { xonly, count },
.signatures = { signature, count }
};

// False return only implies canceled.
Expand All @@ -75,7 +84,9 @@ bool CLASS::set_signatures(const system::chain::schnorr_signatures& sigs,
const header_link& link, bool bank) NOEXCEPT
{
using correlate_t = table::schnorr_correlate::put_signatures;
using row_t = table::schnorr_row::put_signatures;
using digest_t = table::schnorr_digest::put_signatures;
using xonly_t = table::schnorr_xonly::put_signatures;
using signature_t = table::schnorr_signature::put_signatures;

if (sigs.empty())
return true;
Expand All @@ -97,10 +108,12 @@ bool CLASS::set_signatures(const system::chain::schnorr_signatures& sigs,
// Guard against remap (required for nomaps::put(fk)).
const auto guard = bank_table.guard();

// Write the accumulator to the columns.
// Deinterleave the accumulator into the columns.
return
bank_table.correlate.put(fk, correlate_t{ {}, link, sigs }) &&
bank_table.row.put(fk, row_t{ {}, sigs });
bank_table.digest.put(fk, digest_t{ {}, sigs }) &&
bank_table.xonly.put(fk, xonly_t{ {}, sigs }) &&
bank_table.signature.put(fk, signature_t{ {}, sigs });
// ========================================================================
}

Expand Down
Loading
Loading