From 92ea4e5a8086691f92028666eaca982699b2bcc6 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 21 Apr 2021 10:23:04 +0100 Subject: [PATCH] More sequence tweaks --- .../2021041615092700_state_blocks_refactor.go | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go index 2c8f47125..ae5cfd309 100644 --- a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go @@ -66,16 +66,9 @@ func UpStateBlocksRefactor(tx *sql.Tx) error { return fmt.Errorf("tx.Exec: %w", err) } _, err := tx.Exec(` - DROP SEQUENCE IF EXISTS roomserver_state_block_nid_seq; - DROP SEQUENCE IF EXISTS roomserver_state_snapshot_nid_seq; - `) - if err != nil { - return fmt.Errorf("tx.Exec (drop sequences): %w", err) - } - _, err = tx.Exec(` - CREATE SEQUENCE roomserver_state_block_nid_seq START WITH $1; + CREATE SEQUENCE roomserver_state_block_nid_sequence START WITH $1; CREATE TABLE IF NOT EXISTS roomserver_state_block ( - state_block_nid bigint PRIMARY KEY DEFAULT nextval('roomserver_state_block_nid_seq'), + state_block_nid bigint PRIMARY KEY DEFAULT nextval('roomserver_state_block_nid_sequence'), state_block_hash BYTEA UNIQUE, event_nids bigint[] NOT NULL ); @@ -84,9 +77,9 @@ func UpStateBlocksRefactor(tx *sql.Tx) error { return fmt.Errorf("tx.Exec (create blocks table): %w", err) } _, err = tx.Exec(` - CREATE SEQUENCE roomserver_state_snapshot_nid_seq START WITH $1; + CREATE SEQUENCE roomserver_state_snapshot_nid_sequence START WITH $1; CREATE TABLE IF NOT EXISTS roomserver_state_snapshots ( - state_snapshot_nid bigint PRIMARY KEY DEFAULT nextval('roomserver_state_snapshot_nid_seq'), + state_snapshot_nid bigint PRIMARY KEY DEFAULT nextval('roomserver_state_snapshot_nid_sequence'), state_snapshot_hash BYTEA UNIQUE, room_nid bigint NOT NULL, state_block_nids bigint[] NOT NULL @@ -199,10 +192,16 @@ func UpStateBlocksRefactor(tx *sql.Tx) error { } } - if _, err = tx.Exec(`DROP TABLE _roomserver_state_snapshots;`); err != nil { + if _, err = tx.Exec(` + DROP TABLE _roomserver_state_snapshots; + DROP SEQUENCE roomserver_state_snapshots_nid_seq; + `); err != nil { return fmt.Errorf("tx.Exec (delete old snapshot table): %w", err) } - if _, err = tx.Exec(`DROP TABLE _roomserver_state_block;`); err != nil { + if _, err = tx.Exec(` + DROP TABLE _roomserver_state_block; + DROP SEQUENCE roomserver_state_block_nid_seq; + `); err != nil { return fmt.Errorf("tx.Exec (delete old block table): %w", err) }