From 5a09290c327b27407da39330a602a92455670c41 Mon Sep 17 00:00:00 2001 From: kegsay Date: Wed, 7 Jul 2021 17:07:33 +0100 Subject: [PATCH] db migration: handle create events with no state blocks from v0.1.0 (#1904) --- .../2021041615092700_state_blocks_refactor.go | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go index d87ae052..26d88e00 100644 --- a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go @@ -117,7 +117,7 @@ func UpStateBlocksRefactor(tx *sql.Tx) error { _roomserver_state_block.event_nid FROM _roomserver_state_snapshots - JOIN _roomserver_state_block ON _roomserver_state_block.state_block_nid = ANY (_roomserver_state_snapshots.state_block_nids) + LEFT JOIN _roomserver_state_block ON _roomserver_state_block.state_block_nid = ANY (_roomserver_state_snapshots.state_block_nids) WHERE _roomserver_state_snapshots.state_snapshot_nid = ANY ( SELECT @@ -140,22 +140,49 @@ func UpStateBlocksRefactor(tx *sql.Tx) error { logrus.Warnf("Rewriting snapshots %d-%d of %d...", batchoffset, batchoffset+batchsize, snapshotcount) var snapshots []stateBlockData + var badCreateSnapshots []stateBlockData for snapshotrows.Next() { var snapshot stateBlockData - var eventsarray pq.Int64Array - if err = snapshotrows.Scan(&snapshot.StateSnapshotNID, &snapshot.RoomNID, &snapshot.StateBlockNID, &eventsarray); err != nil { + var eventsarray []sql.NullInt64 + var nulStateBlockNID sql.NullInt64 + if err = snapshotrows.Scan(&snapshot.StateSnapshotNID, &snapshot.RoomNID, &nulStateBlockNID, pq.Array(&eventsarray)); err != nil { return fmt.Errorf("rows.Scan: %w", err) } + if nulStateBlockNID.Valid { + snapshot.StateBlockNID = types.StateBlockNID(nulStateBlockNID.Int64) + } + // Dendrite v0.1.0 would not make a state block for the create event, resulting in [NULL] from the query above. + // Remember the snapshot and we'll fill it in after we close this cursor as we can't have 2 queries running at the same time + if len(eventsarray) == 1 && !eventsarray[0].Valid { + badCreateSnapshots = append(badCreateSnapshots, snapshot) + continue + } for _, e := range eventsarray { - snapshot.EventNIDs = append(snapshot.EventNIDs, types.EventNID(e)) + if e.Valid { + snapshot.EventNIDs = append(snapshot.EventNIDs, types.EventNID(e.Int64)) + } } snapshot.EventNIDs = snapshot.EventNIDs[:util.SortAndUnique(snapshot.EventNIDs)] snapshots = append(snapshots, snapshot) } - if err = snapshotrows.Close(); err != nil { return fmt.Errorf("snapshots.Close: %w", err) } + // fill in bad create snapshots + for _, s := range badCreateSnapshots { + var createEventNID types.EventNID + err = tx.QueryRow( + `SELECT event_nid FROM roomserver_events WHERE state_snapshot_nid = $1 AND event_type_nid = 1`, s.StateSnapshotNID, + ).Scan(&createEventNID) + if err != nil { + return fmt.Errorf("cannot xref null state block with snapshot %d: %s", s.StateSnapshotNID, err) + } + if createEventNID == 0 { + return fmt.Errorf("cannot xref null state block with snapshot %d, no create event", s.StateSnapshotNID) + } + s.EventNIDs = append(s.EventNIDs, createEventNID) + snapshots = append(snapshots, s) + } newsnapshots := map[stateSnapshotData]types.StateBlockNIDs{}