Skip to content

Commit 39ef7c4

Browse files
committed
Remove support for storing ledger entries in local db
1 parent c1bd07a commit 39ef7c4

24 files changed

+45
-1247
lines changed

cmd/stellar-rpc/internal/daemon/daemon.go

-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ func createJSONRPCHandler(cfg *config.Config, logger *supportlog.Entry, daemon *
301301
FeeStatWindows: feewindows,
302302
Logger: logger,
303303
LedgerReader: db.NewLedgerReader(daemon.db),
304-
LedgerEntryReader: db.NewLedgerEntryReader(daemon.db),
305304
TransactionReader: db.NewTransactionReader(logger, daemon.db, cfg.NetworkPassphrase),
306305
EventReader: db.NewEventReader(logger, daemon.db, cfg.NetworkPassphrase),
307306
PreflightGetter: daemon.preflightWorkerPool,

cmd/stellar-rpc/internal/db/db.go

+1-18
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ type ReadWriter interface {
3939
type WriteTx interface {
4040
TransactionWriter() TransactionWriter
4141
EventWriter() EventWriter
42-
LedgerEntryWriter() LedgerEntryWriter
4342
LedgerWriter() LedgerWriter
4443

4544
Commit(ledgerCloseMeta xdr.LedgerCloseMeta) error
@@ -247,13 +246,7 @@ func (rw *readWriter) NewTx(ctx context.Context) (WriteTx, error) {
247246
stmtCache: stmtCache,
248247
historyRetentionWindow: rw.historyRetentionWindow,
249248
ledgerWriter: ledgerWriter{stmtCache: stmtCache},
250-
ledgerEntryWriter: ledgerEntryWriter{
251-
stmtCache: stmtCache,
252-
buffer: xdr.NewEncodingBuffer(),
253-
keyToEntryBatch: make(map[string]*xdr.LedgerEntry, rw.maxBatchSize),
254-
ledgerEntryCacheWriteTx: db.cache.ledgerEntries.newWriteTx(rw.maxBatchSize),
255-
maxBatchSize: rw.maxBatchSize,
256-
},
249+
257250
txWriter: transactionHandler{
258251
log: rw.log,
259252
db: txSession,
@@ -279,17 +272,12 @@ type writeTx struct {
279272
postCommit func() error
280273
tx db.SessionInterface
281274
stmtCache *sq.StmtCache
282-
ledgerEntryWriter ledgerEntryWriter
283275
ledgerWriter ledgerWriter
284276
txWriter transactionHandler
285277
eventWriter eventHandler
286278
historyRetentionWindow uint32
287279
}
288280

289-
func (w writeTx) LedgerEntryWriter() LedgerEntryWriter {
290-
return w.ledgerEntryWriter
291-
}
292-
293281
func (w writeTx) LedgerWriter() LedgerWriter {
294282
return w.ledgerWriter
295283
}
@@ -306,10 +294,6 @@ func (w writeTx) Commit(ledgerCloseMeta xdr.LedgerCloseMeta) error {
306294
ledgerSeq := ledgerCloseMeta.LedgerSequence()
307295
ledgerCloseTime := ledgerCloseMeta.LedgerCloseTime()
308296

309-
if err := w.ledgerEntryWriter.flush(); err != nil {
310-
return err
311-
}
312-
313297
if err := w.ledgerWriter.trimLedgers(ledgerSeq, w.historyRetentionWindow); err != nil {
314298
return err
315299
}
@@ -332,7 +316,6 @@ func (w writeTx) Commit(ledgerCloseMeta xdr.LedgerCloseMeta) error {
332316
}
333317
w.globalCache.latestLedgerSeq = ledgerSeq
334318
w.globalCache.latestLedgerCloseTime = ledgerCloseTime
335-
w.ledgerEntryWriter.ledgerEntryCacheWriteTx.commit()
336319
return nil
337320
}
338321
if err := commitAndUpdateCache(); err != nil {

cmd/stellar-rpc/internal/db/ledger.go

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ type LedgerReader interface {
2626
GetLedgerRange(ctx context.Context) (ledgerbucketwindow.LedgerRange, error)
2727
StreamLedgerRange(ctx context.Context, startLedger uint32, endLedger uint32, f StreamLedgerFn) error
2828
NewTx(ctx context.Context) (LedgerReaderTx, error)
29+
GetLatestLedgerSequence(ctx context.Context) (uint32, error)
2930
}
3031

3132
type LedgerReaderTx interface {
@@ -178,6 +179,10 @@ func (r ledgerReader) GetLedgerRange(ctx context.Context) (ledgerbucketwindow.Le
178179
return getLedgerRangeWithoutCache(ctx, r.db)
179180
}
180181

182+
func (r ledgerReader) GetLatestLedgerSequence(ctx context.Context) (uint32, error) {
183+
return getLatestLedgerSequence(ctx, r, r.db.cache)
184+
}
185+
181186
// getLedgerRangeWithCache uses the latest ledger cache to optimize the query.
182187
// It only needs to look up the first ledger since we have the latest cached.
183188
func getLedgerRangeWithCache(ctx context.Context, db readDB,

0 commit comments

Comments
 (0)