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

Fix lock issues

Browse source
This commit is contained in:
Neil Alexander 2021-01-19 17:00:21 +00:00
parent 6959339e1f
commit e3c625b5ea
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
syncapi/storage/sqlite3/current_room_state_table.go
View file

@ -190,7 +190,7 @@ func (s *currentRoomStateStatements) SelectCurrentState(
return nil, fmt.Errorf("s.prepareWithFilters: %w", err) 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 { if err != nil {
return nil, err return nil, err
} }

4
syncapi/storage/sqlite3/filtering.go
View file

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/sirupsen/logrus"
) )
// prepareWithFilters returns a prepared statement with the // prepareWithFilters returns a prepared statement with the
@ -52,9 +51,6 @@ func prepareWithFilters(
query += fmt.Sprintf(" LIMIT $%d", offset+1) query += fmt.Sprintf(" LIMIT $%d", offset+1)
params = append(params, limit) params = append(params, limit)
logrus.Infof("QUERY: %s", query)
logrus.Infof("PARAMS: %v", params)
stmt, err := db.Prepare(query) stmt, err := db.Prepare(query)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("s.db.Prepare: %w", err) return nil, nil, fmt.Errorf("s.db.Prepare: %w", err)

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

@ -156,7 +156,7 @@ func (s *outputRoomEventsStatements) SelectStateInRange(
return nil, nil, fmt.Errorf("s.prepareWithFilters: %w", err) 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 { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -329,7 +329,7 @@ func (s *outputRoomEventsStatements) SelectRecentEvents(
return nil, false, fmt.Errorf("s.prepareWithFilters: %w", err) 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 { if err != nil {
return nil, false, err return nil, false, err
} }
@ -376,7 +376,7 @@ func (s *outputRoomEventsStatements) SelectEarlyEvents(
if err != nil { if err != nil {
return nil, fmt.Errorf("s.prepareWithFilters: %w", err) 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 { if err != nil {
return nil, err return nil, err
} }