hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-11 22:33:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix scan, delete old blocks

Browse source
This commit is contained in:
Neil Alexander 2021-04-19 13:41:30 +01:00
parent 2c1b6da746
commit a4e3068653
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
roomserver/storage/postgres/deltas/20210416150927_state_blocks_refactor.go
View file

@ -104,7 +104,7 @@ func UpStateBlocksRefactor(tx *sql.Tx) error {
state_snapshot_nid, state_snapshot_nid,
room_nid, room_nid,
state_block_nid; state_block_nid;
`, batchoffset, batchsize) `, batchsize, batchoffset)
if err != nil { if err != nil {
return fmt.Errorf("tx.Query: %w", err) return fmt.Errorf("tx.Query: %w", err)
} }
@ -114,9 +114,9 @@ func UpStateBlocksRefactor(tx *sql.Tx) error {
var snapshot types.StateSnapshotNID var snapshot types.StateSnapshotNID
var room types.RoomNID var room types.RoomNID
var blocksarray pq.Int64Array var block types.StateBlockNID
var eventsarray pq.Int64Array var eventsarray pq.Int64Array
if err = snapshots.Scan(&snapshot, &room, &blocksarray, &eventsarray); err != nil { if err = snapshots.Scan(&snapshot, &room, &block, &eventsarray); err != nil {
return fmt.Errorf("rows.Scan: %w", err) return fmt.Errorf("rows.Scan: %w", err)
} }
@ -138,6 +138,13 @@ func UpStateBlocksRefactor(tx *sql.Tx) error {
} }
newblocks = append(newblocks, blocknid) newblocks = append(newblocks, blocknid)
_, err = tx.Exec(`
DELETE FROM roomserver_state_block WHERE state_block_nid=$1
`, block)
if err != nil {
return fmt.Errorf("tx.Exec (delete old block): %w", err)
}
if snapshot != lastsnapshot { if snapshot != lastsnapshot {
var newsnapshot types.StateSnapshotNID var newsnapshot types.StateSnapshotNID
err = tx.QueryRow(` err = tx.QueryRow(`