mirror of
https://github.com/matrix-org/dendrite
synced 2024-07-27 07:18:46 +02:00
1414922026
* sytest: Make 'Inbound federation can backfill events' pass This breaks 'Outbound federation can backfill events' because now we are returning the right number of events, which the previous test was relying on. Previously, /messages was backfilling the membership event, causing the test to pass. Now we are no longer backfilling the membership event due to the change in this commit, causing the test to fail. The test should instead be returning the membership event locally from synacpis database, but it doesn't do it fast enough, resulting in a no-op /sync response with a next_batch=s0_0 which will never pick up the local membership event when it rolls in. The test does attempt to retry, but doesn't take the new next_batch=s1_0 resulting in it missing from the /messages response. * Linting
108 lines
3.5 KiB
Go
108 lines
3.5 KiB
Go
// Copyright 2018 New Vector Ltd
|
|
//
|
|
// 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/common"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/tables"
|
|
)
|
|
|
|
const backwardExtremitiesSchema = `
|
|
-- Stores output room events received from the roomserver.
|
|
CREATE TABLE IF NOT EXISTS syncapi_backward_extremities (
|
|
-- The 'room_id' key for the event.
|
|
room_id TEXT NOT NULL,
|
|
-- The event ID for the last known event. This is the backwards extremity.
|
|
event_id TEXT NOT NULL,
|
|
-- The prev_events for the last known event. This is used to update extremities.
|
|
prev_event_id TEXT NOT NULL,
|
|
PRIMARY KEY(room_id, event_id, prev_event_id)
|
|
);
|
|
`
|
|
|
|
const insertBackwardExtremitySQL = "" +
|
|
"INSERT INTO syncapi_backward_extremities (room_id, event_id, prev_event_id)" +
|
|
" VALUES ($1, $2, $3)" +
|
|
" ON CONFLICT (room_id, event_id, prev_event_id) DO NOTHING"
|
|
|
|
const selectBackwardExtremitiesForRoomSQL = "" +
|
|
"SELECT event_id, prev_event_id FROM syncapi_backward_extremities WHERE room_id = $1"
|
|
|
|
const deleteBackwardExtremitySQL = "" +
|
|
"DELETE FROM syncapi_backward_extremities WHERE room_id = $1 AND prev_event_id = $2"
|
|
|
|
type backwardExtremitiesStatements struct {
|
|
insertBackwardExtremityStmt *sql.Stmt
|
|
selectBackwardExtremitiesForRoomStmt *sql.Stmt
|
|
deleteBackwardExtremityStmt *sql.Stmt
|
|
}
|
|
|
|
func NewSqliteBackwardsExtremitiesTable(db *sql.DB) (tables.BackwardsExtremities, error) {
|
|
s := &backwardExtremitiesStatements{}
|
|
_, err := db.Exec(backwardExtremitiesSchema)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if s.insertBackwardExtremityStmt, err = db.Prepare(insertBackwardExtremitySQL); err != nil {
|
|
return nil, err
|
|
}
|
|
if s.selectBackwardExtremitiesForRoomStmt, err = db.Prepare(selectBackwardExtremitiesForRoomSQL); err != nil {
|
|
return nil, err
|
|
}
|
|
if s.deleteBackwardExtremityStmt, err = db.Prepare(deleteBackwardExtremitySQL); err != nil {
|
|
return nil, err
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
func (s *backwardExtremitiesStatements) InsertsBackwardExtremity(
|
|
ctx context.Context, txn *sql.Tx, roomID, eventID string, prevEventID string,
|
|
) (err error) {
|
|
_, err = txn.Stmt(s.insertBackwardExtremityStmt).ExecContext(ctx, roomID, eventID, prevEventID)
|
|
return
|
|
}
|
|
|
|
func (s *backwardExtremitiesStatements) SelectBackwardExtremitiesForRoom(
|
|
ctx context.Context, roomID string,
|
|
) (bwExtrems map[string][]string, err error) {
|
|
rows, err := s.selectBackwardExtremitiesForRoomStmt.QueryContext(ctx, roomID)
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer common.CloseAndLogIfError(ctx, rows, "selectBackwardExtremitiesForRoom: rows.close() failed")
|
|
|
|
bwExtrems = make(map[string][]string)
|
|
for rows.Next() {
|
|
var eID string
|
|
var prevEventID string
|
|
if err = rows.Scan(&eID, &prevEventID); err != nil {
|
|
return
|
|
}
|
|
bwExtrems[eID] = append(bwExtrems[eID], prevEventID)
|
|
}
|
|
|
|
return bwExtrems, rows.Err()
|
|
}
|
|
|
|
func (s *backwardExtremitiesStatements) DeleteBackwardExtremity(
|
|
ctx context.Context, txn *sql.Tx, roomID, knownEventID string,
|
|
) (err error) {
|
|
_, err = txn.Stmt(s.deleteBackwardExtremityStmt).ExecContext(ctx, roomID, knownEventID)
|
|
return
|
|
}
|