mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-13 18:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reverted rename selectRecentEvents => selectRoomRecentEvents

Browse source 
Signed-off-by: Thibaut CHARLES cromfr@gmail.com
This commit is contained in:
Crom (Thibaut CHARLES) 2018-01-18 02:18:11 +01:00
parent 38767efff0
commit c3e87f19be
No known key found for this signature in database
GPG key ID: 45A3D5F880B9E6D0
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go
View file

@ -75,7 +75,7 @@ const insertEventSQL = "" +
const selectEventsSQL = "" + const selectEventsSQL = "" +
"SELECT id, event_json FROM syncapi_output_room_events WHERE event_id = ANY($1)" "SELECT id, event_json FROM syncapi_output_room_events WHERE event_id = ANY($1)"
const selectRoomRecentEventsSQL = "" + const selectRecentEventsSQL = "" +
"SELECT id, event_json, device_id, transaction_id FROM syncapi_output_room_events" + "SELECT id, event_json, device_id, transaction_id FROM syncapi_output_room_events" +
" WHERE room_id=$1 " + " WHERE room_id=$1 " +
" AND id > $2 AND id <= $3" + " AND id > $2 AND id <= $3" +
@ -100,7 +100,7 @@ type outputRoomEventsStatements struct {
insertEventStmt *sql.Stmt insertEventStmt *sql.Stmt
selectEventsStmt *sql.Stmt selectEventsStmt *sql.Stmt
selectMaxEventIDStmt *sql.Stmt selectMaxEventIDStmt *sql.Stmt
selectRoomRecentEventsStmt *sql.Stmt selectRecentEventsStmt *sql.Stmt
selectStateInRangeStmt *sql.Stmt selectStateInRangeStmt *sql.Stmt
} }
@ -118,7 +118,7 @@ func (s *outputRoomEventsStatements) prepare(db *sql.DB) (err error) {
if s.selectMaxEventIDStmt, err = db.Prepare(selectMaxEventIDSQL); err != nil { if s.selectMaxEventIDStmt, err = db.Prepare(selectMaxEventIDSQL); err != nil {
return return
} }
if s.selectRoomRecentEventsStmt, err = db.Prepare(selectRoomRecentEventsSQL); err != nil { if s.selectRecentEventsStmt, err = db.Prepare(selectRecentEventsSQL); err != nil {
return return
} }
if s.selectStateInRangeStmt, err = db.Prepare(selectStateInRangeSQL); err != nil { if s.selectStateInRangeStmt, err = db.Prepare(selectStateInRangeSQL); err != nil {
@ -247,12 +247,12 @@ func (s *outputRoomEventsStatements) insertEvent(
return return
} }
func (s *outputRoomEventsStatements) selectRoomRecentEvents( func (s *outputRoomEventsStatements) selectRecentEvents(
ctx context.Context, txn *sql.Tx, ctx context.Context, txn *sql.Tx,
roomID string, fromPos, toPos types.StreamPosition, timelineFilter *gomatrix.FilterPart, roomID string, fromPos, toPos types.StreamPosition, timelineFilter *gomatrix.FilterPart,
) ([]streamEvent, bool, error) { ) ([]streamEvent, bool, error) {
stmt := common.TxStmt(txn, s.selectRoomRecentEventsStmt) stmt := common.TxStmt(txn, s.selectRecentEventsStmt)
rows, err := stmt.QueryContext(ctx, roomID, fromPos, toPos, rows, err := stmt.QueryContext(ctx, roomID, fromPos, toPos,
pq.StringArray(timelineFilter.Senders), pq.StringArray(timelineFilter.Senders),
pq.StringArray(timelineFilter.NotSenders), pq.StringArray(timelineFilter.NotSenders),

4
src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
View file

@ -304,7 +304,7 @@ func (d *SyncServerDatabase) CompleteSync(
if !isRoomFiltered(roomID, nil, &filter.Room.Timeline) { if !isRoomFiltered(roomID, nil, &filter.Room.Timeline) {
var recentStreamEvents []streamEvent var recentStreamEvents []streamEvent
var limited bool var limited bool
recentStreamEvents, limited, err = d.events.selectRoomRecentEvents( recentStreamEvents, limited, err = d.events.selectRecentEvents(
ctx, txn, roomID, posFrom, posTo, &filter.Room.Timeline) ctx, txn, roomID, posFrom, posTo, &filter.Room.Timeline)
if err != nil { if err != nil {
return nil, err return nil, err
@ -447,7 +447,7 @@ func (d *SyncServerDatabase) addRoomDeltaToResponse(
// This is all "okay" assuming history_visibility == "shared" which it is by default. // This is all "okay" assuming history_visibility == "shared" which it is by default.
endPos = delta.membershipPos endPos = delta.membershipPos
} }
recentStreamEvents, limited, err := d.events.selectRoomRecentEvents( recentStreamEvents, limited, err := d.events.selectRecentEvents(
ctx, txn, delta.roomID, fromPos, endPos, &filter.Room.Timeline, ctx, txn, delta.roomID, fromPos, endPos, &filter.Room.Timeline,
) )
if err != nil { if err != nil {