Cleanup DB dead code

Builds/VisualStudio/stellar-core.vcxproj

@@ -748,7 +748,6 @@ exit /b 0
     <ClCompile Include="..\..\src\transactions\TransactionFrame.cpp" />
     <ClCompile Include="..\..\src\transactions\TransactionFrameBase.cpp" />
     <ClCompile Include="..\..\src\transactions\TransactionMeta.cpp" />
-    <ClCompile Include="..\..\src\transactions\TransactionSQL.cpp" />
     <ClCompile Include="..\..\src\transactions\TransactionUtils.cpp" />
     <ClCompile Include="..\..\src\transactions\TrustFlagsOpFrameBase.cpp" />
     <ClCompile Include="..\..\src\util\Backtrace.cpp" />
@@ -1166,7 +1165,6 @@ exit /b 0
     <ClInclude Include="..\..\src\transactions\TransactionFrame.h" />
     <ClInclude Include="..\..\src\transactions\TransactionFrameBase.h" />
     <ClInclude Include="..\..\src\transactions\TransactionMeta.h" />
-    <ClInclude Include="..\..\src\transactions\TransactionSQL.h" />
     <ClInclude Include="..\..\src\transactions\TransactionUtils.h" />
     <ClInclude Include="..\..\src\transactions\TrustFlagsOpFrameBase.h" />
     <ClInclude Include="..\..\src\util\Backtrace.h" />

Builds/VisualStudio/stellar-core.vcxproj.filters

@@ -1239,9 +1239,6 @@
     <ClCompile Include="..\..\src\transactions\TransactionMeta.cpp">
       <Filter>transactions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\transactions\TransactionSQL.cpp">
-      <Filter>transactions</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\transactions\TransactionUtils.cpp">
       <Filter>transactions</Filter>
     </ClCompile>
@@ -2343,9 +2340,6 @@
     <ClInclude Include="..\..\src\transactions\TransactionMeta.h">
       <Filter>transactions</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\transactions\TransactionSQL.h">
-      <Filter>transactions</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\transactions\TransactionUtils.h">
       <Filter>transactions</Filter>
     </ClInclude>

src/database/Database.cpp

@@ -29,7 +29,6 @@
 #include "overlay/BanManager.h"
 #include "overlay/OverlayManager.h"
 #include "overlay/PeerManager.h"
-#include "transactions/TransactionSQL.h"
 
 #include "medida/counter.h"
 #include "medida/timer.h"

src/history/HistoryManagerImpl.cpp

@@ -29,7 +29,6 @@
 #include "main/Application.h"
 #include "main/Config.h"
 #include "medida/meter.h"
-#include "transactions/TransactionSQL.h"
 #include "util/BufferedAsioCerealOutputArchive.h"
 #include "util/Fs.h"
 #include "util/GlobalChecks.h"

src/history/StateSnapshot.cpp

@@ -14,7 +14,6 @@
 #include "history/HistoryManager.h"
 #include "main/Application.h"
 #include "main/Config.h"
-#include "transactions/TransactionSQL.h"
 #include "util/Fs.h"
 #include "util/GlobalChecks.h"
 #include "util/Logging.h"

src/history/test/HistoryTests.cpp

@@ -1700,12 +1700,6 @@ TEST_CASE("persist publish queue", "[history][publish][acceptance]")
             LedgerManager::GENESIS_LEDGER_SEQ, publishedCount, out);
         REQUIRE(scp == 0);
 
-        CheckpointBuilder cb(*app1);
-        auto headers = LedgerHeaderUtils::copyToStream(
-            app1->getDatabase().getRawSession(),
-            LedgerManager::GENESIS_LEDGER_SEQ, publishedCount, cb);
-        REQUIRE(headers == 0);
-
         // We should have either an empty publish queue or a
         // ledger sometime after the 5th checkpoint (ledger 5 * 8 - 1 = 39)
         auto minLedger =

src/ledger/LedgerHeaderUtils.cpp

@@ -7,11 +7,7 @@
 #include "crypto/SHA.h"
 #include "database/Database.h"
 #include "database/DatabaseUtils.h"
-#include "history/CheckpointBuilder.h"
 #include "util/Decoder.h"
