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

Fix a couple of transaction things, fix client API

Browse source
This commit is contained in:
Neil Alexander 2020-05-28 17:25:28 +01:00
parent bf5df4f438
commit 1e3ad88172
7 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/sendtodevice.go
View file

@ -43,7 +43,7 @@ func SendToDevice(
var httpReq struct { var httpReq struct {
Messages map[string]map[string]json.RawMessage `json:"messages"` Messages map[string]map[string]json.RawMessage `json:"messages"`
} }
resErr := httputil.UnmarshalJSONRequest(req, &req) resErr := httputil.UnmarshalJSONRequest(req, &httpReq)
if resErr != nil { if resErr != nil {
return *resErr return *resErr
} }

2
eduserver/input/input.go
View file

@ -117,7 +117,7 @@ func (t *EDUServerInputAPI) sendToDeviceEvent(ise *api.InputSendToDeviceEvent) e
"user_id": ise.UserID, "user_id": ise.UserID,
"device_id": ise.DeviceID, "device_id": ise.DeviceID,
"event_type": ise.EventType, "event_type": ise.EventType,
}).Error("sendToDevice") }).Info("handling send-to-device message")
eventJSON, err := json.Marshal(ote) eventJSON, err := json.Marshal(ote)
if err != nil { if err != nil {

6
syncapi/storage/postgres/send_to_device_table.go
View file

@ -98,14 +98,14 @@ func NewPostgresSendToDeviceTable(db *sql.DB) (tables.SendToDevice, error) {
func (s *sendToDeviceStatements) InsertSendToDeviceMessage( func (s *sendToDeviceStatements) InsertSendToDeviceMessage(
ctx context.Context, txn *sql.Tx, userID, deviceID, eventType, content string, ctx context.Context, txn *sql.Tx, userID, deviceID, eventType, content string,
) (err error) { ) (err error) {
_, err = txn.Stmt(s.insertSendToDeviceMessageStmt).ExecContext(ctx, userID, deviceID, eventType, content) _, err = internal.TxStmt(txn, s.insertSendToDeviceMessageStmt).ExecContext(ctx, userID, deviceID, eventType, content)
return return
} }
func (s *sendToDeviceStatements) SelectSendToDeviceMessages( func (s *sendToDeviceStatements) SelectSendToDeviceMessages(
ctx context.Context, userID, deviceID string, ctx context.Context, txn *sql.Tx, userID, deviceID string,
) (events []types.SendToDeviceEvent, err error) { ) (events []types.SendToDeviceEvent, err error) {
rows, err := s.selectSendToDeviceMessagesStmt.QueryContext(ctx, userID, deviceID) rows, err := internal.TxStmt(txn, s.selectSendToDeviceMessagesStmt).QueryContext(ctx, userID, deviceID)
if err != nil { if err != nil {
return return
} }

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

@ -1057,7 +1057,7 @@ func (d *Database) SendToDeviceUpdatesForSync(
) (events []types.SendToDeviceEvent, err error) { ) (events []types.SendToDeviceEvent, err error) {
err = internal.WithTransaction(d.DB, func(txn *sql.Tx) error { err = internal.WithTransaction(d.DB, func(txn *sql.Tx) error {
// First of all, get our send-to-device updates for this user. // First of all, get our send-to-device updates for this user.
events, err := d.SendToDevice.SelectSendToDeviceMessages(ctx, userID, deviceID) events, err := d.SendToDevice.SelectSendToDeviceMessages(ctx, txn, userID, deviceID)
if err != nil { if err != nil {
return fmt.Errorf("d.SendToDevice.SelectSendToDeviceMessages: %w", err) return fmt.Errorf("d.SendToDevice.SelectSendToDeviceMessages: %w", err)
} }

6
syncapi/storage/sqlite3/send_to_device_table.go
View file

@ -88,14 +88,14 @@ func NewSqliteSendToDeviceTable(db *sql.DB) (tables.SendToDevice, error) {
func (s *sendToDeviceStatements) InsertSendToDeviceMessage( func (s *sendToDeviceStatements) InsertSendToDeviceMessage(
ctx context.Context, txn *sql.Tx, userID, deviceID, eventType, content string, ctx context.Context, txn *sql.Tx, userID, deviceID, eventType, content string,
) (err error) { ) (err error) {
_, err = txn.Stmt(s.insertSendToDeviceMessageStmt).ExecContext(ctx, userID, deviceID, eventType, content) _, err = internal.TxStmt(txn, s.insertSendToDeviceMessageStmt).ExecContext(ctx, userID, deviceID, eventType, content)
return return
} }
func (s *sendToDeviceStatements) SelectSendToDeviceMessages( func (s *sendToDeviceStatements) SelectSendToDeviceMessages(
ctx context.Context, userID, deviceID string, ctx context.Context, txn *sql.Tx, userID, deviceID string,
) (events []types.SendToDeviceEvent, err error) { ) (events []types.SendToDeviceEvent, err error) {
rows, err := s.selectSendToDeviceMessagesStmt.QueryContext(ctx, userID, deviceID) rows, err := internal.TxStmt(txn, s.selectSendToDeviceMessagesStmt).QueryContext(ctx, userID, deviceID)
if err != nil { if err != nil {
return return
} }

11
syncapi/storage/storage_test.go
View file

@ -512,6 +512,17 @@ func TestGetEventsInRangeWithEventsInsertedLikeBackfill(t *testing.T) {
} }
} }
func TestSendToDeviceBehaviour(t *testing.T) {
//t.Parallel()
db := MustCreateDatabase(t)
initial, err := db.SendToDeviceUpdatesForSync(ctx, "alice", "one", types.NewStreamToken(0, 0))
if err != nil {
t.Fatal(err)
}
fmt.Println("Initial:", initial)
}
func assertEventsEqual(t *testing.T, msg string, checkRoomID bool, gots []gomatrixserverlib.ClientEvent, wants []gomatrixserverlib.HeaderedEvent) { func assertEventsEqual(t *testing.T, msg string, checkRoomID bool, gots []gomatrixserverlib.ClientEvent, wants []gomatrixserverlib.HeaderedEvent) {
if len(gots) != len(wants) { if len(gots) != len(wants) {
t.Fatalf("%s response returned %d events, want %d", msg, len(gots), len(wants)) t.Fatalf("%s response returned %d events, want %d", msg, len(gots), len(wants))

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

@ -97,7 +97,7 @@ type BackwardsExtremities interface {
type SendToDevice interface { type SendToDevice interface {
InsertSendToDeviceMessage(ctx context.Context, txn *sql.Tx, userID, deviceID, eventType, content string) (err error) InsertSendToDeviceMessage(ctx context.Context, txn *sql.Tx, userID, deviceID, eventType, content string) (err error)
SelectSendToDeviceMessages(ctx context.Context, userID, deviceID string) (events []types.SendToDeviceEvent, err error) SelectSendToDeviceMessages(ctx context.Context, txn *sql.Tx, userID, deviceID string) (events []types.SendToDeviceEvent, err error)
UpdateSentSendToDeviceMessages(ctx context.Context, txn *sql.Tx, token string, nids []types.SendToDeviceNID) (err error) UpdateSentSendToDeviceMessages(ctx context.Context, txn *sql.Tx, token string, nids []types.SendToDeviceNID) (err error)
DeleteSendToDeviceMessages(ctx context.Context, txn *sql.Tx, nids []types.SendToDeviceNID) (err error) DeleteSendToDeviceMessages(ctx context.Context, txn *sql.Tx, nids []types.SendToDeviceNID) (err error)
} }