Fix horizon db reap command

services/horizon/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this
 file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+* Fix `horizon db reap` bug which caused the command to exit without deleting any history table rows.
+* The horizon reap system now also deletes rows from `history_trades`. Previously, the reap system only deleted rows from `history_operation_participants`, `history_operations`, `history_transaction_participants`, `history_transactions`, `history_ledgers`, and `history_effects`.
+
 ## 1.0.0
 
 ### Before you upgrade

services/horizon/cmd/db.go

@@ -96,7 +96,9 @@ var dbReapCmd = &cobra.Command{
 	Short: "reaps (i.e. removes) any reapable history data",
 	Long:  "reap removes any historical data that is earlier than the configured retention cutoff",
 	Run: func(cmd *cobra.Command, args []string) {
-		err := initApp().DeleteUnretainedHistory()
+		app := initApp()
+		app.UpdateLedgerState()
+		err := app.DeleteUnretainedHistory()
 		if err != nil {
 			log.Fatal(err)
 		}

services/horizon/internal/reap/main.go

@@ -7,22 +7,23 @@ package reap
 import (
 	"time"
 
+	"github.com/stellar/go/services/horizon/internal/db2/history"
 	"github.com/stellar/go/support/db"
 )
 
 // System represents the history reaping subsystem of horizon.
 type System struct {
-	HorizonDB      *db.Session
+	HistoryQ       *history.Q
 	RetentionCount uint
 
 	nextRun time.Time
 }
 
 // New initializes the reaper, causing it to begin polling the stellar-core
 // database for now ledgers and ingesting data into the horizon database.
-func New(retention uint, horizon *db.Session) *System {
+func New(retention uint, dbSession *db.Session) *System {
 	r := &System{
-		HorizonDB:      horizon,
+		HistoryQ:       &history.Q{dbSession},
 		RetentionCount: retention,
 	}
 

services/horizon/internal/reap/system.go

@@ -66,30 +66,12 @@ func (r *System) runOnce() {
 func (r *System) clearBefore(seq int32) error {
 	log.WithField("new_elder", seq).Info("reaper: clearing")
 
-	clear := r.HorizonDB.DeleteRange
-	end := toid.New(seq, 0, 0).ToInt64()
-
-	err := clear(0, end, "history_effects", "history_operation_id")
-	if err != nil {
-		return err
-	}
-	err = clear(0, end, "history_operation_participants", "history_operation_id")
-	if err != nil {
-		return err
-	}
-	err = clear(0, end, "history_operations", "id")
+	start, end, err := toid.LedgerRangeInclusive(1, seq-1)
 	if err != nil {
 		return err
 	}
-	err = clear(0, end, "history_transaction_participants", "history_transaction_id")
-	if err != nil {
-		return err
-	}
-	err = clear(0, end, "history_transactions", "id")
-	if err != nil {
-		return err
-	}
-	err = clear(0, end, "history_ledgers", "id")
+
+	err = r.HistoryQ.DeleteRangeAll(start, end)
 	if err != nil {
 		return err
 	}