mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

s/offset/log_offset/g because 'offset' is a reserved word in postgres

Browse source
This commit is contained in:
Kegan Dougal 2020-07-28 17:07:51 +01:00
parent 2ea06dacd8
commit 96fe42484f
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
keyserver/storage/postgres/key_changes_table.go
View file

@ -26,10 +26,9 @@ var keyChangesSchema = `
-- Stores key change information about users. Used to determine when to send updated device lists to clients. -- Stores key change information about users. Used to determine when to send updated device lists to clients.
CREATE TABLE IF NOT EXISTS keyserver_key_changes ( CREATE TABLE IF NOT EXISTS keyserver_key_changes (
partition BIGINT NOT NULL, partition BIGINT NOT NULL,
offset BIGINT NOT NULL, log_offset BIGINT NOT NULL,
-- The key owner
user_id TEXT NOT NULL, user_id TEXT NOT NULL,
CONSTRAINT keyserver_key_changes_unique UNIQUE (partition, offset) CONSTRAINT keyserver_key_changes_unique UNIQUE (partition, log_offset)
); );
` `
@ -37,7 +36,7 @@ CREATE TABLE IF NOT EXISTS keyserver_key_changes (
// Rather than falling over, just overwrite (though this will mean clients with an existing sync token will // Rather than falling over, just overwrite (though this will mean clients with an existing sync token will
// miss out on updates). TODO: Ideally we would detect when kafka logs are purged then purge this table too. // miss out on updates). TODO: Ideally we would detect when kafka logs are purged then purge this table too.
const upsertKeyChangeSQL = "" + const upsertKeyChangeSQL = "" +
"INSERT INTO keyserver_key_changes (partition, offset, user_id)" + "INSERT INTO keyserver_key_changes (partition, log_offset, user_id)" +
" VALUES ($1, $2, $3)" + " VALUES ($1, $2, $3)" +
" ON CONFLICT ON CONSTRAINT keyserver_key_changes_unique" + " ON CONFLICT ON CONSTRAINT keyserver_key_changes_unique" +
" DO UPDATE SET user_id = $3" " DO UPDATE SET user_id = $3"
@ -45,7 +44,7 @@ const upsertKeyChangeSQL = "" +
// select the highest offset for each user in the range. The grouping by user gives distinct entries and then we just // select the highest offset for each user in the range. The grouping by user gives distinct entries and then we just
// take the max offset value as the latest offset. // take the max offset value as the latest offset.
const selectKeyChangesSQL = "" + const selectKeyChangesSQL = "" +
"SELECT user_id, MAX(offset) FROM keyserver_key_changes WHERE partition = $1 AND offset > $2 GROUP BY user_id" "SELECT user_id, MAX(log_offset) FROM keyserver_key_changes WHERE partition = $1 AND log_offset > $2 GROUP BY user_id"
type keyChangesStatements struct { type keyChangesStatements struct {
db *sql.DB db *sql.DB