Skip to content

Commit 923edd6

Browse files
marta-lokhovamarta-lokhova
committed
Remove unused arguments in various interfaces touched by the apply path
1 parent 6ec9e02 commit 923edd6

11 files changed

+40
-71
lines changed

‎src/herder/HerderPersistence.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ class HerderPersistence
3636
std::vector<SCPEnvelope> const& envs,
3737
QuorumTracker::QuorumMap const& qmap) = 0;
3838

39-
static size_t copySCPHistoryToStream(Database& db, soci::session& sess,
39+
static size_t copySCPHistoryToStream(soci::session& sess,
4040
uint32_t ledgerSeq,
4141
uint32_t ledgerCount,
4242
XDROutputFileStream& scpHistory);
4343
// quorum information lookup
44-
static std::optional<Hash>
45-
getNodeQuorumSet(Database& db, soci::session& sess, NodeID const& nodeID);
46-
static SCPQuorumSetPtr getQuorumSet(Database& db, soci::session& sess,
44+
static std::optional<Hash> getNodeQuorumSet(soci::session& sess,
45+
NodeID const& nodeID);
46+
static SCPQuorumSetPtr getQuorumSet(soci::session& sess,
4747
Hash const& qSetHash);
4848

4949
static void dropAll(Database& db);
50-
static void deleteOldEntries(Database& db, uint32_t ledgerSeq,
50+
static void deleteOldEntries(soci::session& sess, uint32_t ledgerSeq,
5151
uint32_t count);
5252
};
5353
}

‎src/herder/HerderPersistenceImpl.cpp

+9-11
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ HerderPersistenceImpl::saveSCPHistory(uint32_t seq,
230230
}
231231

232232
size_t
233-
HerderPersistence::copySCPHistoryToStream(Database& db, soci::session& sess,
233+
HerderPersistence::copySCPHistoryToStream(soci::session& sess,
234234
uint32_t ledgerSeq,
235235
uint32_t ledgerCount,
236236
XDROutputFileStream& scpHistory)
@@ -300,7 +300,7 @@ HerderPersistence::copySCPHistoryToStream(Database& db, soci::session& sess,
300300
{
301301
std::string qset64, qSetHashHex;
302302

303-
auto qset = getQuorumSet(db, sess, q);
303+
auto qset = getQuorumSet(sess, q);
304304
if (!qset)
305305
{
306306
throw std::runtime_error(
@@ -319,8 +319,7 @@ HerderPersistence::copySCPHistoryToStream(Database& db, soci::session& sess,
319319
}
320320

321321
std::optional<Hash>
322-
HerderPersistence::getNodeQuorumSet(Database& db, soci::session& sess,
323-
NodeID const& nodeID)
322+
HerderPersistence::getNodeQuorumSet(soci::session& sess, NodeID const& nodeID)
324323
{
325324
ZoneScoped;
326325
std::string nodeIDStrKey = KeyUtils::toStrKey(nodeID);
@@ -345,8 +344,7 @@ HerderPersistence::getNodeQuorumSet(Database& db, soci::session& sess,
345344
}
346345

347346
SCPQuorumSetPtr
348-
HerderPersistence::getQuorumSet(Database& db, soci::session& sess,
349-
Hash const& qSetHash)
347+
HerderPersistence::getQuorumSet(soci::session& sess, Hash const& qSetHash)
350348
{
351349
ZoneScoped;
352350
SCPQuorumSetPtr res;
@@ -412,13 +410,13 @@ HerderPersistence::dropAll(Database& db)
412410
}
413411

414412
void
415-
HerderPersistence::deleteOldEntries(Database& db, uint32_t ledgerSeq,
413+
HerderPersistence::deleteOldEntries(soci::session& sess, uint32_t ledgerSeq,
416414
uint32_t count)
417415
{
418416
ZoneScoped;
419-
DatabaseUtils::deleteOldEntriesHelper(db.getRawSession(), ledgerSeq, count,
420-
"scphistory", "ledgerseq");
421-
DatabaseUtils::deleteOldEntriesHelper(db.getRawSession(), ledgerSeq, count,
422-
"scpquorums", "lastledgerseq");
417+
DatabaseUtils::deleteOldEntriesHelper(sess, ledgerSeq, count, "scphistory",
418+
"ledgerseq");
419+
DatabaseUtils::deleteOldEntriesHelper(sess, ledgerSeq, count, "scpquorums",
420+
"lastledgerseq");
423421
}
424422
}

‎src/herder/PendingEnvelopes.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ PendingEnvelopes::getQSet(Hash const& hash)
745745
else
746746
{
747747
auto& db = mApp.getDatabase();
748-
qset = HerderPersistence::getQuorumSet(db, db.getRawSession(), hash);
748+
qset = HerderPersistence::getQuorumSet(db.getRawSession(), hash);
749749
}
750750
if (qset)
751751
{
@@ -813,8 +813,8 @@ PendingEnvelopes::rebuildQuorumTrackerState()
813813
{
814814
// see if we had some information for that node
815815
auto& db = mApp.getDatabase();
816-
auto h = HerderPersistence::getNodeQuorumSet(
817-
db, db.getRawSession(), id);
816+
auto h =
817+
HerderPersistence::getNodeQuorumSet(db.getRawSession(), id);
818818
if (h)
819819
{
820820
res = getQSet(*h);

‎src/herder/TxSetFrame.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
#include "database/Database.h"
1212
#include "herder/SurgePricingUtils.h"
1313
#include "ledger/LedgerManager.h"
14-
#include "ledger/LedgerTxn.h"
15-
#include "ledger/LedgerTxnEntry.h"
16-
#include "ledger/LedgerTxnHeader.h"
1714
#include "main/Application.h"
1815
#include "main/Config.h"
1916
#include "overlay/Peer.h"

‎src/history/HistoryManagerImpl.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ HistoryManagerImpl::dropSQLBasedPublish()
187187
auto begin = firstLedgerInCheckpointContaining(checkpoint, cfg);
188188
populateCheckpointFilesFromDB(mApp, sess.session(), begin, freq,
189189
mCheckpointBuilder);
190-
LedgerHeaderUtils::copyToStream(db, sess.session(), begin, freq,
190+
LedgerHeaderUtils::copyToStream(sess.session(), begin, freq,
191191
mCheckpointBuilder);
192192
// Checkpoints in publish queue are complete, so we can finalize them
193193
mCheckpointBuilder.checkpointComplete(checkpoint);
@@ -203,8 +203,8 @@ HistoryManagerImpl::dropSQLBasedPublish()
203203
mApp, sess.session(), firstLedgerInCheckpointContaining(lcl, cfg),
204204
freq, mCheckpointBuilder);
205205
LedgerHeaderUtils::copyToStream(
206-
db, sess.session(), firstLedgerInCheckpointContaining(lcl, cfg),
207-
freq, mCheckpointBuilder);
206+
sess.session(), firstLedgerInCheckpointContaining(lcl, cfg), freq,
207+
mCheckpointBuilder);
208208
}
209209
db.clearPreparedStatementCache(sess);
210210

@@ -360,14 +360,14 @@ HistoryManager::getMinLedgerQueuedToPublish(Config const& cfg)
360360
forEveryQueuedCheckpoint(
361361
publishQueuePath(cfg).string(),
362362
[&](uint32_t seq, std::string const& f) { min = std::min(min, seq); });
363-
return min;
363+
return min == std::numeric_limits<uint32_t>::max() ? 0 : min;
364364
}
365365

366366
uint32_t
367367
HistoryManager::getMaxLedgerQueuedToPublish(Config const& cfg)
368368
{
369369
ZoneScoped;
370-
auto max = std::numeric_limits<uint32_t>::min();
370+
uint32_t max = 0;
371371
forEveryQueuedCheckpoint(
372372
publishQueuePath(cfg).string(),
373373
[&](uint32_t seq, std::string const& f) { max = std::max(max, seq); });
@@ -514,7 +514,7 @@ HistoryManagerImpl::publishQueuedHistory()
514514

515515
ZoneScoped;
516516
auto seq = getMinLedgerQueuedToPublish(mApp.getConfig());
517-
if (seq == std::numeric_limits<uint32_t>::max())
517+
if (seq == 0)
518518
{
519519
return 0;
520520
}

‎src/history/StateSnapshot.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ StateSnapshot::writeSCPMessages() const
8585
count, begin);
8686

8787
nbSCPMessages = HerderPersistence::copySCPHistoryToStream(
88-
mApp.getDatabase(), sess, begin, count, scpHistory);
88+
sess, begin, count, scpHistory);
8989

9090
CLOG_DEBUG(History, "Wrote {} SCP messages to {}", nbSCPMessages,
9191
mSCPHistorySnapFile->localPath_nogz());

‎src/ledger/LedgerHeaderUtils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ deleteOldEntries(soci::session& sess, uint32_t ledgerSeq, uint32_t count)
198198
}
199199

200200
size_t
201-
copyToStream(Database& db, soci::session& sess, uint32_t ledgerSeq,
202-
uint32_t ledgerCount, CheckpointBuilder& checkpointBuilder)
201+
copyToStream(soci::session& sess, uint32_t ledgerSeq, uint32_t ledgerCount,
202+
CheckpointBuilder& checkpointBuilder)
203203
{
204204
ZoneNamedN(selectLedgerHeadersZone, "select ledgerheaders history", true);
205205
uint32_t begin = ledgerSeq, end = ledgerSeq + ledgerCount;

‎src/ledger/LedgerHeaderUtils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ uint32_t loadMaxLedgerSeq(Database& db);
3232

3333
void deleteOldEntries(soci::session& sess, uint32_t ledgerSeq, uint32_t count);
3434

35-
size_t copyToStream(Database& db, soci::session& sess, uint32_t ledgerSeq,
35+
size_t copyToStream(soci::session& sess, uint32_t ledgerSeq,
3636
uint32_t ledgerCount, CheckpointBuilder& checkpointBuilder);
3737

3838
void dropAll(Database& db);

‎src/ledger/LedgerManager.h

+2-6
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,8 @@ class LedgerManager
304304
}
305305
#endif
306306

307-
// deletes old entries stored in the database
308-
virtual void deleteOldEntries(Database& db, uint32_t ledgerSeq,
309-
uint32_t count) = 0;
310-
311-
virtual void setLastClosedLedger(LedgerHeaderHistoryEntry const& lastClosed,
312-
bool storeInDB) = 0;
307+
virtual void
308+
setLastClosedLedger(LedgerHeaderHistoryEntry const& lastClosed) = 0;
313309

314310
virtual void manuallyAdvanceLedgerHeader(LedgerHeader const& header) = 0;
315311

‎src/ledger/LedgerManagerImpl.cpp

+6-26
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ LedgerManagerImpl::getLastClosedLedgerTxMeta()
544544
void
545545
LedgerManagerImpl::storeCurrentLedgerForTest(LedgerHeader const& header)
546546
{
547-
storePersistentStateAndLedgerHeaderInDB(header, true, true);
547+
storePersistentStateAndLedgerHeaderInDB(header, true);
548548
}
549549
#endif
550550

@@ -1108,39 +1108,20 @@ LedgerManagerImpl::applyLedger(LedgerCloseData const& ledgerData,
11081108
ledgerTimeSeconds.count());
11091109
FrameMark;
11101110
}
1111-
void
1112-
LedgerManagerImpl::deleteOldEntries(Database& db, uint32_t ledgerSeq,
1113-
uint32_t count)
1114-
{
1115-
ZoneScoped;
1116-
if (mApp.getConfig().parallelLedgerClose())
1117-
{
1118-
auto session =
1119-
std::make_unique<soci::session>(mApp.getDatabase().getPool());
1120-
LedgerHeaderUtils::deleteOldEntries(*session, ledgerSeq, count);
1121-
}
1122-
else
1123-
{
1124-
LedgerHeaderUtils::deleteOldEntries(db.getRawSession(), ledgerSeq,
1125-
count);
1126-
}
1127-
}
11281111

11291112
void
11301113
LedgerManagerImpl::setLastClosedLedger(
1131-
LedgerHeaderHistoryEntry const& lastClosed, bool storeInDB)
1114+
LedgerHeaderHistoryEntry const& lastClosed)
11321115
{
11331116
ZoneScoped;
11341117
releaseAssert(threadIsMain());
11351118
LedgerTxn ltx(mApp.getLedgerTxnRoot());
11361119
auto header = ltx.loadHeader();
11371120
header.current() = lastClosed.header;
1138-
auto has =
1139-
storePersistentStateAndLedgerHeaderInDB(header.current(), storeInDB,
1140-
/* appendToCheckpoint */ false);
1121+
auto has = storePersistentStateAndLedgerHeaderInDB(
1122+
header.current(), /* appendToCheckpoint */ false);
11411123
ltx.commit();
11421124

1143-
mRebuildInMemoryState = false;
11441125
advanceLastClosedLedgerState(
11451126
advanceBucketListSnapshotAndMakeLedgerState(lastClosed.header, has));
11461127

@@ -1702,7 +1683,7 @@ LedgerManagerImpl::logTxApplyMetrics(AbstractLedgerTxn& ltx, size_t numTxs,
17021683

17031684
HistoryArchiveState
17041685
LedgerManagerImpl::storePersistentStateAndLedgerHeaderInDB(
1705-
LedgerHeader const& header, bool storeHeader, bool appendToCheckpoint)
1686+
LedgerHeader const& header, bool appendToCheckpoint)
17061687
{
17071688
ZoneScoped;
17081689

@@ -1860,8 +1841,7 @@ LedgerManagerImpl::sealLedgerTxnAndStoreInBucketsAndDB(
18601841
ltx.unsealHeader([this, &res](LedgerHeader& lh) {
18611842
mApp.getBucketManager().snapshotLedger(lh);
18621843
auto has = storePersistentStateAndLedgerHeaderInDB(
1863-
lh, /* storeHeader */ true,
1864-
/* appendToCheckpoint */ true);
1844+
lh, /* appendToCheckpoint */ true);
18651845
res = advanceBucketListSnapshotAndMakeLedgerState(lh, has);
18661846
});
18671847

‎src/ledger/LedgerManagerImpl.h

+5-7
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ class LedgerManagerImpl : public LedgerManager
133133
std::unique_ptr<LedgerCloseMetaFrame> const& ledgerCloseMeta,
134134
uint32_t initialLedgerVers);
135135

136-
HistoryArchiveState storePersistentStateAndLedgerHeaderInDB(
137-
LedgerHeader const& header, bool storeHeader, bool appendToCheckpoint);
136+
HistoryArchiveState
137+
storePersistentStateAndLedgerHeaderInDB(LedgerHeader const& header,
138+
bool appendToCheckpoint);
138139
static void prefetchTransactionData(AbstractLedgerTxnParent& rootLtx,
139140
ApplicableTxSetFrame const& txSet,
140141
Config const& config);
@@ -240,11 +241,8 @@ class LedgerManagerImpl : public LedgerManager
240241
bool calledViaExternalize) override;
241242
void ledgerCloseComplete(uint32_t lcl, bool calledViaExternalize,
242243
LedgerCloseData const& ledgerData);
243-
void deleteOldEntries(Database& db, uint32_t ledgerSeq,
244-
uint32_t count) override;
245-
246-
void setLastClosedLedger(LedgerHeaderHistoryEntry const& lastClosed,
247-
bool storeInDB) override;
244+
void
245+
setLastClosedLedger(LedgerHeaderHistoryEntry const& lastClosed) override;
248246

249247
void manuallyAdvanceLedgerHeader(LedgerHeader const& header) override;
250248

0 commit comments

Comments
 (0)