-#include "util/GlobalChecks.h"
-#include "util/Logging.h"
-#include "util/XDRStream.h"
 #include "util/types.h"
 #include "xdrpp/marshal.h"
 
@@ -22,16 +18,10 @@
 namespace stellar
 {
 
-namespace LedgerHeaderUtils
-{
-
-uint32_t
-getFlags(LedgerHeader const& lh)
+namespace
 {
-    return lh.ext.v() == 1 ? lh.ext.v1().flags : 0;
-}
 
-bool
+static bool
 isValid(LedgerHeader const& lh)
 {
     bool res = (lh.ledgerSeq <= INT32_MAX);
@@ -42,6 +32,36 @@ isValid(LedgerHeader const& lh)
     return res;
 }
 
+static LedgerHeader
+decodeFromData(std::string const& data)
+{
+    ZoneScoped;
+    LedgerHeader lh;
+    std::vector<uint8_t> decoded;
+    decoder::decode_b64(data, decoded);
+
+    xdr::xdr_get g(&decoded.front(), &decoded.back() + 1);
+    xdr::xdr_argpack_archive(g, lh);
+    g.done();
+
+    if (!isValid(lh))
+    {
+        throw std::runtime_error("invalid ledger header (load)");
+    }
+    return lh;
+}
+
+} // anonymous namespace
+
+namespace LedgerHeaderUtils
+{
+
+uint32_t
+getFlags(LedgerHeader const& lh)
+{
+    return lh.ext.v() == 1 ? lh.ext.v1().flags : 0;
+}
+
 void
 storeInDatabase(Database& db, LedgerHeader const& header, SessionWrapper& sess)
 {
@@ -84,25 +104,6 @@ storeInDatabase(Database& db, LedgerHeader const& header, SessionWrapper& sess)
     }
 }
 
-LedgerHeader
-decodeFromData(std::string const& data)
-{
-    ZoneScoped;
-    LedgerHeader lh;
-    std::vector<uint8_t> decoded;
-    decoder::decode_b64(data, decoded);
-
-    xdr::xdr_get g(&decoded.front(), &decoded.back() + 1);
-    xdr::xdr_argpack_archive(g, lh);
-    g.done();
-
-    if (!isValid(lh))
-    {
-        throw std::runtime_error("invalid ledger header (load)");
-    }
-    return lh;
-}
-
 std::shared_ptr<LedgerHeader>
 loadByHash(Database& db, Hash const& hash)
 {
@@ -140,55 +141,6 @@ loadByHash(Database& db, Hash const& hash)
     return lhPtr;
 }
 
-uint32_t
-loadMaxLedgerSeq(Database& db)
-{
-    ZoneScoped;
-    uint32_t seq = 0;
-    soci::indicator maxIndicator;
-    auto prep = db.getPreparedStatement(
-        "SELECT MAX(ledgerseq) FROM ledgerheaders", db.getSession());
-    auto& st = prep.statement();
-    st.exchange(soci::into(seq, maxIndicator));
-    st.define_and_bind();
-    st.execute(true);
-    if (maxIndicator == soci::indicator::i_ok)
-    {
-        return seq;
-    }
-    return 0;
-}
-
-std::shared_ptr<LedgerHeader>
-loadBySequence(Database& db, soci::session& sess, uint32_t seq)
-{
-    ZoneScoped;
-    std::shared_ptr<LedgerHeader> lhPtr;
-
-    std::string headerEncoded;
-    {
-        ZoneNamedN(selectLedgerHeadersZone, "select ledgerheaders", true);
-        sess << "SELECT data FROM ledgerheaders "
-                "WHERE ledgerseq = :s",
-            soci::into(headerEncoded), soci::use(seq);
-    }
-    if (sess.got_data())
-    {
-        auto lh = decodeFromData(headerEncoded);
-        lhPtr = std::make_shared<LedgerHeader>(lh);
-
-        if (lh.ledgerSeq != seq)
-        {
-            throw std::runtime_error(fmt::format(
-                FMT_STRING("Wrong sequence number in ledger header database: "
-                           "loaded ledger {:d} contains {:d}"),
-                seq, lh.ledgerSeq));
-        }
-    }
-
-    return lhPtr;
-}
-
 void
 deleteOldEntries(soci::session& sess, uint32_t ledgerSeq, uint32_t count)
 {
@@ -197,38 +149,6 @@ deleteOldEntries(soci::session& sess, uint32_t ledgerSeq, uint32_t count)
                                           "ledgerheaders", "ledgerseq");
 }
 
