cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-31 10:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33469: TxGraph: change m_excluded_clusters

Browse Source 
9b43428c96872f0fbbbab4c066c6010fc18c6cc4 TxGraph: change m_excluded_clusters (Greg Sanders)

Pull request description:

  Change BlockBuilderImpl's m_excluded_clusters to unordered set since ordering is not used.

  Change the set to a set of sequence numbers for a modest stability increase under fuzz testing.

ACKs for top commit:
  sipa:
    ACK 9b43428c96872f0fbbbab4c066c6010fc18c6cc4
  marcofleon:
    tACK 9b43428c96872f0fbbbab4c066c6010fc18c6cc4
  glozow:
    ACK 9b43428c96872f0fbbbab4c066c6010fc18c6cc4

Tree-SHA512: 140a492af93f3eff756847a8168aab2624bb7df407f177dde6f3b07e9db2d0ced6b125e2b126f4957ccd054272056bedf74f9f0e64a80d90c16fd94e0fa86a44
This commit is contained in:
merge-script 2025-10-15 10:00:49 -04:00
commit e14451ac87
No known key found for this signature in database
GPG Key ID: BA03F4DBE0C63FB4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/txgraph.cpp
View File

@ -16,6 +16,7 @@
#include <memory>
#include <set>
#include <span>
#include <unordered_set>
#include <utility>
namespace {
@ -99,6 +100,7 @@ struct TrimTxData
class Cluster
{
friend class TxGraphImpl;
friend class BlockBuilderImpl;
protected:
using GraphIndex = TxGraph::GraphIndex;
@ -802,8 +804,8 @@ class BlockBuilderImpl final : public TxGraph::BlockBuilder
/** Which TxGraphImpl this object is doing block building for. It will have its
* m_main_chunkindex_observers incremented as long as this BlockBuilderImpl exists. */
TxGraphImpl* const m_graph;
/** Clusters which we're not including further transactions from. */
std::set<Cluster*> m_excluded_clusters;
/** Cluster sequence numbers which we're not including further transactions from. */
std::unordered_set<uint64_t> m_excluded_clusters;
/** Iterator to the current chunk in the chunk index. end() if nothing further remains. */
TxGraphImpl::ChunkIndex::const_iterator m_cur_iter;
/** Which cluster the current chunk belongs to, so we can exclude further transactions from it
@ -3074,7 +3076,7 @@ void BlockBuilderImpl::Next() noexcept
m_cur_cluster = chunk_end_entry.m_locator[0].cluster;
m_known_end_of_cluster = false;
// If we previously skipped a chunk from this cluster we cannot include more from it.
if (!m_excluded_clusters.contains(m_cur_cluster)) break;
if (!m_excluded_clusters.contains(m_cur_cluster->m_sequence)) break;
}
}
@ -3148,7 +3150,7 @@ void BlockBuilderImpl::Skip() noexcept
// chunk of the cluster. This may significantly reduce the size of m_excluded_clusters,
// especially when many singleton clusters are ignored.
if (m_cur_cluster != nullptr && !m_known_end_of_cluster) {
m_excluded_clusters.insert(m_cur_cluster);
m_excluded_clusters.insert(m_cur_cluster->m_sequence);
}
Next();
}