services/horizon: Fix reingestion for the history_{transaction,operation}_claimable_balances tables

services/horizon/CHANGELOG.md

@@ -5,6 +5,10 @@ file. This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Code Changes
+
+* Fix bug in `horizon db reingest range` command, which would throw a duplicate entry conflict error from the DB. ([3661](https://github.com/stellar/go/pull/3661)).
+
 ## v2.4.0
 
 **Upgrading to this version from <= v2.1.1 will trigger a state rebuild. During this process (which can take up to 20 minutes), Horizon will not ingest new ledgers.**

services/horizon/internal/db2/history/main.go

@@ -826,34 +826,21 @@ func (q *Q) CloneIngestionQ() IngestionQ {
 // DeleteRangeAll deletes a range of rows from all history tables between
 // `start` and `end` (exclusive).
 func (q *Q) DeleteRangeAll(ctx context.Context, start, end int64) error {
-	err := q.DeleteRange(ctx, start, end, "history_effects", "history_operation_id")
-	if err != nil {
-		return errors.Wrap(err, "Error clearing history_effects")
+	for table, column := range map[string]string{
+		"history_effects":                        "history_operation_id",
+		"history_ledgers":                        "id",
+		"history_operation_claimable_balances":   "history_operation_id",
+		"history_operation_participants":         "history_operation_id",
+		"history_operations":                     "id",
+		"history_trades":                         "history_operation_id",
+		"history_transaction_claimable_balances": "history_transaction_id",
+		"history_transaction_participants":       "history_transaction_id",
+		"history_transactions":                   "id",
+	} {
+		err := q.DeleteRange(ctx, start, end, table, column)
+		if err != nil {
+			return errors.Wrapf(err, "Error clearing %s", table)
+		}
 	}
-	err = q.DeleteRange(ctx, start, end, "history_operation_participants", "history_operation_id")
-	if err != nil {
-		return errors.Wrap(err, "Error clearing history_operation_participants")
-	}
-	err = q.DeleteRange(ctx, start, end, "history_operations", "id")
-	if err != nil {
-		return errors.Wrap(err, "Error clearing history_operations")
-	}
-	err = q.DeleteRange(ctx, start, end, "history_transaction_participants", "history_transaction_id")
-	if err != nil {
-		return errors.Wrap(err, "Error clearing history_transaction_participants")
-	}
-	err = q.DeleteRange(ctx, start, end, "history_transactions", "id")
-	if err != nil {
-		return errors.Wrap(err, "Error clearing history_transactions")
-	}
-	err = q.DeleteRange(ctx, start, end, "history_ledgers", "id")
-	if err != nil {
-		return errors.Wrap(err, "Error clearing history_ledgers")
-	}
-	err = q.DeleteRange(ctx, start, end, "history_trades", "history_operation_id")
-	if err != nil {
-		return errors.Wrap(err, "Error clearing history_trades")
-	}
-
 	return nil
 }