diff --git a/syncapi/storage/sqlite3/current_room_state_table.go b/syncapi/storage/sqlite3/current_room_state_table.go index f6f0e0565..21202d2ac 100644 --- a/syncapi/storage/sqlite3/current_room_state_table.go +++ b/syncapi/storage/sqlite3/current_room_state_table.go @@ -190,7 +190,7 @@ func (s *currentRoomStateStatements) SelectCurrentState( return nil, fmt.Errorf("s.prepareWithFilters: %w", err) } - rows, err := stmt.QueryContext(ctx, params...) + rows, err := sqlutil.TxStmt(txn, stmt).QueryContext(ctx, params...) if err != nil { return nil, err } diff --git a/syncapi/storage/sqlite3/filtering.go b/syncapi/storage/sqlite3/filtering.go index 90def5f01..d8465388e 100644 --- a/syncapi/storage/sqlite3/filtering.go +++ b/syncapi/storage/sqlite3/filtering.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/sirupsen/logrus" ) // prepareWithFilters returns a prepared statement with the @@ -52,9 +51,6 @@ func prepareWithFilters( query += fmt.Sprintf(" LIMIT $%d", offset+1) params = append(params, limit) - logrus.Infof("QUERY: %s", query) - logrus.Infof("PARAMS: %v", params) - stmt, err := db.Prepare(query) if err != nil { return nil, nil, fmt.Errorf("s.db.Prepare: %w", err) diff --git a/syncapi/storage/sqlite3/output_room_events_table.go b/syncapi/storage/sqlite3/output_room_events_table.go index d02b449d0..cc48176ca 100644 --- a/syncapi/storage/sqlite3/output_room_events_table.go +++ b/syncapi/storage/sqlite3/output_room_events_table.go @@ -156,7 +156,7 @@ func (s *outputRoomEventsStatements) SelectStateInRange( return nil, nil, fmt.Errorf("s.prepareWithFilters: %w", err) } - rows, err := stmt.QueryContext(ctx, params...) + rows, err := sqlutil.TxStmt(txn, stmt).QueryContext(ctx, params...) if err != nil { return nil, nil, err } @@ -329,7 +329,7 @@ func (s *outputRoomEventsStatements) SelectRecentEvents( return nil, false, fmt.Errorf("s.prepareWithFilters: %w", err) } - rows, err := stmt.QueryContext(ctx, params...) + rows, err := sqlutil.TxStmt(txn, stmt).QueryContext(ctx, params...) if err != nil { return nil, false, err } @@ -376,7 +376,7 @@ func (s *outputRoomEventsStatements) SelectEarlyEvents( if err != nil { return nil, fmt.Errorf("s.prepareWithFilters: %w", err) } - rows, err := stmt.QueryContext(ctx, params...) + rows, err := sqlutil.TxStmt(txn, stmt).QueryContext(ctx, params...) if err != nil { return nil, err }