mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-19 20:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate relay db prepare statements

Browse source
This commit is contained in:
Devon Hudson 2022-12-22 09:42:56 -07:00
parent e83068e079
commit e5feacbfc0
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
6 changed files with 36 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
federationapi/storage/postgres/assumed_offline_table.go
View file

@ -60,19 +60,12 @@ func NewPostgresAssumedOfflineTable(db *sql.DB) (s *assumedOfflineStatements, er
return return
} }
if s.insertAssumedOfflineStmt, err = db.Prepare(insertAssumedOfflineSQL); err != nil { return s, sqlutil.StatementList{
return {&s.insertAssumedOfflineStmt, insertAssumedOfflineSQL},
} {&s.selectAssumedOfflineStmt, selectAssumedOfflineSQL},
if s.selectAssumedOfflineStmt, err = db.Prepare(selectAssumedOfflineSQL); err != nil { {&s.deleteAssumedOfflineStmt, deleteAssumedOfflineSQL},
return {&s.deleteAllAssumedOfflineStmt, deleteAllAssumedOfflineSQL},
} }.Prepare(db)
if s.deleteAssumedOfflineStmt, err = db.Prepare(deleteAssumedOfflineSQL); err != nil {
return
}
if s.deleteAllAssumedOfflineStmt, err = db.Prepare(deleteAllAssumedOfflineSQL); err != nil {
return
}
return
} }
func (s *assumedOfflineStatements) InsertAssumedOffline( func (s *assumedOfflineStatements) InsertAssumedOffline(

8
federationapi/storage/sqlite3/assumed_offline_table.go
View file

@ -72,7 +72,13 @@ func NewSQLiteAssumedOfflineTable(db *sql.DB) (s *assumedOfflineStatements, err
if s.deleteAllAssumedOfflineStmt, err = db.Prepare(deleteAllAssumedOfflineSQL); err != nil { if s.deleteAllAssumedOfflineStmt, err = db.Prepare(deleteAllAssumedOfflineSQL); err != nil {
return return
} }
return
return s, sqlutil.StatementList{
{&s.insertAssumedOfflineStmt, insertAssumedOfflineSQL},
{&s.selectAssumedOfflineStmt, selectAssumedOfflineSQL},
{&s.deleteAssumedOfflineStmt, deleteAssumedOfflineSQL},
{&s.deleteAllAssumedOfflineStmt, deleteAllAssumedOfflineSQL},
}.Prepare(db)
} }
func (s *assumedOfflineStatements) InsertAssumedOffline( func (s *assumedOfflineStatements) InsertAssumedOffline(

16
relayapi/storage/postgres/relay_queue_json_table.go
View file

@ -64,16 +64,12 @@ func NewPostgresRelayQueueJSONTable(db *sql.DB) (s *relayQueueJSONStatements, er
if err != nil { if err != nil {
return return
} }
if s.insertJSONStmt, err = s.db.Prepare(insertQueueJSONSQL); err != nil {
return return s, sqlutil.StatementList{
} {&s.insertJSONStmt, insertQueueJSONSQL},
if s.deleteJSONStmt, err = s.db.Prepare(deleteQueueJSONSQL); err != nil { {&s.deleteJSONStmt, deleteQueueJSONSQL},
return {&s.selectJSONStmt, selectQueueJSONSQL},
} }.Prepare(db)
if s.selectJSONStmt, err = s.db.Prepare(selectQueueJSONSQL); err != nil {
return
}
return
} }
func (s *relayQueueJSONStatements) InsertQueueJSON( func (s *relayQueueJSONStatements) InsertQueueJSON(

20
relayapi/storage/postgres/relay_queue_table.go
View file

@ -74,19 +74,13 @@ func NewPostgresRelayQueueTable(db *sql.DB) (s *relayQueueStatements, err error)
if err != nil { if err != nil {
return return
} }
if s.insertQueueEntryStmt, err = s.db.Prepare(insertQueueEntrySQL); err != nil {
return return s, sqlutil.StatementList{
} {&s.insertQueueEntryStmt, insertQueueEntrySQL},
if s.deleteQueueEntriesStmt, err = s.db.Prepare(deleteQueueEntriesSQL); err != nil { {&s.deleteQueueEntriesStmt, deleteQueueEntriesSQL},
return {&s.selectQueueEntriesStmt, selectQueueEntriesSQL},
} {&s.selectQueueEntryCountStmt, selectQueueEntryCountSQL},
if s.selectQueueEntriesStmt, err = s.db.Prepare(selectQueueEntriesSQL); err != nil { }.Prepare(db)
return
}
if s.selectQueueEntryCountStmt, err = s.db.Prepare(selectQueueEntryCountSQL); err != nil {
return
}
return
} }
func (s *relayQueueStatements) InsertQueueEntry( func (s *relayQueueStatements) InsertQueueEntry(

8
relayapi/storage/sqlite3/relay_queue_json_table.go
View file

@ -64,10 +64,10 @@ func NewSQLiteRelayQueueJSONTable(db *sql.DB) (s *relayQueueJSONStatements, err
if err != nil { if err != nil {
return return
} }
if s.insertJSONStmt, err = db.Prepare(insertQueueJSONSQL); err != nil {
return return s, sqlutil.StatementList{
} {&s.insertJSONStmt, insertQueueJSONSQL},
return }.Prepare(db)
} }
func (s *relayQueueJSONStatements) InsertQueueJSON( func (s *relayQueueJSONStatements) InsertQueueJSON(

19
relayapi/storage/sqlite3/relay_queue_table.go
View file

@ -75,19 +75,12 @@ func NewSQLiteRelayQueueTable(db *sql.DB) (s *relayQueueStatements, err error) {
if err != nil { if err != nil {
return return
} }
if s.insertQueueEntryStmt, err = db.Prepare(insertQueueEntrySQL); err != nil {
return return s, sqlutil.StatementList{
} {&s.insertQueueEntryStmt, insertQueueEntrySQL},
//if s.deleteQueueEntriesStmt, err = db.Prepare(deleteQueueEntriesSQL); err != nil { {&s.selectQueueEntriesStmt, selectQueueEntriesSQL},
// return {&s.selectQueueEntryCountStmt, selectQueueEntryCountSQL},
//} }.Prepare(db)
if s.selectQueueEntriesStmt, err = db.Prepare(selectQueueEntriesSQL); err != nil {
return
}
if s.selectQueueEntryCountStmt, err = db.Prepare(selectQueueEntryCountSQL); err != nil {
return
}
return
} }
func (s *relayQueueStatements) InsertQueueEntry( func (s *relayQueueStatements) InsertQueueEntry(