@@ -231,9 +231,6 @@ class TxGraphImpl final : public TxGraph
231
231
std::vector<GroupEntry> m_groups;
232
232
/* * Which clusters are to be merged. GroupEntry::m_cluster_offset indexes into this. */
233
233
std::vector<Cluster*> m_group_clusters;
234
- /* * Whether at least one of the groups cannot be applied because it would result in a
235
- * Cluster that violates the max cluster count or size limit. */
236
- bool m_group_oversized;
237
234
};
238
235
239
236
/* * The collection of all Clusters in main or staged. */
@@ -257,9 +254,7 @@ class TxGraphImpl final : public TxGraph
257
254
GraphIndex m_txcount{0 };
258
255
/* * Total number of individually oversized transactions in the graph. */
259
256
GraphIndex m_txcount_oversized{0 };
260
- /* * Whether this graph is oversized (if known). This roughly matches
261
- * m_group_data->m_group_oversized || (m_txcount_oversized > 0), but may be known even if
262
- * m_group_data is not. */
257
+ /* * Whether this graph is oversized (if known). */
263
258
std::optional<bool > m_oversized{false };
264
259
265
260
ClusterSet () noexcept = default ;
@@ -1463,9 +1458,9 @@ void TxGraphImpl::GroupClusters(int level) noexcept
1463
1458
// back to m_deps_to_add.
1464
1459
clusterset.m_group_data = GroupData{};
1465
1460
clusterset.m_group_data ->m_group_clusters .reserve (an_clusters.size ());
1466
- clusterset.m_group_data ->m_group_oversized = false ;
1467
1461
clusterset.m_deps_to_add .clear ();
1468
1462
clusterset.m_deps_to_add .reserve (an_deps.size ());
1463
+ clusterset.m_oversized = false ;
1469
1464
auto an_deps_it = an_deps.begin ();
1470
1465
auto an_clusters_it = an_clusters.begin ();
1471
1466
while (an_clusters_it != an_clusters.end ()) {
@@ -1495,12 +1490,11 @@ void TxGraphImpl::GroupClusters(int level) noexcept
1495
1490
}
1496
1491
// Detect oversizedness.
1497
1492
if (total_count > m_max_cluster_count || total_size > m_max_cluster_size) {
1498
- clusterset.m_group_data -> m_group_oversized = true ;
1493
+ clusterset.m_oversized = true ;
1499
1494
}
1500
1495
}
1501
1496
Assume (an_deps_it == an_deps.end ());
1502
1497
Assume (an_clusters_it == an_clusters.end ());
1503
- clusterset.m_oversized = clusterset.m_group_data ->m_group_oversized ;
1504
1498
Compact ();
1505
1499
}
1506
1500
@@ -2366,13 +2360,6 @@ void TxGraphImpl::SanityCheck() const
2366
2360
if (!clusterset.m_to_remove .empty ()) compact_possible = false ;
2367
2361
if (!clusterset.m_removed .empty ()) compact_possible = false ;
2368
2362
2369
- // If m_group_data exists, and no outstanding removals remain, m_group_oversized must match
2370
- // m_group_oversized || (m_txcount_oversized > 0).
2371
- if (clusterset.m_group_data .has_value () && clusterset.m_to_remove .empty ()) {
2372
- assert (clusterset.m_oversized ==
2373
- (clusterset.m_group_data ->m_group_oversized || (clusterset.m_txcount_oversized > 0 )));
2374
- }
2375
-
2376
2363
// For non-top levels, m_oversized must be known (as it cannot change until the level
2377
2364
// on top is gone).
2378
2365
if (level < GetTopLevel ()) assert (clusterset.m_oversized .has_value ());
0 commit comments