hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 14:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make it build

Browse source
This commit is contained in:
Matthew Hodgson 2020-08-31 16:12:09 +03:00
parent d343b8fb2c
commit c4e5f60d71
11 changed files with 87 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
syncapi/storage/interface.go
View file

@ -31,7 +31,7 @@ type Database interface {
// AllJoinedUsersInRooms returns a map of room ID to a list of all joined user IDs.
AllJoinedUsersInRooms(ctx context.Context) (map[string][]string, error)
// AllPeekingDevicesInRooms returns a map of room ID to a list of all peeking devices.
AllPeekingDevicesInRooms(ctx context.Context) (map[string][]PeekingDevice, error)
AllPeekingDevicesInRooms(ctx context.Context) (map[string][]types.PeekingDevice, error)
// Events lookups a list of event by their event ID.
// Returns a list of events matching the requested IDs found in the database.
// If an event is not found in the database then it will be omitted from the list.
@ -83,6 +83,9 @@ type Database interface {
// RetireInviteEvent removes an old invite event from the database. Returns the new position of the retired invite.
// Returns an error if there was a problem communicating with the database.
RetireInviteEvent(ctx context.Context, inviteEventID string) (types.StreamPosition, error)
// AddPeek adds a new peek to our DB for a given room by a given user's device.
// Returns an error if there was a problem communicating with the database.
AddPeek(ctx context.Context, RoomID, UserID, DeviceID string) (types.StreamPosition, error)
// SetTypingTimeoutCallback sets a callback function that is called right after
// a user is removed from the typing user list due to timeout.
SetTypingTimeoutCallback(fn cache.TimeoutCallbackFn)

15
syncapi/storage/shared/syncserver.go
View file

@ -39,6 +39,7 @@ type Database struct {
DB *sql.DB
Writer sqlutil.Writer
Invites tables.Invites
Peeks tables.Peeks
AccountData tables.AccountData
OutputEvents tables.Events
Topology tables.Topology
@ -120,7 +121,7 @@ func (d *Database) AllJoinedUsersInRooms(ctx context.Context) (map[string][]stri
return d.CurrentRoomState.SelectJoinedUsers(ctx)
}
func (d *Database) AllPeekingDevicesInRooms(ctx context.Context) (map[string][]PeekingDevice, error) {
func (d *Database) AllPeekingDevicesInRooms(ctx context.Context) (map[string][]types.PeekingDevice, error) {
return d.Peeks.SelectPeekingDevices(ctx)
}
@ -198,7 +199,7 @@ func (d *Database) AddPeek(
ctx context.Context, roomID, userID, deviceID string,
) (sp types.StreamPosition, err error) {
_ = d.Writer.Do(nil, nil, func(_ *sql.Tx) error {
sp, err = d.Peeks.InsertPeek(ctx, nil, inviteEvent)
sp, err = d.Peeks.InsertPeek(ctx, nil, roomID, userID, deviceID)
return nil
})
return
@ -992,7 +993,7 @@ func (d *Database) getStateDeltas(
// find out which rooms this user is peeking, if any.
// We do this before joins so joins overwrite peeks
peeks, err := d.Peeks.SelectPeeks(ctx, txn, userID, device.DeviceID)
peeks, err := d.Peeks.SelectPeeks(ctx, txn, userID, device.ID)
if err != nil {
return nil, nil, err
}
@ -1006,7 +1007,7 @@ func (d *Database) getStateDeltas(
if err != nil {
return nil, nil, err
}
state[roomID] = s
state[peek.RoomID] = s
}
deltas = append(deltas, stateDelta{
@ -1017,7 +1018,7 @@ func (d *Database) getStateDeltas(
}
if len(peeks) > 0 {
err := d.Peeks.MarkPeeksAsOld(ctx, txn, userID, device.DeviceID)
err := d.Peeks.MarkPeeksAsOld(ctx, txn, userID, device.ID)
if err != nil {
return nil, nil, err
}
@ -1084,7 +1085,7 @@ func (d *Database) getStateDeltasForFullStateSync(
return nil, nil, err
}
peeks, err = d.Peeks.SelectPeeks(ctx, txn, userID, device,ID)
peeks, err := d.Peeks.SelectPeeks(ctx, txn, userID, device.ID)
if err != nil {
return nil, nil, err
}
@ -1119,7 +1120,7 @@ func (d *Database) getStateDeltasForFullStateSync(
}
if len(peeks) > 0 {
err := d.Peeks.MarkPeeksAsOld(ctx, txn, userID, device.DeviceID)
err := d.Peeks.MarkPeeksAsOld(ctx, txn, userID, device.ID)
if err != nil {
return nil, nil, err
}

28
syncapi/storage/sqlite3/peeks_table.go
View file

@ -17,13 +17,12 @@ package sqlite3
import (
"context"
"database/sql"
"encoding/json"
"time"
"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"
"github.com/matrix-org/gomatrixserverlib"
)
const peeksSchema = `
@ -49,30 +48,33 @@ const insertPeekSQL = "" +
const deletePeekSQL = "" +
"DELETE FROM syncapi_peeks WHERE room_id = $1 AND user_id = $2 and device_id = $3"
const selectPeeksSQL == "" +
const selectPeeksSQL = "" +
"SELECT room_id, new FROM syncapi_peeks WHERE user_id = $1 and device_id = $2"
const selectPeekingDevicesSQL == "" +
const selectPeekingDevicesSQL = "" +
"SELECT room_id, user_id, device_id FROM syncapi_peeks"
const markPeeksAsOldSQL == "" +
const markPeeksAsOldSQL = "" +
"UPDATE syncapi_peeks SET new=false WHERE user_id = $1 and device_id = $2"
type peekStatements struct {
db *sql.DB
streamIDStatements *streamIDStatements
insertPeekStmt *sql.Stmt
deletePeekStmt *sql.Stmt
selectPeeksStmt *sql.Stmt
selectPeekingDevicesStmt *sql.Stmt
markPeeksAsOldStmt *sql.Stmt
}
func NewSqlitePeeksTable(db *sql.DB) (tables.Peeks, error) {
func NewSqlitePeeksTable(db *sql.DB, streamID *streamIDStatements) (tables.Peeks, error) {
_, err := db.Exec(filterSchema)
if err != nil {
return nil, err
}
s := &peekStatements{
db: db,
streamIDStatements: streamID,
}
if s.insertPeekStmt, err = db.Prepare(insertPeekSQL); err != nil {
return nil, err
@ -117,7 +119,7 @@ func (s *peekStatements) DeletePeek(
func (s *peekStatements) SelectPeeks(
ctx context.Context, txn *sql.Tx, userID, deviceID string,
) (peeks []Peek, err error) {
) (peeks []types.Peek, err error) {
rows, err := sqlutil.TxStmt(txn, s.selectPeeksStmt).QueryContext(ctx, userID, deviceID)
if err != nil {
return
@ -125,8 +127,8 @@ func (s *peekStatements) SelectPeeks(
defer internal.CloseAndLogIfError(ctx, rows, "SelectPeeks: rows.close() failed")
for rows.Next() {
peek = Peek{}
if err = rows.Scan(&peek.roomId, &peek.new); err != nil {
peek := types.Peek{}
if err = rows.Scan(&peek.RoomID, &peek.New); err != nil {
return
}
peeks = append(peeks, peek)
@ -138,27 +140,27 @@ func (s *peekStatements) SelectPeeks(
func (s *peekStatements) MarkPeeksAsOld (
ctx context.Context, txn *sql.Tx, userID, deviceID string,
) (err error) {
_, err := sqlutil.TxStmt(txn, s.markPeeksAsOldStmt).ExecContext(ctx, userID, deviceID)
_, err = sqlutil.TxStmt(txn, s.markPeeksAsOldStmt).ExecContext(ctx, userID, deviceID)
return
}
func (s *peekStatements) SelectPeekingDevices(
ctx context.Context,
) (peekingDevices map[string][]PeekingDevice, err error) {
) (peekingDevices map[string][]types.PeekingDevice, err error) {
rows, err := s.selectPeekingDevicesStmt.QueryContext(ctx)
if err != nil {
return nil, err
}
defer internal.CloseAndLogIfError(ctx, rows, "SelectPeekingDevices: rows.close() failed")
result := make(map[string][]PeekingDevice)
result := make(map[string][]types.PeekingDevice)
for rows.Next() {
var roomID, userID, deviceID string
if err := rows.Scan(&roomID, &userID, &deviceID); err != nil {
return nil, err
}
devices := result[roomID]
devices = append(devices, PeekingDevice{userID, deviceID})
devices = append(devices, types.PeekingDevice{userID, deviceID})
result[roomID] = devices
}
return result, nil

5
syncapi/storage/sqlite3/syncserver.go
View file

@ -75,6 +75,10 @@ func (d *SyncServerDatasource) prepare() (err error) {
if err != nil {
return err
}
peeks, err := NewSqlitePeeksTable(d.db, &d.streamID)
if err != nil {
return err
}
topology, err := NewSqliteTopologyTable(d.db)
if err != nil {
return err
@ -95,6 +99,7 @@ func (d *SyncServerDatasource) prepare() (err error) {
DB: d.db,
Writer: sqlutil.NewExclusiveWriter(),
Invites: invites,
Peeks: peeks,
AccountData: accountData,
OutputEvents: events,
BackwardExtremities: bwExtrem,

5
syncapi/storage/tables/interface.go
View file

@ -42,8 +42,9 @@ type Invites interface {
type Peeks interface {
InsertPeek(ctx context.Context, txn *sql.Tx, roomID, userID, deviceID string) (streamPos types.StreamPosition, err error)
DeletePeek(ctx context.Context, txn *sql.Tx, roomID, userID, deviceID string) (streamPos types.StreamPosition, err error)
SelectPeeks(ctxt context.Context, txn *sql.Tx, userID, deviceID string) (peeks []string, err error)
SelectPeekingDevices((ctxt context.Context) (peekingDevices map[string][]PeekingDevice, err error)
SelectPeeks(ctxt context.Context, txn *sql.Tx, userID, deviceID string) (peeks []types.Peek, err error)
SelectPeekingDevices(ctxt context.Context) (peekingDevices map[string][]types.PeekingDevice, err error)
MarkPeeksAsOld(ctxt context.Context, txn *sql.Tx, userID, deviceID string) (err error)
}
type Events interface {