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

Revert "Don't leak timeline after leaving room"

Browse source 
This reverts commit e3068f4c20.
This commit is contained in:
Neil Alexander 2021-01-20 14:41:40 +00:00
parent e3068f4c20
commit e114744dcb
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
7 changed files with 29 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

31
syncapi/storage/sqlite3/output_room_events_table.go
View file

@ -90,19 +90,14 @@ const selectStateInRangeSQL = "" +
const deleteEventsForRoomSQL = "" +
"DELETE FROM syncapi_output_room_events WHERE room_id = $1"
const selectPositionInStreamSQL = "" +
"SELECT id FROM syncapi_output_room_events" +
" WHERE event_id = $1"
type outputRoomEventsStatements struct {
db *sql.DB
streamIDStatements *streamIDStatements
insertEventStmt *sql.Stmt
selectEventsStmt *sql.Stmt
selectMaxEventIDStmt *sql.Stmt
updateEventJSONStmt *sql.Stmt
deleteEventsForRoomStmt *sql.Stmt
selectPositionInStreamStmt *sql.Stmt
db *sql.DB
streamIDStatements *streamIDStatements
insertEventStmt *sql.Stmt
selectEventsStmt *sql.Stmt
selectMaxEventIDStmt *sql.Stmt
updateEventJSONStmt *sql.Stmt
deleteEventsForRoomStmt *sql.Stmt
}
func NewSqliteEventsTable(db *sql.DB, streamID *streamIDStatements) (tables.Events, error) {
@ -129,9 +124,6 @@ func NewSqliteEventsTable(db *sql.DB, streamID *streamIDStatements) (tables.Even
if s.deleteEventsForRoomStmt, err = db.Prepare(deleteEventsForRoomSQL); err != nil {
return nil, err
}
if s.selectPositionInStreamStmt, err = db.Prepare(selectPositionInStreamSQL); err != nil {
return nil, err
}
return s, nil
}
@ -432,15 +424,6 @@ func (s *outputRoomEventsStatements) DeleteEventsForRoom(
return err
}
// SelectPositionInStream returns the position of a given event in the
// global stream topology.
func (s *outputRoomEventsStatements) SelectPositionInStream(
ctx context.Context, txn *sql.Tx, eventID string,
) (pos types.StreamPosition, err error) {
err = s.selectPositionInStreamStmt.QueryRowContext(ctx, eventID).Scan(&pos)
return
}
func rowsToStreamEvents(rows *sql.Rows) ([]types.StreamEvent, error) {
var result []types.StreamEvent
for rows.Next() {