highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 13:42:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

txindex: pass the full block to DB::WriteTxs

Browse Source 
Move the per-transaction position computation from CustomAppend into
DB::WriteTxs, so the DB layer receives the whole block instead of a
pre-built vector of positions. This is a non-functional refactor.
This commit is contained in:
Andrew Toth
2026-07-25 18:51:06 -04:00
parent 42771e7998
commit 327660134c
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/index/txindex.cpp
View File

@@ -45,8 +45,8 @@ public:
/// transaction hash is not indexed.
bool ReadTxPos(const Txid& txid, CDiskTxPos& pos) const;
/// Write a batch of transaction positions to the DB.
void WriteTxs(const std::vector<std::pair<Txid, CDiskTxPos>>& v_pos);
/// Write a block of transaction positions to the DB.
void WriteTxs(const interfaces::BlockInfo& block);
CBlockLocator ReadBestBlock() const override;
void WriteBestBlock(CDBBatch& batch, const CBlockLocator& locator) override;
@@ -76,11 +76,13 @@ void TxIndex::DB::WriteBestBlock(CDBBatch& batch, const CBlockLocator& locator)
batch.Write(DB_BEST_BLOCK_V2, locator);
}
void TxIndex::DB::WriteTxs(const std::vector<std::pair<Txid, CDiskTxPos>>& v_pos)
void TxIndex::DB::WriteTxs(const interfaces::BlockInfo& block)
{
CDBBatch batch(*this);
for (const auto& [txid, pos] : v_pos) {
batch.Write(std::make_pair(DB_TXINDEX, txid.ToUint256()), pos);
CDiskTxPos pos({block.file_number, block.data_pos}, GetSizeOfCompactSize(block.data->vtx.size()));
for (const auto& tx : block.data->vtx) {
batch.Write(std::make_pair(DB_TXINDEX, tx->GetHash().ToUint256()), pos);
pos.nTxOffset += ::GetSerializeSize(TX_WITH_WITNESS(*tx));
}
WriteBatch(batch);
}
@@ -97,14 +99,7 @@ bool TxIndex::CustomAppend(const interfaces::BlockInfo& block)
if (block.height == 0) return true;
assert(block.data);
CDiskTxPos pos({block.file_number, block.data_pos}, GetSizeOfCompactSize(block.data->vtx.size()));
std::vector<std::pair<Txid, CDiskTxPos>> vPos;
vPos.reserve(block.data->vtx.size());
for (const auto& tx : block.data->vtx) {
vPos.emplace_back(tx->GetHash(), pos);
pos.nTxOffset += ::GetSerializeSize(TX_WITH_WITNESS(*tx));
}
m_db->WriteTxs(vPos);
m_db->WriteTxs(block);
return true;
}