- Add postgres tables

- Rename index on sqlite3
This commit is contained in:
Till Faelligen 2020-10-13 07:30:09 +02:00
parent 51d2b15790
commit afef2a19ae
3 changed files with 83 additions and 1 deletions

View file

@ -0,0 +1,77 @@
// Copyright 2020 The Matrix.org Foundation C.I.C.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package postgres
import (
"context"
"database/sql"
"time"
"github.com/pkg/errors"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/roomserver/storage/tables"
)
const receiptsSchema = `
-- Stores data about receipts
CREATE TABLE IF NOT EXISTS roomserver_receipts (
-- The ID
id INTEGER PRIMARY KEY,
room_id TEXT NOT NULL,
receipt_type TEXT NOT NULL,
user_id TEXT NOT NULL,
event_id TEXT NOT NULL,
receipt_ts BIGINT NOT NULL,
CONSTRAINT roomserver_receipts_unique UNIQUE (room_id, receipt_type, user_id)
);
CREATE INDEX IF NOT EXISTS roomserver_receipts_room_id ON roomserver_receipts(room_id);
`
const upsertReceipt = "" +
"INSERT INTO roomserver_receipts" +
" (room_id, receipt_type, user_id, event_id, receipt_ts)" +
" VALUES ($1, $2, $3, $4, $5)" +
" ON CONFLICT (room_id, receipt_type, user_id)" +
" DO UPDATE SET event_id = $4, receipt_ts = $5"
type receiptStatements struct {
db *sql.DB
upsertReceipt *sql.Stmt
}
func NewPostgresReceiptsTable(db *sql.DB) (tables.Receipts, error) {
_, err := db.Exec(receiptsSchema)
if err != nil {
return nil, err
}
r := &receiptStatements{
db: db,
}
if r.upsertReceipt, err = db.Prepare(upsertReceipt); err != nil {
return nil, errors.Wrap(err, "unable to prepare upsertReceipt statement")
}
return r, nil
}
func (r *receiptStatements) UpsertReceipt(ctx context.Context, txn *sql.Tx, roomId, receiptType, userId, eventId string) error {
receiptTs := time.Now().UnixNano() / int64(time.Millisecond)
stmt := sqlutil.TxStmt(txn, r.upsertReceipt)
_, err := stmt.ExecContext(ctx, roomId, receiptType, userId, eventId, receiptTs)
return err
}

View file

@ -97,6 +97,10 @@ func Open(dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches)
if err != nil {
return nil, err
}
receipts, err := NewPostgresReceiptsTable(db)
if err != nil {
return nil, err
}
d.Database = shared.Database{
DB: db,
Cache: cache,
@ -115,6 +119,7 @@ func Open(dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches)
MembershipTable: membership,
PublishedTable: published,
RedactionsTable: redactions,
ReceiptsTable: receipts,
}
return &d, nil
}

View file

@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS roomserver_receipts (
CONSTRAINT roomserver_receipts_unique UNIQUE (room_id, receipt_type, user_id)
);
CREATE INDEX IF NOT EXISTS roomserver_receipts_user_id ON roomserver_receipts(room_id);
CREATE INDEX IF NOT EXISTS roomserver_receipts_room_id ON roomserver_receipts(room_id);
`
const upsertReceipt = "" +