hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check if there are more events to send before sleeping

Browse source
This commit is contained in:
Andrew Morgan 2018-06-11 15:51:00 +01:00
parent 7aa45b30ff
commit bc2ea24445
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/github.com/matrix-org/dendrite/appservice/storage/appservice_events_table.go
View file

@ -50,8 +50,8 @@ CREATE INDEX IF NOT EXISTS appservice_events_as_id ON appservice_events(as_id);
`
const selectEventsByApplicationServiceIDSQL = "" +
"SELECT id, event_id, origin_server_ts, room_id, type, sender, event_content FROM appservice_events " +
"WHERE as_id = $1 ORDER BY id ASC LIMIT $2"
"SELECT id, event_id, origin_server_ts, room_id, type, sender, event_content, COUNT(id) OVER() AS full_count " +
"FROM appservice_events WHERE as_id = $1 ORDER BY id ASC LIMIT $2"
const countEventsByApplicationServiceIDSQL = "" +
"SELECT COUNT(event_id) FROM appservice_events WHERE as_id = $1"
@ -95,19 +95,21 @@ func (s *eventsStatements) prepare(db *sql.DB) (err error) {
// selectEventsByApplicationServiceID takes in an application service ID and
// returns a slice of events that need to be sent to that application service,
// as well as an int later used to remove these same events from the database
// once successfully sent to an application service.
// once successfully sent to an application service. The total event count is
// used by a worker to determine if more events need to be pulled from the DB
// later.
func (s *eventsStatements) selectEventsByApplicationServiceID(
ctx context.Context,
applicationServiceID string,
limit int,
) (
maxID int,
maxID, totalEvents int,
events []gomatrixserverlib.ApplicationServiceEvent,
err error,
) {
eventRows, err := s.selectEventsByApplicationServiceIDStmt.QueryContext(ctx, applicationServiceID, limit)
if err != nil {
return 0, nil, err
return 0, 0, nil, err
}
defer func() {
err = eventRows.Close()
@ -130,9 +132,10 @@ func (s *eventsStatements) selectEventsByApplicationServiceID(
&event.Type,
&event.UserID,
&eventContent,
&totalEvents,
)
if err != nil {
return 0, nil, err
return 0, 0, nil, err
}
if eventContent.Valid {
event.Content = gomatrixserverlib.RawJSON(eventContent.String)

2
src/github.com/matrix-org/dendrite/appservice/storage/storage.go
View file

@ -67,7 +67,7 @@ func (d *Database) GetEventsWithAppServiceID(
ctx context.Context,
appServiceID string,
limit int,
) (int, []gomatrixserverlib.ApplicationServiceEvent, error) {
) (int, int, []gomatrixserverlib.ApplicationServiceEvent, error) {
return d.events.selectEventsByApplicationServiceID(ctx, appServiceID, limit)
}

8
src/github.com/matrix-org/dendrite/appservice/workers/transaction_scheduler.go
View file

@ -101,7 +101,7 @@ func worker(db *storage.Database, ws types.ApplicationServiceWorkerState) {
ws.EventsReady = false
ws.Cond.L.Unlock()
maxID, events, err := db.GetEventsWithAppServiceID(ctx, ws.AppService.ID, transactionBatchSize)
maxID, totalEvents, events, err := db.GetEventsWithAppServiceID(ctx, ws.AppService.ID, transactionBatchSize)
if err != nil {
log.WithError(err).Errorf("appservice %s worker unable to read queued events from DB",
ws.AppService.ID)
@ -146,7 +146,11 @@ func worker(db *storage.Database, ws types.ApplicationServiceWorkerState) {
ws.AppService.ID)
return
}
waitForEvents(&ws)
// Only wait for more events once we've sent all the events in the database
if totalEvents <= transactionBatchSize {
waitForEvents(&ws)
}
}
}