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

Return []int64 and convert to pq.Int64Array for postgres

Browse source
This commit is contained in:
Till Faelligen 2022-05-10 15:25:40 +02:00
parent 6370966bde
commit 5141a41eb2
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/storage/postgres/events_table.go
View file

@ -268,7 +268,7 @@ func (s *eventStatements) BulkSelectStateEventByNID(
sort.Sort(tuples) sort.Sort(tuples)
eventTypeNIDArray, eventStateKeyNIDArray := tuples.TypesAndStateKeysAsArrays() eventTypeNIDArray, eventStateKeyNIDArray := tuples.TypesAndStateKeysAsArrays()
stmt := sqlutil.TxStmt(txn, s.bulkSelectStateEventByNIDStmt) stmt := sqlutil.TxStmt(txn, s.bulkSelectStateEventByNIDStmt)
rows, err := stmt.QueryContext(ctx, eventNIDsAsArray(eventNIDs), eventTypeNIDArray, eventStateKeyNIDArray) rows, err := stmt.QueryContext(ctx, eventNIDsAsArray(eventNIDs), pq.Int64Array(eventTypeNIDArray), pq.Int64Array(eventStateKeyNIDArray))
if err != nil { if err != nil {
return nil, err return nil, err
} }

7
roomserver/types/types.go
View file

@ -19,7 +19,6 @@ import (
"encoding/json" "encoding/json"
"sort" "sort"
"github.com/lib/pq"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util" "github.com/matrix-org/util"
"golang.org/x/crypto/blake2b" "golang.org/x/crypto/blake2b"
@ -112,9 +111,9 @@ func (s StateKeyTupleSorter) contains(value StateKeyTuple) bool {
// List the unique eventTypeNIDs and eventStateKeyNIDs. // List the unique eventTypeNIDs and eventStateKeyNIDs.
// Assumes that the list is sorted. // Assumes that the list is sorted.
func (s StateKeyTupleSorter) TypesAndStateKeysAsArrays() (eventTypeNIDs pq.Int64Array, eventStateKeyNIDs pq.Int64Array) { func (s StateKeyTupleSorter) TypesAndStateKeysAsArrays() (eventTypeNIDs []int64, eventStateKeyNIDs []int64) {
eventTypeNIDs = make(pq.Int64Array, len(s)) eventTypeNIDs = make([]int64, len(s))
eventStateKeyNIDs = make(pq.Int64Array, len(s)) eventStateKeyNIDs = make([]int64, len(s))
for i := range s { for i := range s {
eventTypeNIDs[i] = int64(s[i].EventTypeNID) eventTypeNIDs[i] = int64(s[i].EventTypeNID)
eventStateKeyNIDs[i] = int64(s[i].EventStateKeyNID) eventStateKeyNIDs[i] = int64(s[i].EventStateKeyNID)