hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-13 15:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use pq.Int64Array for newblocks

Browse source
This commit is contained in:
Neil Alexander 2021-04-19 14:14:47 +01:00
parent c3fb1c1ba5
commit 1957497e69
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -153,13 +153,18 @@ func UpStateBlocksRefactor(tx *sql.Tx) error {
newblocks = append(newblocks, blocknid) newblocks = append(newblocks, blocknid)
if snapshot.StateSnapshotNID != lastsnapshot { if snapshot.StateSnapshotNID != lastsnapshot {
var newblocksarray pq.Int64Array
for _, b := range newblocks {
newblocksarray = append(newblocksarray, int64(b))
}
var newsnapshot types.StateSnapshotNID var newsnapshot types.StateSnapshotNID
err = tx.QueryRow(` err = tx.QueryRow(`
INSERT INTO roomserver_state_snapshots (room_nid, state_block_nids) INSERT INTO roomserver_state_snapshots (room_nid, state_block_nids)
VALUES ($1, $2) VALUES ($1, $2)
ON CONFLICT (room_nid, state_block_nids) DO UPDATE SET room_nid=$1 ON CONFLICT (room_nid, state_block_nids) DO UPDATE SET room_nid=$1
RETURNING state_snapshot_nid RETURNING state_snapshot_nid
`, snapshot.RoomNID, newblocks).Scan(&newsnapshot) `, snapshot.RoomNID, newblocksarray).Scan(&newsnapshot)
if err != nil { if err != nil {
return fmt.Errorf("tx.QueryRow.Scan (insert new snapshot): %w", err) return fmt.Errorf("tx.QueryRow.Scan (insert new snapshot): %w", err)
} }