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

Add function for batch aliases retrieval

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-08 15:41:26 +01:00
parent 9e772402d4
commit 706be4edb6
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,14 +39,18 @@ const selectRoomIDFromAliasSQL = "" +
const selectAliasesFromRoomIDSQL = "" + const selectAliasesFromRoomIDSQL = "" +
"SELECT alias FROM roomserver_room_aliases WHERE room_id = $1" "SELECT alias FROM roomserver_room_aliases WHERE room_id = $1"
const selectAliasesFromRoomIDsSQL = "" +
"SELECT alias, room_id FROM roomserver_room_aliases WHERE room_id = ANY($1)"
const deleteRoomAliasSQL = "" + const deleteRoomAliasSQL = "" +
"DELETE FROM roomserver_room_aliases WHERE alias = $1" "DELETE FROM roomserver_room_aliases WHERE alias = $1"
type roomAliasesStatements struct { type roomAliasesStatements struct {
insertRoomAliasStmt *sql.Stmt insertRoomAliasStmt *sql.Stmt
selectRoomIDFromAliasStmt *sql.Stmt selectRoomIDFromAliasStmt *sql.Stmt
selectAliasesFromRoomIDStmt *sql.Stmt selectAliasesFromRoomIDStmt *sql.Stmt
deleteRoomAliasStmt *sql.Stmt selectAliasesFromRoomIDsStmt *sql.Stmt
deleteRoomAliasStmt *sql.Stmt
} }
func (s *roomAliasesStatements) prepare(db *sql.DB) (err error) { func (s *roomAliasesStatements) prepare(db *sql.DB) (err error) {
@ -58,6 +62,7 @@ func (s *roomAliasesStatements) prepare(db *sql.DB) (err error) {
{&s.insertRoomAliasStmt, insertRoomAliasSQL}, {&s.insertRoomAliasStmt, insertRoomAliasSQL},
{&s.selectRoomIDFromAliasStmt, selectRoomIDFromAliasSQL}, {&s.selectRoomIDFromAliasStmt, selectRoomIDFromAliasSQL},
{&s.selectAliasesFromRoomIDStmt, selectAliasesFromRoomIDSQL}, {&s.selectAliasesFromRoomIDStmt, selectAliasesFromRoomIDSQL},
{&s.selectAliasesFromRoomIDsStmt, selectAliasesFromRoomIDsSQL},
{&s.deleteRoomAliasStmt, deleteRoomAliasSQL}, {&s.deleteRoomAliasStmt, deleteRoomAliasSQL},
}.prepare(db) }.prepare(db)
} }
@ -94,6 +99,29 @@ func (s *roomAliasesStatements) selectAliasesFromRoomID(roomID string) (aliases
return return
} }
func (s *roomAliasesStatements) selectAliasesFromRoomIDs(roomIDs []string) (aliases map[string][]string, err error) {
aliases = make(map[string][]string)
rows, err := s.selectAliasesFromRoomIDsStmt.Query(roomIDs)
if err != nil {
return
}
for rows.Next() {
var alias, roomID string
if err = rows.Scan(&alias, &roomID); err != nil {
return
}
if len(aliases[roomID]) > 0 {
aliases[roomID] = append(aliases[roomID], alias)
} else {
aliases[roomID] = []string{alias}
}
}
return
}
func (s *roomAliasesStatements) deleteRoomAlias(alias string) (err error) { func (s *roomAliasesStatements) deleteRoomAlias(alias string) (err error) {
_, err = s.deleteRoomAliasStmt.Exec(alias) _, err = s.deleteRoomAliasStmt.Exec(alias)
return return

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

@ -370,6 +370,13 @@ func (d *Database) GetAliasesFromRoomID(roomID string) ([]string, error) {
return d.statements.selectAliasesFromRoomID(roomID) return d.statements.selectAliasesFromRoomID(roomID)
} }
// GetAliasesFromRoomIDs returns a map of the aliases bound to a given set of
// room IDs, ordered by room ID (ie map[roomID] = []alias)
// Returns an error if the retrieval failed
func (d *Database) GetAliasesFromRoomIDs(roomIDs []string) (map[string][]string, error) {
return d.statements.selectAliasesFromRoomIDs(roomIDs)
}
// RemoveRoomAlias implements alias.RoomserverAliasAPIDB // RemoveRoomAlias implements alias.RoomserverAliasAPIDB
func (d *Database) RemoveRoomAlias(alias string) error { func (d *Database) RemoveRoomAlias(alias string) error {
return d.statements.deleteRoomAlias(alias) return d.statements.deleteRoomAlias(alias)