diff --git a/federationapi/storage/postgres/blacklist_table.go b/federationapi/storage/postgres/blacklist_table.go index 3794f5560..eef37318b 100644 --- a/federationapi/storage/postgres/blacklist_table.go +++ b/federationapi/storage/postgres/blacklist_table.go @@ -23,7 +23,7 @@ import ( ) const blacklistSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_blacklist ( +CREATE TABLE IF NOT EXISTS federationsender_blacklist ( -- The blacklisted server name server_name TEXT NOT NULL, UNIQUE (server_name) @@ -31,17 +31,17 @@ CREATE TABLE IF NOT EXISTS federationapi_blacklist ( ` const insertBlacklistSQL = "" + - "INSERT INTO federationapi_blacklist (server_name) VALUES ($1)" + + "INSERT INTO federationsender_blacklist (server_name) VALUES ($1)" + " ON CONFLICT DO NOTHING" const selectBlacklistSQL = "" + - "SELECT server_name FROM federationapi_blacklist WHERE server_name = $1" + "SELECT server_name FROM federationsender_blacklist WHERE server_name = $1" const deleteBlacklistSQL = "" + - "DELETE FROM federationapi_blacklist WHERE server_name = $1" + "DELETE FROM federationsender_blacklist WHERE server_name = $1" const deleteAllBlacklistSQL = "" + - "TRUNCATE federationapi_blacklist" + "TRUNCATE federationsender_blacklist" type blacklistStatements struct { db *sql.DB diff --git a/federationapi/storage/postgres/deltas/2021020411080000_rooms.go b/federationapi/storage/postgres/deltas/2021020411080000_rooms.go index 249b9f65d..cc4bdadfd 100644 --- a/federationapi/storage/postgres/deltas/2021020411080000_rooms.go +++ b/federationapi/storage/postgres/deltas/2021020411080000_rooms.go @@ -32,7 +32,7 @@ func LoadRemoveRoomsTable(m *sqlutil.Migrations) { func UpRemoveRoomsTable(tx *sql.Tx) error { _, err := tx.Exec(` - DROP TABLE IF EXISTS federationapi_rooms; + DROP TABLE IF EXISTS federationsender_rooms; `) if err != nil { return fmt.Errorf("failed to execute upgrade: %w", err) diff --git a/federationapi/storage/postgres/inbound_peeks_table.go b/federationapi/storage/postgres/inbound_peeks_table.go index f2192ce47..df5c60761 100644 --- a/federationapi/storage/postgres/inbound_peeks_table.go +++ b/federationapi/storage/postgres/inbound_peeks_table.go @@ -26,7 +26,7 @@ import ( ) const inboundPeeksSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_inbound_peeks ( +CREATE TABLE IF NOT EXISTS federationsender_inbound_peeks ( room_id TEXT NOT NULL, server_name TEXT NOT NULL, peek_id TEXT NOT NULL, @@ -38,22 +38,22 @@ CREATE TABLE IF NOT EXISTS federationapi_inbound_peeks ( ` const insertInboundPeekSQL = "" + - "INSERT INTO federationapi_inbound_peeks (room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval) VALUES ($1, $2, $3, $4, $5, $6)" + "INSERT INTO federationsender_inbound_peeks (room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval) VALUES ($1, $2, $3, $4, $5, $6)" const selectInboundPeekSQL = "" + - "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationapi_inbound_peeks WHERE room_id = $1 and server_name = $2 and peek_id = $3" + "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationsender_inbound_peeks WHERE room_id = $1 and server_name = $2 and peek_id = $3" const selectInboundPeeksSQL = "" + - "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationapi_inbound_peeks WHERE room_id = $1" + "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationsender_inbound_peeks WHERE room_id = $1" const renewInboundPeekSQL = "" + - "UPDATE federationapi_inbound_peeks SET renewed_ts=$1, renewal_interval=$2 WHERE room_id = $3 and server_name = $4 and peek_id = $5" + "UPDATE federationsender_inbound_peeks SET renewed_ts=$1, renewal_interval=$2 WHERE room_id = $3 and server_name = $4 and peek_id = $5" const deleteInboundPeekSQL = "" + - "DELETE FROM federationapi_inbound_peeks WHERE room_id = $1 and server_name = $2" + "DELETE FROM federationsender_inbound_peeks WHERE room_id = $1 and server_name = $2" const deleteInboundPeeksSQL = "" + - "DELETE FROM federationapi_inbound_peeks WHERE room_id = $1" + "DELETE FROM federationsender_inbound_peeks WHERE room_id = $1" type inboundPeeksStatements struct { db *sql.DB diff --git a/federationapi/storage/postgres/joined_hosts_table.go b/federationapi/storage/postgres/joined_hosts_table.go index 3e8bc3f24..5c95b72a8 100644 --- a/federationapi/storage/postgres/joined_hosts_table.go +++ b/federationapi/storage/postgres/joined_hosts_table.go @@ -30,7 +30,7 @@ const joinedHostsSchema = ` -- The joined_hosts table stores a list of m.room.member event ids in the -- current state for each room where the membership is "join". -- There will be an entry for every user that is joined to the room. -CREATE TABLE IF NOT EXISTS federationapi_joined_hosts ( +CREATE TABLE IF NOT EXISTS federationsender_joined_hosts ( -- The string ID of the room. room_id TEXT NOT NULL, -- The event ID of the m.room.member join event. @@ -40,31 +40,31 @@ CREATE TABLE IF NOT EXISTS federationapi_joined_hosts ( ); CREATE UNIQUE INDEX IF NOT EXISTS federatonsender_joined_hosts_event_id_idx - ON federationapi_joined_hosts (event_id); + ON federationsender_joined_hosts (event_id); CREATE INDEX IF NOT EXISTS federatonsender_joined_hosts_room_id_idx - ON federationapi_joined_hosts (room_id) + ON federationsender_joined_hosts (room_id) ` const insertJoinedHostsSQL = "" + - "INSERT INTO federationapi_joined_hosts (room_id, event_id, server_name)" + + "INSERT INTO federationsender_joined_hosts (room_id, event_id, server_name)" + " VALUES ($1, $2, $3) ON CONFLICT DO NOTHING" const deleteJoinedHostsSQL = "" + - "DELETE FROM federationapi_joined_hosts WHERE event_id = ANY($1)" + "DELETE FROM federationsender_joined_hosts WHERE event_id = ANY($1)" const deleteJoinedHostsForRoomSQL = "" + - "DELETE FROM federationapi_joined_hosts WHERE room_id = $1" + "DELETE FROM federationsender_joined_hosts WHERE room_id = $1" const selectJoinedHostsSQL = "" + - "SELECT event_id, server_name FROM federationapi_joined_hosts" + + "SELECT event_id, server_name FROM federationsender_joined_hosts" + " WHERE room_id = $1" const selectAllJoinedHostsSQL = "" + - "SELECT DISTINCT server_name FROM federationapi_joined_hosts" + "SELECT DISTINCT server_name FROM federationsender_joined_hosts" const selectJoinedHostsForRoomsSQL = "" + - "SELECT DISTINCT server_name FROM federationapi_joined_hosts WHERE room_id = ANY($1)" + "SELECT DISTINCT server_name FROM federationsender_joined_hosts WHERE room_id = ANY($1)" type joinedHostsStatements struct { db *sql.DB diff --git a/federationapi/storage/postgres/notary_server_keys_json_table.go b/federationapi/storage/postgres/notary_server_keys_json_table.go index c1111cc2f..65221c088 100644 --- a/federationapi/storage/postgres/notary_server_keys_json_table.go +++ b/federationapi/storage/postgres/notary_server_keys_json_table.go @@ -23,9 +23,9 @@ import ( ) const notaryServerKeysJSONSchema = ` -CREATE SEQUENCE IF NOT EXISTS federationapi_notary_server_keys_json_pkey; -CREATE TABLE IF NOT EXISTS federationapi_notary_server_keys_json ( - notary_id BIGINT PRIMARY KEY NOT NULL DEFAULT nextval('federationapi_notary_server_keys_json_pkey'), +CREATE SEQUENCE IF NOT EXISTS federationsender_notary_server_keys_json_pkey; +CREATE TABLE IF NOT EXISTS federationsender_notary_server_keys_json ( + notary_id BIGINT PRIMARY KEY NOT NULL DEFAULT nextval('federationsender_notary_server_keys_json_pkey'), response_json TEXT NOT NULL, server_name TEXT NOT NULL, valid_until BIGINT NOT NULL @@ -33,7 +33,7 @@ CREATE TABLE IF NOT EXISTS federationapi_notary_server_keys_json ( ` const insertServerKeysJSONSQL = "" + - "INSERT INTO federationapi_notary_server_keys_json (response_json, server_name, valid_until) VALUES ($1, $2, $3)" + + "INSERT INTO federationsender_notary_server_keys_json (response_json, server_name, valid_until) VALUES ($1, $2, $3)" + " RETURNING notary_id" type notaryServerKeysStatements struct { diff --git a/federationapi/storage/postgres/notary_server_keys_metadata_table.go b/federationapi/storage/postgres/notary_server_keys_metadata_table.go index 0074f9a3d..72faf4809 100644 --- a/federationapi/storage/postgres/notary_server_keys_metadata_table.go +++ b/federationapi/storage/postgres/notary_server_keys_metadata_table.go @@ -26,7 +26,7 @@ import ( ) const notaryServerKeysMetadataSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_notary_server_keys_metadata ( +CREATE TABLE IF NOT EXISTS federationsender_notary_server_keys_metadata ( notary_id BIGINT NOT NULL, server_name TEXT NOT NULL, key_id TEXT NOT NULL, @@ -35,41 +35,41 @@ CREATE TABLE IF NOT EXISTS federationapi_notary_server_keys_metadata ( ` const upsertServerKeysSQL = "" + - "INSERT INTO federationapi_notary_server_keys_metadata (notary_id, server_name, key_id) VALUES ($1, $2, $3)" + + "INSERT INTO federationsender_notary_server_keys_metadata (notary_id, server_name, key_id) VALUES ($1, $2, $3)" + " ON CONFLICT (server_name, key_id) DO UPDATE SET notary_id = $1" // for a given (server_name, key_id), find the existing notary ID and valid until. Used to check if we will replace it // JOINs with the json table const selectNotaryKeyMetadataSQL = ` - SELECT federationapi_notary_server_keys_metadata.notary_id, valid_until FROM federationapi_notary_server_keys_json - JOIN federationapi_notary_server_keys_metadata ON - federationapi_notary_server_keys_metadata.notary_id = federationapi_notary_server_keys_json.notary_id - WHERE federationapi_notary_server_keys_metadata.server_name = $1 AND federationapi_notary_server_keys_metadata.key_id = $2 + SELECT federationsender_notary_server_keys_metadata.notary_id, valid_until FROM federationsender_notary_server_keys_json + JOIN federationsender_notary_server_keys_metadata ON + federationsender_notary_server_keys_metadata.notary_id = federationsender_notary_server_keys_json.notary_id + WHERE federationsender_notary_server_keys_metadata.server_name = $1 AND federationsender_notary_server_keys_metadata.key_id = $2 ` // select the response which has the highest valid_until value // JOINs with the json table const selectNotaryKeyResponsesSQL = ` - SELECT response_json FROM federationapi_notary_server_keys_json + SELECT response_json FROM federationsender_notary_server_keys_json WHERE server_name = $1 AND valid_until = ( - SELECT MAX(valid_until) FROM federationapi_notary_server_keys_json WHERE server_name = $1 + SELECT MAX(valid_until) FROM federationsender_notary_server_keys_json WHERE server_name = $1 ) ` // select the responses which have the given key IDs // JOINs with the json table const selectNotaryKeyResponsesWithKeyIDsSQL = ` - SELECT response_json FROM federationapi_notary_server_keys_json - JOIN federationapi_notary_server_keys_metadata ON - federationapi_notary_server_keys_metadata.notary_id = federationapi_notary_server_keys_json.notary_id - WHERE federationapi_notary_server_keys_json.server_name = $1 AND federationapi_notary_server_keys_metadata.key_id = ANY ($2) - GROUP BY federationapi_notary_server_keys_json.notary_id + SELECT response_json FROM federationsender_notary_server_keys_json + JOIN federationsender_notary_server_keys_metadata ON + federationsender_notary_server_keys_metadata.notary_id = federationsender_notary_server_keys_json.notary_id + WHERE federationsender_notary_server_keys_json.server_name = $1 AND federationsender_notary_server_keys_metadata.key_id = ANY ($2) + GROUP BY federationsender_notary_server_keys_json.notary_id ` // JOINs with the metadata table const deleteUnusedServerKeysJSONSQL = ` - DELETE FROM federationapi_notary_server_keys_json WHERE federationapi_notary_server_keys_json.notary_id NOT IN ( - SELECT DISTINCT notary_id FROM federationapi_notary_server_keys_metadata + DELETE FROM federationsender_notary_server_keys_json WHERE federationsender_notary_server_keys_json.notary_id NOT IN ( + SELECT DISTINCT notary_id FROM federationsender_notary_server_keys_metadata ) ` diff --git a/federationapi/storage/postgres/outbound_peeks_table.go b/federationapi/storage/postgres/outbound_peeks_table.go index 95500c994..c22d893f7 100644 --- a/federationapi/storage/postgres/outbound_peeks_table.go +++ b/federationapi/storage/postgres/outbound_peeks_table.go @@ -26,7 +26,7 @@ import ( ) const outboundPeeksSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_outbound_peeks ( +CREATE TABLE IF NOT EXISTS federationsender_outbound_peeks ( room_id TEXT NOT NULL, server_name TEXT NOT NULL, peek_id TEXT NOT NULL, @@ -38,22 +38,22 @@ CREATE TABLE IF NOT EXISTS federationapi_outbound_peeks ( ` const insertOutboundPeekSQL = "" + - "INSERT INTO federationapi_outbound_peeks (room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval) VALUES ($1, $2, $3, $4, $5, $6)" + "INSERT INTO federationsender_outbound_peeks (room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval) VALUES ($1, $2, $3, $4, $5, $6)" const selectOutboundPeekSQL = "" + - "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationapi_outbound_peeks WHERE room_id = $1 and server_name = $2 and peek_id = $3" + "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationsender_outbound_peeks WHERE room_id = $1 and server_name = $2 and peek_id = $3" const selectOutboundPeeksSQL = "" + - "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationapi_outbound_peeks WHERE room_id = $1" + "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationsender_outbound_peeks WHERE room_id = $1" const renewOutboundPeekSQL = "" + - "UPDATE federationapi_outbound_peeks SET renewed_ts=$1, renewal_interval=$2 WHERE room_id = $3 and server_name = $4 and peek_id = $5" + "UPDATE federationsender_outbound_peeks SET renewed_ts=$1, renewal_interval=$2 WHERE room_id = $3 and server_name = $4 and peek_id = $5" const deleteOutboundPeekSQL = "" + - "DELETE FROM federationapi_outbound_peeks WHERE room_id = $1 and server_name = $2" + "DELETE FROM federationsender_outbound_peeks WHERE room_id = $1 and server_name = $2" const deleteOutboundPeeksSQL = "" + - "DELETE FROM federationapi_outbound_peeks WHERE room_id = $1" + "DELETE FROM federationsender_outbound_peeks WHERE room_id = $1" type outboundPeeksStatements struct { db *sql.DB diff --git a/federationapi/storage/postgres/queue_edus_table.go b/federationapi/storage/postgres/queue_edus_table.go index 28b87de48..6cac489bf 100644 --- a/federationapi/storage/postgres/queue_edus_table.go +++ b/federationapi/storage/postgres/queue_edus_table.go @@ -25,41 +25,41 @@ import ( ) const queueEDUsSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_queue_edus ( +CREATE TABLE IF NOT EXISTS federationsender_queue_edus ( -- The type of the event (informational). edu_type TEXT NOT NULL, -- The domain part of the user ID the EDU event is for. server_name TEXT NOT NULL, - -- The JSON NID from the federationapi_queue_edus_json table. + -- The JSON NID from the federationsender_queue_edus_json table. json_nid BIGINT NOT NULL ); -CREATE UNIQUE INDEX IF NOT EXISTS federationapi_queue_edus_json_nid_idx - ON federationapi_queue_edus (json_nid, server_name); +CREATE UNIQUE INDEX IF NOT EXISTS federationsender_queue_edus_json_nid_idx + ON federationsender_queue_edus (json_nid, server_name); ` const insertQueueEDUSQL = "" + - "INSERT INTO federationapi_queue_edus (edu_type, server_name, json_nid)" + + "INSERT INTO federationsender_queue_edus (edu_type, server_name, json_nid)" + " VALUES ($1, $2, $3)" const deleteQueueEDUSQL = "" + - "DELETE FROM federationapi_queue_edus WHERE server_name = $1 AND json_nid = ANY($2)" + "DELETE FROM federationsender_queue_edus WHERE server_name = $1 AND json_nid = ANY($2)" const selectQueueEDUSQL = "" + - "SELECT json_nid FROM federationapi_queue_edus" + + "SELECT json_nid FROM federationsender_queue_edus" + " WHERE server_name = $1" + " LIMIT $2" const selectQueueEDUReferenceJSONCountSQL = "" + - "SELECT COUNT(*) FROM federationapi_queue_edus" + + "SELECT COUNT(*) FROM federationsender_queue_edus" + " WHERE json_nid = $1" const selectQueueEDUCountSQL = "" + - "SELECT COUNT(*) FROM federationapi_queue_edus" + + "SELECT COUNT(*) FROM federationsender_queue_edus" + " WHERE server_name = $1" const selectQueueServerNamesSQL = "" + - "SELECT DISTINCT server_name FROM federationapi_queue_edus" + "SELECT DISTINCT server_name FROM federationsender_queue_edus" type queueEDUsStatements struct { db *sql.DB diff --git a/federationapi/storage/postgres/queue_json_table.go b/federationapi/storage/postgres/queue_json_table.go index 024568a53..853073741 100644 --- a/federationapi/storage/postgres/queue_json_table.go +++ b/federationapi/storage/postgres/queue_json_table.go @@ -24,10 +24,10 @@ import ( ) const queueJSONSchema = ` --- The federationapi_queue_json table contains event contents that +-- The federationsender_queue_json table contains event contents that -- we failed to send. -CREATE TABLE IF NOT EXISTS federationapi_queue_json ( - -- The JSON NID. This allows the federationapi_queue_retry table to +CREATE TABLE IF NOT EXISTS federationsender_queue_json ( + -- The JSON NID. This allows the federationsender_queue_retry table to -- cross-reference to find the JSON blob. json_nid BIGSERIAL, -- The JSON body. Text so that we preserve UTF-8. @@ -36,15 +36,15 @@ CREATE TABLE IF NOT EXISTS federationapi_queue_json ( ` const insertJSONSQL = "" + - "INSERT INTO federationapi_queue_json (json_body)" + + "INSERT INTO federationsender_queue_json (json_body)" + " VALUES ($1)" + " RETURNING json_nid" const deleteJSONSQL = "" + - "DELETE FROM federationapi_queue_json WHERE json_nid = ANY($1)" + "DELETE FROM federationsender_queue_json WHERE json_nid = ANY($1)" const selectJSONSQL = "" + - "SELECT json_nid, json_body FROM federationapi_queue_json" + + "SELECT json_nid, json_body FROM federationsender_queue_json" + " WHERE json_nid = ANY($1)" type queueJSONStatements struct { diff --git a/federationapi/storage/postgres/queue_pdus_table.go b/federationapi/storage/postgres/queue_pdus_table.go index b0b06164c..f9a477483 100644 --- a/federationapi/storage/postgres/queue_pdus_table.go +++ b/federationapi/storage/postgres/queue_pdus_table.go @@ -25,41 +25,41 @@ import ( ) const queuePDUsSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_queue_pdus ( +CREATE TABLE IF NOT EXISTS federationsender_queue_pdus ( -- The transaction ID that was generated before persisting the event. transaction_id TEXT NOT NULL, -- The destination server that we will send the event to. server_name TEXT NOT NULL, - -- The JSON NID from the federationapi_queue_pdus_json table. + -- The JSON NID from the federationsender_queue_pdus_json table. json_nid BIGINT NOT NULL ); -CREATE UNIQUE INDEX IF NOT EXISTS federationapi_queue_pdus_pdus_json_nid_idx - ON federationapi_queue_pdus (json_nid, server_name); +CREATE UNIQUE INDEX IF NOT EXISTS federationsender_queue_pdus_pdus_json_nid_idx + ON federationsender_queue_pdus (json_nid, server_name); ` const insertQueuePDUSQL = "" + - "INSERT INTO federationapi_queue_pdus (transaction_id, server_name, json_nid)" + + "INSERT INTO federationsender_queue_pdus (transaction_id, server_name, json_nid)" + " VALUES ($1, $2, $3)" const deleteQueuePDUSQL = "" + - "DELETE FROM federationapi_queue_pdus WHERE server_name = $1 AND json_nid = ANY($2)" + "DELETE FROM federationsender_queue_pdus WHERE server_name = $1 AND json_nid = ANY($2)" const selectQueuePDUsSQL = "" + - "SELECT json_nid FROM federationapi_queue_pdus" + + "SELECT json_nid FROM federationsender_queue_pdus" + " WHERE server_name = $1" + " LIMIT $2" const selectQueuePDUReferenceJSONCountSQL = "" + - "SELECT COUNT(*) FROM federationapi_queue_pdus" + + "SELECT COUNT(*) FROM federationsender_queue_pdus" + " WHERE json_nid = $1" const selectQueuePDUsCountSQL = "" + - "SELECT COUNT(*) FROM federationapi_queue_pdus" + + "SELECT COUNT(*) FROM federationsender_queue_pdus" + " WHERE server_name = $1" const selectQueuePDUServerNamesSQL = "" + - "SELECT DISTINCT server_name FROM federationapi_queue_pdus" + "SELECT DISTINCT server_name FROM federationsender_queue_pdus" type queuePDUsStatements struct { db *sql.DB diff --git a/federationapi/storage/sqlite3/blacklist_table.go b/federationapi/storage/sqlite3/blacklist_table.go index b7cc56315..2694e630d 100644 --- a/federationapi/storage/sqlite3/blacklist_table.go +++ b/federationapi/storage/sqlite3/blacklist_table.go @@ -23,7 +23,7 @@ import ( ) const blacklistSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_blacklist ( +CREATE TABLE IF NOT EXISTS federationsender_blacklist ( -- The blacklisted server name server_name TEXT NOT NULL, UNIQUE (server_name) @@ -31,17 +31,17 @@ CREATE TABLE IF NOT EXISTS federationapi_blacklist ( ` const insertBlacklistSQL = "" + - "INSERT INTO federationapi_blacklist (server_name) VALUES ($1)" + + "INSERT INTO federationsender_blacklist (server_name) VALUES ($1)" + " ON CONFLICT DO NOTHING" const selectBlacklistSQL = "" + - "SELECT server_name FROM federationapi_blacklist WHERE server_name = $1" + "SELECT server_name FROM federationsender_blacklist WHERE server_name = $1" const deleteBlacklistSQL = "" + - "DELETE FROM federationapi_blacklist WHERE server_name = $1" + "DELETE FROM federationsender_blacklist WHERE server_name = $1" const deleteAllBlacklistSQL = "" + - "DELETE FROM federationapi_blacklist" + "DELETE FROM federationsender_blacklist" type blacklistStatements struct { db *sql.DB diff --git a/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go b/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go index 249b9f65d..cc4bdadfd 100644 --- a/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go +++ b/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go @@ -32,7 +32,7 @@ func LoadRemoveRoomsTable(m *sqlutil.Migrations) { func UpRemoveRoomsTable(tx *sql.Tx) error { _, err := tx.Exec(` - DROP TABLE IF EXISTS federationapi_rooms; + DROP TABLE IF EXISTS federationsender_rooms; `) if err != nil { return fmt.Errorf("failed to execute upgrade: %w", err) diff --git a/federationapi/storage/sqlite3/inbound_peeks_table.go b/federationapi/storage/sqlite3/inbound_peeks_table.go index 78d9bae7f..ad3c4a6dd 100644 --- a/federationapi/storage/sqlite3/inbound_peeks_table.go +++ b/federationapi/storage/sqlite3/inbound_peeks_table.go @@ -26,7 +26,7 @@ import ( ) const inboundPeeksSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_inbound_peeks ( +CREATE TABLE IF NOT EXISTS federationsender_inbound_peeks ( room_id TEXT NOT NULL, server_name TEXT NOT NULL, peek_id TEXT NOT NULL, @@ -38,22 +38,22 @@ CREATE TABLE IF NOT EXISTS federationapi_inbound_peeks ( ` const insertInboundPeekSQL = "" + - "INSERT INTO federationapi_inbound_peeks (room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval) VALUES ($1, $2, $3, $4, $5, $6)" + "INSERT INTO federationsender_inbound_peeks (room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval) VALUES ($1, $2, $3, $4, $5, $6)" const selectInboundPeekSQL = "" + - "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationapi_inbound_peeks WHERE room_id = $1 and server_name = $2 and peek_id = $3" + "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationsender_inbound_peeks WHERE room_id = $1 and server_name = $2 and peek_id = $3" const selectInboundPeeksSQL = "" + - "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationapi_inbound_peeks WHERE room_id = $1" + "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationsender_inbound_peeks WHERE room_id = $1" const renewInboundPeekSQL = "" + - "UPDATE federationapi_inbound_peeks SET renewed_ts=$1, renewal_interval=$2 WHERE room_id = $3 and server_name = $4 and peek_id = $5" + "UPDATE federationsender_inbound_peeks SET renewed_ts=$1, renewal_interval=$2 WHERE room_id = $3 and server_name = $4 and peek_id = $5" const deleteInboundPeekSQL = "" + - "DELETE FROM federationapi_inbound_peeks WHERE room_id = $1 and server_name = $2" + "DELETE FROM federationsender_inbound_peeks WHERE room_id = $1 and server_name = $2" const deleteInboundPeeksSQL = "" + - "DELETE FROM federationapi_inbound_peeks WHERE room_id = $1" + "DELETE FROM federationsender_inbound_peeks WHERE room_id = $1" type inboundPeeksStatements struct { db *sql.DB diff --git a/federationapi/storage/sqlite3/joined_hosts_table.go b/federationapi/storage/sqlite3/joined_hosts_table.go index 32909788b..e0e0f2873 100644 --- a/federationapi/storage/sqlite3/joined_hosts_table.go +++ b/federationapi/storage/sqlite3/joined_hosts_table.go @@ -30,7 +30,7 @@ const joinedHostsSchema = ` -- The joined_hosts table stores a list of m.room.member event ids in the -- current state for each room where the membership is "join". -- There will be an entry for every user that is joined to the room. -CREATE TABLE IF NOT EXISTS federationapi_joined_hosts ( +CREATE TABLE IF NOT EXISTS federationsender_joined_hosts ( -- The string ID of the room. room_id TEXT NOT NULL, -- The event ID of the m.room.member join event. @@ -40,31 +40,31 @@ CREATE TABLE IF NOT EXISTS federationapi_joined_hosts ( ); CREATE UNIQUE INDEX IF NOT EXISTS federatonsender_joined_hosts_event_id_idx - ON federationapi_joined_hosts (event_id); + ON federationsender_joined_hosts (event_id); CREATE INDEX IF NOT EXISTS federatonsender_joined_hosts_room_id_idx - ON federationapi_joined_hosts (room_id) + ON federationsender_joined_hosts (room_id) ` const insertJoinedHostsSQL = "" + - "INSERT OR IGNORE INTO federationapi_joined_hosts (room_id, event_id, server_name)" + + "INSERT OR IGNORE INTO federationsender_joined_hosts (room_id, event_id, server_name)" + " VALUES ($1, $2, $3)" const deleteJoinedHostsSQL = "" + - "DELETE FROM federationapi_joined_hosts WHERE event_id = $1" + "DELETE FROM federationsender_joined_hosts WHERE event_id = $1" const deleteJoinedHostsForRoomSQL = "" + - "DELETE FROM federationapi_joined_hosts WHERE room_id = $1" + "DELETE FROM federationsender_joined_hosts WHERE room_id = $1" const selectJoinedHostsSQL = "" + - "SELECT event_id, server_name FROM federationapi_joined_hosts" + + "SELECT event_id, server_name FROM federationsender_joined_hosts" + " WHERE room_id = $1" const selectAllJoinedHostsSQL = "" + - "SELECT DISTINCT server_name FROM federationapi_joined_hosts" + "SELECT DISTINCT server_name FROM federationsender_joined_hosts" const selectJoinedHostsForRoomsSQL = "" + - "SELECT DISTINCT server_name FROM federationapi_joined_hosts WHERE room_id IN ($1)" + "SELECT DISTINCT server_name FROM federationsender_joined_hosts WHERE room_id IN ($1)" type joinedHostsStatements struct { db *sql.DB diff --git a/federationapi/storage/sqlite3/notary_server_keys_json_table.go b/federationapi/storage/sqlite3/notary_server_keys_json_table.go index 3501d2154..4a028fa20 100644 --- a/federationapi/storage/sqlite3/notary_server_keys_json_table.go +++ b/federationapi/storage/sqlite3/notary_server_keys_json_table.go @@ -23,7 +23,7 @@ import ( ) const notaryServerKeysJSONSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_notary_server_keys_json ( +CREATE TABLE IF NOT EXISTS federationsender_notary_server_keys_json ( notary_id INTEGER PRIMARY KEY AUTOINCREMENT, response_json TEXT NOT NULL, server_name TEXT NOT NULL, @@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS federationapi_notary_server_keys_json ( ` const insertServerKeysJSONSQL = "" + - "INSERT INTO federationapi_notary_server_keys_json (response_json, server_name, valid_until) VALUES ($1, $2, $3)" + + "INSERT INTO federationsender_notary_server_keys_json (response_json, server_name, valid_until) VALUES ($1, $2, $3)" + " RETURNING notary_id" type notaryServerKeysStatements struct { diff --git a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go index 801400935..55709a962 100644 --- a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go +++ b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go @@ -28,7 +28,7 @@ import ( ) const notaryServerKeysMetadataSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_notary_server_keys_metadata ( +CREATE TABLE IF NOT EXISTS federationsender_notary_server_keys_metadata ( notary_id BIGINT NOT NULL, server_name TEXT NOT NULL, key_id TEXT NOT NULL, @@ -37,41 +37,41 @@ CREATE TABLE IF NOT EXISTS federationapi_notary_server_keys_metadata ( ` const upsertServerKeysSQL = "" + - "INSERT INTO federationapi_notary_server_keys_metadata (notary_id, server_name, key_id) VALUES ($1, $2, $3)" + + "INSERT INTO federationsender_notary_server_keys_metadata (notary_id, server_name, key_id) VALUES ($1, $2, $3)" + " ON CONFLICT (server_name, key_id) DO UPDATE SET notary_id = $1" // for a given (server_name, key_id), find the existing notary ID and valid until. Used to check if we will replace it // JOINs with the json table const selectNotaryKeyMetadataSQL = ` - SELECT federationapi_notary_server_keys_metadata.notary_id, valid_until FROM federationapi_notary_server_keys_json - JOIN federationapi_notary_server_keys_metadata ON - federationapi_notary_server_keys_metadata.notary_id = federationapi_notary_server_keys_json.notary_id - WHERE federationapi_notary_server_keys_metadata.server_name = $1 AND federationapi_notary_server_keys_metadata.key_id = $2 + SELECT federationsender_notary_server_keys_metadata.notary_id, valid_until FROM federationsender_notary_server_keys_json + JOIN federationsender_notary_server_keys_metadata ON + federationsender_notary_server_keys_metadata.notary_id = federationsender_notary_server_keys_json.notary_id + WHERE federationsender_notary_server_keys_metadata.server_name = $1 AND federationsender_notary_server_keys_metadata.key_id = $2 ` // select the response which has the highest valid_until value // JOINs with the json table const selectNotaryKeyResponsesSQL = ` - SELECT response_json FROM federationapi_notary_server_keys_json + SELECT response_json FROM federationsender_notary_server_keys_json WHERE server_name = $1 AND valid_until = ( - SELECT MAX(valid_until) FROM federationapi_notary_server_keys_json WHERE server_name = $1 + SELECT MAX(valid_until) FROM federationsender_notary_server_keys_json WHERE server_name = $1 ) ` // select the responses which have the given key IDs // JOINs with the json table const selectNotaryKeyResponsesWithKeyIDsSQL = ` - SELECT response_json FROM federationapi_notary_server_keys_json - JOIN federationapi_notary_server_keys_metadata ON - federationapi_notary_server_keys_metadata.notary_id = federationapi_notary_server_keys_json.notary_id - WHERE federationapi_notary_server_keys_json.server_name = $1 AND federationapi_notary_server_keys_metadata.key_id IN ($2) - GROUP BY federationapi_notary_server_keys_json.notary_id + SELECT response_json FROM federationsender_notary_server_keys_json + JOIN federationsender_notary_server_keys_metadata ON + federationsender_notary_server_keys_metadata.notary_id = federationsender_notary_server_keys_json.notary_id + WHERE federationsender_notary_server_keys_json.server_name = $1 AND federationsender_notary_server_keys_metadata.key_id IN ($2) + GROUP BY federationsender_notary_server_keys_json.notary_id ` // JOINs with the metadata table const deleteUnusedServerKeysJSONSQL = ` - DELETE FROM federationapi_notary_server_keys_json WHERE federationapi_notary_server_keys_json.notary_id NOT IN ( - SELECT DISTINCT notary_id FROM federationapi_notary_server_keys_metadata + DELETE FROM federationsender_notary_server_keys_json WHERE federationsender_notary_server_keys_json.notary_id NOT IN ( + SELECT DISTINCT notary_id FROM federationsender_notary_server_keys_metadata ) ` diff --git a/federationapi/storage/sqlite3/outbound_peeks_table.go b/federationapi/storage/sqlite3/outbound_peeks_table.go index e3a82ada1..e29026fab 100644 --- a/federationapi/storage/sqlite3/outbound_peeks_table.go +++ b/federationapi/storage/sqlite3/outbound_peeks_table.go @@ -26,7 +26,7 @@ import ( ) const outboundPeeksSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_outbound_peeks ( +CREATE TABLE IF NOT EXISTS federationsender_outbound_peeks ( room_id TEXT NOT NULL, server_name TEXT NOT NULL, peek_id TEXT NOT NULL, @@ -38,22 +38,22 @@ CREATE TABLE IF NOT EXISTS federationapi_outbound_peeks ( ` const insertOutboundPeekSQL = "" + - "INSERT INTO federationapi_outbound_peeks (room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval) VALUES ($1, $2, $3, $4, $5, $6)" + "INSERT INTO federationsender_outbound_peeks (room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval) VALUES ($1, $2, $3, $4, $5, $6)" const selectOutboundPeekSQL = "" + - "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationapi_outbound_peeks WHERE room_id = $1 and server_name = $2 and peek_id = $3" + "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationsender_outbound_peeks WHERE room_id = $1 and server_name = $2 and peek_id = $3" const selectOutboundPeeksSQL = "" + - "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationapi_outbound_peeks WHERE room_id = $1" + "SELECT room_id, server_name, peek_id, creation_ts, renewed_ts, renewal_interval FROM federationsender_outbound_peeks WHERE room_id = $1" const renewOutboundPeekSQL = "" + - "UPDATE federationapi_outbound_peeks SET renewed_ts=$1, renewal_interval=$2 WHERE room_id = $3 and server_name = $4 and peek_id = $5" + "UPDATE federationsender_outbound_peeks SET renewed_ts=$1, renewal_interval=$2 WHERE room_id = $3 and server_name = $4 and peek_id = $5" const deleteOutboundPeekSQL = "" + - "DELETE FROM federationapi_outbound_peeks WHERE room_id = $1 and server_name = $2" + "DELETE FROM federationsender_outbound_peeks WHERE room_id = $1 and server_name = $2" const deleteOutboundPeeksSQL = "" + - "DELETE FROM federationapi_outbound_peeks WHERE room_id = $1" + "DELETE FROM federationsender_outbound_peeks WHERE room_id = $1" type outboundPeeksStatements struct { db *sql.DB diff --git a/federationapi/storage/sqlite3/queue_edus_table.go b/federationapi/storage/sqlite3/queue_edus_table.go index 1be8c3d8f..a6d609508 100644 --- a/federationapi/storage/sqlite3/queue_edus_table.go +++ b/federationapi/storage/sqlite3/queue_edus_table.go @@ -26,41 +26,41 @@ import ( ) const queueEDUsSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_queue_edus ( +CREATE TABLE IF NOT EXISTS federationsender_queue_edus ( -- The type of the event (informational). edu_type TEXT NOT NULL, -- The domain part of the user ID the EDU event is for. server_name TEXT NOT NULL, - -- The JSON NID from the federationapi_queue_edus_json table. + -- The JSON NID from the federationsender_queue_edus_json table. json_nid BIGINT NOT NULL ); -CREATE UNIQUE INDEX IF NOT EXISTS federationapi_queue_edus_json_nid_idx - ON federationapi_queue_edus (json_nid, server_name); +CREATE UNIQUE INDEX IF NOT EXISTS federationsender_queue_edus_json_nid_idx + ON federationsender_queue_edus (json_nid, server_name); ` const insertQueueEDUSQL = "" + - "INSERT INTO federationapi_queue_edus (edu_type, server_name, json_nid)" + + "INSERT INTO federationsender_queue_edus (edu_type, server_name, json_nid)" + " VALUES ($1, $2, $3)" const deleteQueueEDUsSQL = "" + - "DELETE FROM federationapi_queue_edus WHERE server_name = $1 AND json_nid IN ($2)" + "DELETE FROM federationsender_queue_edus WHERE server_name = $1 AND json_nid IN ($2)" const selectQueueEDUSQL = "" + - "SELECT json_nid FROM federationapi_queue_edus" + + "SELECT json_nid FROM federationsender_queue_edus" + " WHERE server_name = $1" + " LIMIT $2" const selectQueueEDUReferenceJSONCountSQL = "" + - "SELECT COUNT(*) FROM federationapi_queue_edus" + + "SELECT COUNT(*) FROM federationsender_queue_edus" + " WHERE json_nid = $1" const selectQueueEDUCountSQL = "" + - "SELECT COUNT(*) FROM federationapi_queue_edus" + + "SELECT COUNT(*) FROM federationsender_queue_edus" + " WHERE server_name = $1" const selectQueueServerNamesSQL = "" + - "SELECT DISTINCT server_name FROM federationapi_queue_edus" + "SELECT DISTINCT server_name FROM federationsender_queue_edus" type queueEDUsStatements struct { db *sql.DB diff --git a/federationapi/storage/sqlite3/queue_json_table.go b/federationapi/storage/sqlite3/queue_json_table.go index f4849330a..3e3f60f63 100644 --- a/federationapi/storage/sqlite3/queue_json_table.go +++ b/federationapi/storage/sqlite3/queue_json_table.go @@ -28,8 +28,8 @@ import ( const queueJSONSchema = ` -- The queue_retry_json table contains event contents that -- we failed to send. -CREATE TABLE IF NOT EXISTS federationapi_queue_json ( - -- The JSON NID. This allows the federationapi_queue_retry table to +CREATE TABLE IF NOT EXISTS federationsender_queue_json ( + -- The JSON NID. This allows the federationsender_queue_retry table to -- cross-reference to find the JSON blob. json_nid INTEGER PRIMARY KEY AUTOINCREMENT, -- The JSON body. Text so that we preserve UTF-8. @@ -38,14 +38,14 @@ CREATE TABLE IF NOT EXISTS federationapi_queue_json ( ` const insertJSONSQL = "" + - "INSERT INTO federationapi_queue_json (json_body)" + + "INSERT INTO federationsender_queue_json (json_body)" + " VALUES ($1)" const deleteJSONSQL = "" + - "DELETE FROM federationapi_queue_json WHERE json_nid IN ($1)" + "DELETE FROM federationsender_queue_json WHERE json_nid IN ($1)" const selectJSONSQL = "" + - "SELECT json_nid, json_body FROM federationapi_queue_json" + + "SELECT json_nid, json_body FROM federationsender_queue_json" + " WHERE json_nid IN ($1)" type queueJSONStatements struct { diff --git a/federationapi/storage/sqlite3/queue_pdus_table.go b/federationapi/storage/sqlite3/queue_pdus_table.go index 489042c9d..e0fdbda5f 100644 --- a/federationapi/storage/sqlite3/queue_pdus_table.go +++ b/federationapi/storage/sqlite3/queue_pdus_table.go @@ -27,47 +27,47 @@ import ( ) const queuePDUsSchema = ` -CREATE TABLE IF NOT EXISTS federationapi_queue_pdus ( +CREATE TABLE IF NOT EXISTS federationsender_queue_pdus ( -- The transaction ID that was generated before persisting the event. transaction_id TEXT NOT NULL, -- The domain part of the user ID the m.room.member event is for. server_name TEXT NOT NULL, - -- The JSON NID from the federationapi_queue_pdus_json table. + -- The JSON NID from the federationsender_queue_pdus_json table. json_nid BIGINT NOT NULL ); -CREATE UNIQUE INDEX IF NOT EXISTS federationapi_queue_pdus_pdus_json_nid_idx - ON federationapi_queue_pdus (json_nid, server_name); +CREATE UNIQUE INDEX IF NOT EXISTS federationsender_queue_pdus_pdus_json_nid_idx + ON federationsender_queue_pdus (json_nid, server_name); ` const insertQueuePDUSQL = "" + - "INSERT INTO federationapi_queue_pdus (transaction_id, server_name, json_nid)" + + "INSERT INTO federationsender_queue_pdus (transaction_id, server_name, json_nid)" + " VALUES ($1, $2, $3)" const deleteQueuePDUsSQL = "" + - "DELETE FROM federationapi_queue_pdus WHERE server_name = $1 AND json_nid IN ($2)" + "DELETE FROM federationsender_queue_pdus WHERE server_name = $1 AND json_nid IN ($2)" const selectQueueNextTransactionIDSQL = "" + - "SELECT transaction_id FROM federationapi_queue_pdus" + + "SELECT transaction_id FROM federationsender_queue_pdus" + " WHERE server_name = $1" + " ORDER BY transaction_id ASC" + " LIMIT 1" const selectQueuePDUsSQL = "" + - "SELECT json_nid FROM federationapi_queue_pdus" + + "SELECT json_nid FROM federationsender_queue_pdus" + " WHERE server_name = $1" + " LIMIT $2" const selectQueuePDUsReferenceJSONCountSQL = "" + - "SELECT COUNT(*) FROM federationapi_queue_pdus" + + "SELECT COUNT(*) FROM federationsender_queue_pdus" + " WHERE json_nid = $1" const selectQueuePDUsCountSQL = "" + - "SELECT COUNT(*) FROM federationapi_queue_pdus" + + "SELECT COUNT(*) FROM federationsender_queue_pdus" + " WHERE server_name = $1" const selectQueuePDUsServerNamesSQL = "" + - "SELECT DISTINCT server_name FROM federationapi_queue_pdus" + "SELECT DISTINCT server_name FROM federationsender_queue_pdus" type queuePDUsStatements struct { db *sql.DB