-size_t
-copyToStream(soci::session& sess, uint32_t ledgerSeq, uint32_t ledgerCount,
-             CheckpointBuilder& checkpointBuilder)
-{
-    ZoneNamedN(selectLedgerHeadersZone, "select ledgerheaders history", true);
-    uint32_t begin = ledgerSeq, end = ledgerSeq + ledgerCount;
-    releaseAssert(begin <= end);
-
-    std::string headerEncoded;
-
-    soci::statement st =
-        (sess.prepare << "SELECT data FROM ledgerheaders "
-                         "WHERE ledgerseq >= :begin AND ledgerseq < :end ORDER "
-                         "BY ledgerseq ASC",
-         soci::into(headerEncoded), soci::use(begin), soci::use(end));
-
-    size_t n = 0;
-    st.execute(true);
-    while (st.got_data())
-    {
-        LedgerHeaderHistoryEntry lhe;
-        lhe.header = decodeFromData(headerEncoded);
-        lhe.hash = xdrSha256(lhe.header);
-        CLOG_DEBUG(Ledger, "Streaming ledger-header {}", lhe.header.ledgerSeq);
-        checkpointBuilder.appendLedgerHeader(lhe.header,
-                                             /* skipStartupCheck */ true);
-        ++n;
-        st.fetch();
-    }
-    return n;
-}
-
 void
 maybeDropAndCreateNew(Database& db)
 {

src/ledger/LedgerHeaderUtils.h

@@ -9,32 +9,19 @@
 
 namespace stellar
 {
-class CheckpointBuilder;
 
 namespace LedgerHeaderUtils
 {
 
 uint32_t getFlags(LedgerHeader const& lh);
 
-bool isValid(LedgerHeader const& lh);
-
 void storeInDatabase(Database& db, LedgerHeader const& header,
                      SessionWrapper& sess);
 
-LedgerHeader decodeFromData(std::string const& data);
-
 std::shared_ptr<LedgerHeader> loadByHash(Database& db, Hash const& hash);
 
-std::shared_ptr<LedgerHeader> loadBySequence(Database& db, soci::session& sess,
-                                             uint32_t seq);
-
-uint32_t loadMaxLedgerSeq(Database& db);
-
 void deleteOldEntries(soci::session& sess, uint32_t ledgerSeq, uint32_t count);
 
-size_t copyToStream(soci::session& sess, uint32_t ledgerSeq,
-                    uint32_t ledgerCount, CheckpointBuilder& checkpointBuilder);
-
 void maybeDropAndCreateNew(Database& db);
 }
 }

src/ledger/LedgerManagerImpl.cpp

@@ -40,7 +40,6 @@
 #include "transactions/ParallelApplyUtils.h"
 #include "transactions/TransactionFrameBase.h"
 #include "transactions/TransactionMeta.h"
-#include "transactions/TransactionSQL.h"
 #include "transactions/TransactionUtils.h"
 #include "util/DebugMetaUtils.h"
 #include "util/Fs.h"

src/simulation/LoadGenerator.cpp

@@ -12,7 +12,6 @@
 #include "test/TxTests.h"
 #include "transactions/MutableTransactionResult.h"
 #include "transactions/TransactionBridge.h"
-#include "transactions/TransactionSQL.h"
 #include "transactions/TransactionUtils.h"
 #include "transactions/test/SorobanTxTestUtils.h"
 #include "util/Logging.h"

src/test/TxTests.cpp

@@ -23,7 +23,6 @@
 #include "transactions/SignatureUtils.h"
 #include "transactions/TransactionBridge.h"
 #include "transactions/TransactionFrame.h"
-#include "transactions/TransactionSQL.h"
 #include "transactions/TransactionUtils.h"
 #include "util/GlobalChecks.h"
 #include "util/Logging.h"