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

s/IDID/ID/

Browse source
This commit is contained in:
Mark Haines 2017-02-09 16:27:42 +00:00
parent 027b867374
commit d59db7e238
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
View file

@ -18,7 +18,7 @@ type statements struct {
insertRoomNIDStmt *sql.Stmt insertRoomNIDStmt *sql.Stmt
selectRoomNIDStmt *sql.Stmt selectRoomNIDStmt *sql.Stmt
insertEventStmt *sql.Stmt insertEventStmt *sql.Stmt
bulkSelectStateEventByIDIDStmt *sql.Stmt bulkSelectStateEventByIDStmt *sql.Stmt
insertEventJSONStmt *sql.Stmt insertEventJSONStmt *sql.Stmt
bulkSelectEventJSONStmt *sql.Stmt bulkSelectEventJSONStmt *sql.Stmt
} }
@ -356,7 +356,7 @@ const insertEventSQL = "" +
// Bulk lookup of events by string ID. // Bulk lookup of events by string ID.
// Sort by the numeric IDs for event type and state key. // Sort by the numeric IDs for event type and state key.
// This means we can use binary search to lookup entries by type and state key. // This means we can use binary search to lookup entries by type and state key.
const bulkSelectStateEventByIDIDSQL = "" + const bulkSelectStateEventByIDSQL = "" +
"SELECT event_type_nid, event_state_key_nid, event_nid FROM events" + "SELECT event_type_nid, event_state_key_nid, event_nid FROM events" +
" WHERE event_id = ANY($1)" + " WHERE event_id = ANY($1)" +
" ORDER BY event_type_nid, event_state_key_nid ASC" " ORDER BY event_type_nid, event_state_key_nid ASC"
@ -369,7 +369,7 @@ func (s *statements) prepareEvents(db *sql.DB) (err error) {
if s.insertEventStmt, err = db.Prepare(insertEventSQL); err != nil { if s.insertEventStmt, err = db.Prepare(insertEventSQL); err != nil {
return return
} }
if s.bulkSelectStateEventByIDIDStmt, err = db.Prepare(bulkSelectStateEventByIDIDSQL); err != nil { if s.bulkSelectStateEventByIDStmt, err = db.Prepare(bulkSelectStateEventByIDSQL); err != nil {
return return
} }
return return
@ -388,8 +388,8 @@ func (s *statements) insertEvent(
return return
} }
func (s *statements) bulkSelectStateEventByIDID(eventIDs []string) ([]types.StateEntry, error) { func (s *statements) bulkSelectStateEventByID(eventIDs []string) ([]types.StateEntry, error) {
rows, err := s.bulkSelectStateEventByIDIDStmt.Query(pq.StringArray(eventIDs)) rows, err := s.bulkSelectStateEventByIDStmt.Query(pq.StringArray(eventIDs))
if err != nil { if err != nil {
return nil, err return nil, err
} }

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

@ -119,7 +119,7 @@ func (d *Database) assignStateKeyNID(eventStateKey string) (int64, error) {
// StateEntriesForEventIDs implements input.EventDatabase // StateEntriesForEventIDs implements input.EventDatabase
func (d *Database) StateEntriesForEventIDs(eventIDs []string) ([]types.StateEntry, error) { func (d *Database) StateEntriesForEventIDs(eventIDs []string) ([]types.StateEntry, error) {
return d.statements.bulkSelectStateEventByIDID(eventIDs) return d.statements.bulkSelectStateEventByID(eventIDs)
} }
// EventStateKeyNIDs implements input.EventDatabase // EventStateKeyNIDs implements input.EventDatabase