From c3fb1c1ba5af2611e93fefea4782d9b3a539a33b Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 19 Apr 2021 14:12:04 +0100 Subject: [PATCH] Tweaks --- .../postgres/deltas/20210416150927_state_blocks_refactor.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/roomserver/storage/postgres/deltas/20210416150927_state_blocks_refactor.go b/roomserver/storage/postgres/deltas/20210416150927_state_blocks_refactor.go index 55f8d7ac..888252c1 100644 --- a/roomserver/storage/postgres/deltas/20210416150927_state_blocks_refactor.go +++ b/roomserver/storage/postgres/deltas/20210416150927_state_blocks_refactor.go @@ -76,16 +76,14 @@ func UpStateBlocksRefactor(tx *sql.Tx) error { if err != nil { return fmt.Errorf("tx.QueryRow.Scan (count snapshots): %w", err) } - logrus.Warnf("Will convert %d snapshots...", snapshotcount) batchsize := 100 - batchoffset := 0 var lastsnapshot types.StateSnapshotNID var newblocks types.StateBlockNIDs var snapshotrows *sql.Rows - for ; batchoffset < snapshotcount; batchoffset += batchsize { + for batchoffset := 0; batchoffset < snapshotcount; batchoffset += batchsize { snapshotrows, err = tx.Query(` SELECT state_snapshot_nid, @@ -119,7 +117,7 @@ func UpStateBlocksRefactor(tx *sql.Tx) error { var snapshots []stateBlockData for snapshotrows.Next() { - logrus.Warnf("Performing %d to %d...", batchoffset, batchoffset+batchsize) + logrus.Warnf("Rewriting snapshots %d-%d of %d...", batchoffset, batchoffset+batchsize, snapshotcount) var snapshot stateBlockData var eventsarray pq.Int64Array if err = snapshotrows.Scan(&snapshot.StateSnapshotNID, &snapshot.RoomNID, &snapshot.StateBlockNID, &eventsarray); err != nil {