mirror of
https://github.com/hoernschen/dendrite.git
synced 2025-08-01 13:52:46 +00:00
Event relations (#2790)
This adds support for tracking `m.relates_to`, as well as adding support for the various `/room/{roomID}/relations/...` endpoints to the CS API.
This commit is contained in:
parent
3c1474f68f
commit
23a3e04579
19 changed files with 943 additions and 51 deletions
163
syncapi/storage/sqlite3/relations_table.go
Normal file
163
syncapi/storage/sqlite3/relations_table.go
Normal file
|
@ -0,0 +1,163 @@
|
|||
// Copyright 2022 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 sqlite3
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
|
||||
"github.com/matrix-org/dendrite/internal"
|
||||
"github.com/matrix-org/dendrite/internal/sqlutil"
|
||||
"github.com/matrix-org/dendrite/syncapi/storage/tables"
|
||||
"github.com/matrix-org/dendrite/syncapi/types"
|
||||
)
|
||||
|
||||
const relationsSchema = `
|
||||
CREATE TABLE IF NOT EXISTS syncapi_relations (
|
||||
id BIGINT PRIMARY KEY,
|
||||
room_id TEXT NOT NULL,
|
||||
event_id TEXT NOT NULL,
|
||||
child_event_id TEXT NOT NULL,
|
||||
child_event_type TEXT NOT NULL,
|
||||
rel_type TEXT NOT NULL,
|
||||
UNIQUE (room_id, event_id, child_event_id, rel_type)
|
||||
);
|
||||
`
|
||||
|
||||
const insertRelationSQL = "" +
|
||||
"INSERT INTO syncapi_relations (" +
|
||||
" id, room_id, event_id, child_event_id, child_event_type, rel_type" +
|
||||
") VALUES ($1, $2, $3, $4, $5, $6) " +
|
||||
" ON CONFLICT DO NOTHING"
|
||||
|
||||
const deleteRelationSQL = "" +
|
||||
"DELETE FROM syncapi_relations WHERE room_id = $1 AND child_event_id = $2"
|
||||
|
||||
const selectRelationsInRangeAscSQL = "" +
|
||||
"SELECT id, child_event_id, rel_type FROM syncapi_relations" +
|
||||
" WHERE room_id = $1 AND event_id = $2" +
|
||||
" AND ( $3 = '' OR rel_type = $3 )" +
|
||||
" AND ( $4 = '' OR child_event_type = $4 )" +
|
||||
" AND id > $5 AND id <= $6" +
|
||||
" ORDER BY id ASC LIMIT $7"
|
||||
|
||||
const selectRelationsInRangeDescSQL = "" +
|
||||
"SELECT id, child_event_id, rel_type FROM syncapi_relations" +
|
||||
" WHERE room_id = $1 AND event_id = $2" +
|
||||
" AND ( $3 = '' OR rel_type = $3 )" +
|
||||
" AND ( $4 = '' OR child_event_type = $4 )" +
|
||||
" AND id >= $5 AND id < $6" +
|
||||
" ORDER BY id DESC LIMIT $7"
|
||||
|
||||
const selectMaxRelationIDSQL = "" +
|
||||
"SELECT COALESCE(MAX(id), 0) FROM syncapi_relations"
|
||||
|
||||
type relationsStatements struct {
|
||||
streamIDStatements *StreamIDStatements
|
||||
insertRelationStmt *sql.Stmt
|
||||
selectRelationsInRangeAscStmt *sql.Stmt
|
||||
selectRelationsInRangeDescStmt *sql.Stmt
|
||||
deleteRelationStmt *sql.Stmt
|
||||
selectMaxRelationIDStmt *sql.Stmt
|
||||
}
|
||||
|
||||
func NewSqliteRelationsTable(db *sql.DB, streamID *StreamIDStatements) (tables.Relations, error) {
|
||||
s := &relationsStatements{
|
||||
streamIDStatements: streamID,
|
||||
}
|
||||
_, err := db.Exec(relationsSchema)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return s, sqlutil.StatementList{
|
||||
{&s.insertRelationStmt, insertRelationSQL},
|
||||
{&s.selectRelationsInRangeAscStmt, selectRelationsInRangeAscSQL},
|
||||
{&s.selectRelationsInRangeDescStmt, selectRelationsInRangeDescSQL},
|
||||
{&s.deleteRelationStmt, deleteRelationSQL},
|
||||
{&s.selectMaxRelationIDStmt, selectMaxRelationIDSQL},
|
||||
}.Prepare(db)
|
||||
}
|
||||
|
||||
func (s *relationsStatements) InsertRelation(
|
||||
ctx context.Context, txn *sql.Tx, roomID, eventID, childEventID, childEventType, relType string,
|
||||
) (err error) {
|
||||
var streamPos types.StreamPosition
|
||||
if streamPos, err = s.streamIDStatements.nextRelationID(ctx, txn); err != nil {
|
||||
return
|
||||
}
|
||||
_, err = sqlutil.TxStmt(txn, s.insertRelationStmt).ExecContext(
|
||||
ctx, streamPos, roomID, eventID, childEventID, childEventType, relType,
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
func (s *relationsStatements) DeleteRelation(
|
||||
ctx context.Context, txn *sql.Tx, roomID, childEventID string,
|
||||
) error {
|
||||
stmt := sqlutil.TxStmt(txn, s.deleteRelationStmt)
|
||||
_, err := stmt.ExecContext(
|
||||
ctx, roomID, childEventID,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
// SelectRelationsInRange returns a map rel_type -> []child_event_id
|
||||
func (s *relationsStatements) SelectRelationsInRange(
|
||||
ctx context.Context, txn *sql.Tx, roomID, eventID, relType, eventType string,
|
||||
r types.Range, limit int,
|
||||
) (map[string][]types.RelationEntry, types.StreamPosition, error) {
|
||||
var lastPos types.StreamPosition
|
||||
var stmt *sql.Stmt
|
||||
if r.Backwards {
|
||||
stmt = sqlutil.TxStmt(txn, s.selectRelationsInRangeDescStmt)
|
||||
} else {
|
||||
stmt = sqlutil.TxStmt(txn, s.selectRelationsInRangeAscStmt)
|
||||
}
|
||||
rows, err := stmt.QueryContext(ctx, roomID, eventID, relType, eventType, r.Low(), r.High(), limit)
|
||||
if err != nil {
|
||||
return nil, lastPos, err
|
||||
}
|
||||
defer internal.CloseAndLogIfError(ctx, rows, "selectRelationsInRange: rows.close() failed")
|
||||
result := map[string][]types.RelationEntry{}
|
||||
var (
|
||||
id types.StreamPosition
|
||||
childEventID string
|
||||
relationType string
|
||||
)
|
||||
for rows.Next() {
|
||||
if err = rows.Scan(&id, &childEventID, &relationType); err != nil {
|
||||
return nil, lastPos, err
|
||||
}
|
||||
if id > lastPos {
|
||||
lastPos = id
|
||||
}
|
||||
result[relationType] = append(result[relationType], types.RelationEntry{
|
||||
Position: id,
|
||||
EventID: childEventID,
|
||||
})
|
||||
}
|
||||
if lastPos == 0 {
|
||||
lastPos = r.To
|
||||
}
|
||||
return result, lastPos, rows.Err()
|
||||
}
|
||||
|
||||
func (s *relationsStatements) SelectMaxRelationID(
|
||||
ctx context.Context, txn *sql.Tx,
|
||||
) (id int64, err error) {
|
||||
stmt := sqlutil.TxStmt(txn, s.selectMaxRelationIDStmt)
|
||||
err = stmt.QueryRowContext(ctx).Scan(&id)
|
||||
return
|
||||
}
|
|
@ -28,6 +28,8 @@ INSERT INTO syncapi_stream_id (stream_name, stream_id) VALUES ("presence", 0)
|
|||
ON CONFLICT DO NOTHING;
|
||||
INSERT INTO syncapi_stream_id (stream_name, stream_id) VALUES ("notification", 0)
|
||||
ON CONFLICT DO NOTHING;
|
||||
INSERT INTO syncapi_stream_id (stream_name, stream_id) VALUES ("relation", 0)
|
||||
ON CONFLICT DO NOTHING;
|
||||
`
|
||||
|
||||
const increaseStreamIDStmt = "" +
|
||||
|
@ -86,3 +88,9 @@ func (s *StreamIDStatements) nextNotificationID(ctx context.Context, txn *sql.Tx
|
|||
err = increaseStmt.QueryRowContext(ctx, "notification").Scan(&pos)
|
||||
return
|
||||
}
|
||||
|
||||
func (s *StreamIDStatements) nextRelationID(ctx context.Context, txn *sql.Tx) (pos types.StreamPosition, err error) {
|
||||
increaseStmt := sqlutil.TxStmt(txn, s.increaseStreamIDStmt)
|
||||
err = increaseStmt.QueryRowContext(ctx, "relation").Scan(&pos)
|
||||
return
|
||||
}
|
||||
|
|
|
@ -123,6 +123,10 @@ func (d *SyncServerDatasource) prepare(ctx context.Context) (err error) {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
relations, err := NewSqliteRelationsTable(d.db, &d.streamID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// apply migrations which need multiple tables
|
||||
m := sqlutil.NewMigrator(d.db)
|
||||
|
@ -153,6 +157,7 @@ func (d *SyncServerDatasource) prepare(ctx context.Context) (err error) {
|
|||
NotificationData: notificationData,
|
||||
Ignores: ignores,
|
||||
Presence: presence,
|
||||
Relations: relations,
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue