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

Move variable declarations

Browse source
This commit is contained in:
Till Faelligen 2022-05-09 16:53:43 +02:00
parent 3b9af16275
commit fe3f4455c8
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
roomserver/storage/postgres/membership_table.go
View file

@ -160,12 +160,12 @@ type membershipStatements struct {
selectServerInRoomStmt *sql.Stmt selectServerInRoomStmt *sql.Stmt
} }
func createMembershipTable(db *sql.DB) error { func CreateMembershipTable(db *sql.DB) error {
_, err := db.Exec(membershipSchema) _, err := db.Exec(membershipSchema)
return err return err
} }
func prepareMembershipTable(db *sql.DB) (tables.Membership, error) { func PrepareMembershipTable(db *sql.DB) (tables.Membership, error) {
s := &membershipStatements{} s := &membershipStatements{}
return s, sqlutil.StatementList{ return s, sqlutil.StatementList{
@ -234,8 +234,8 @@ func (s *membershipStatements) SelectMembershipsFromRoom(
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectMembershipsFromRoom: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectMembershipsFromRoom: rows.close() failed")
var eNID types.EventNID
for rows.Next() { for rows.Next() {
var eNID types.EventNID
if err = rows.Scan(&eNID); err != nil { if err = rows.Scan(&eNID); err != nil {
return return
} }
@ -262,8 +262,8 @@ func (s *membershipStatements) SelectMembershipsFromRoomAndMembership(
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectMembershipsFromRoomAndMembership: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectMembershipsFromRoomAndMembership: rows.close() failed")
var eNID types.EventNID
for rows.Next() { for rows.Next() {
var eNID types.EventNID
if err = rows.Scan(&eNID); err != nil { if err = rows.Scan(&eNID); err != nil {
return return
} }
@ -298,8 +298,8 @@ func (s *membershipStatements) SelectRoomsWithMembership(
} }
defer internal.CloseAndLogIfError(ctx, rows, "SelectRoomsWithMembership: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "SelectRoomsWithMembership: rows.close() failed")
var roomNIDs []types.RoomNID var roomNIDs []types.RoomNID
var roomNID types.RoomNID
for rows.Next() { for rows.Next() {
var roomNID types.RoomNID
if err := rows.Scan(&roomNID); err != nil { if err := rows.Scan(&roomNID); err != nil {
return nil, err return nil, err
} }
@ -320,9 +320,9 @@ func (s *membershipStatements) SelectJoinedUsersSetForRooms(
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectJoinedUsersSetForRooms: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectJoinedUsersSetForRooms: rows.close() failed")
result := make(map[types.EventStateKeyNID]int) result := make(map[types.EventStateKeyNID]int)
var userID types.EventStateKeyNID
var count int
for rows.Next() { for rows.Next() {
var userID types.EventStateKeyNID
var count int
if err := rows.Scan(&userID, &count); err != nil { if err := rows.Scan(&userID, &count); err != nil {
return nil, err return nil, err
} }
@ -342,12 +342,12 @@ func (s *membershipStatements) SelectKnownUsers(
} }
result := []string{} result := []string{}
defer internal.CloseAndLogIfError(ctx, rows, "SelectKnownUsers: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "SelectKnownUsers: rows.close() failed")
var resUserID string
for rows.Next() { for rows.Next() {
var userID string if err := rows.Scan(&resUserID); err != nil {
if err := rows.Scan(&userID); err != nil {
return nil, err return nil, err
} }
result = append(result, userID) result = append(result, resUserID)
} }
return result, rows.Err() return result, rows.Err()
} }

4
roomserver/storage/postgres/storage.go
View file

@ -98,7 +98,7 @@ func (d *Database) create(db *sql.DB) error {
if err := CreateInvitesTable(db); err != nil { if err := CreateInvitesTable(db); err != nil {
return err return err
} }
if err := createMembershipTable(db); err != nil { if err := CreateMembershipTable(db); err != nil {
return err return err
} }
if err := createPublishedTable(db); err != nil { if err := createPublishedTable(db); err != nil {
@ -152,7 +152,7 @@ func (d *Database) prepare(db *sql.DB, writer sqlutil.Writer, cache caching.Room
if err != nil { if err != nil {
return err return err
} }
membership, err := prepareMembershipTable(db) membership, err := PrepareMembershipTable(db)
if err != nil { if err != nil {
return err return err
} }

20
roomserver/storage/sqlite3/membership_table.go
View file

@ -136,12 +136,12 @@ type membershipStatements struct {
selectServerInRoomStmt *sql.Stmt selectServerInRoomStmt *sql.Stmt
} }
func createMembershipTable(db *sql.DB) error { func CreateMembershipTable(db *sql.DB) error {
_, err := db.Exec(membershipSchema) _, err := db.Exec(membershipSchema)
return err return err
} }
func prepareMembershipTable(db *sql.DB) (tables.Membership, error) { func PrepareMembershipTable(db *sql.DB) (tables.Membership, error) {
s := &membershipStatements{ s := &membershipStatements{
db: db, db: db,
} }
@ -212,8 +212,8 @@ func (s *membershipStatements) SelectMembershipsFromRoom(
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectMembershipsFromRoom: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectMembershipsFromRoom: rows.close() failed")
var eNID types.EventNID
for rows.Next() { for rows.Next() {
var eNID types.EventNID
if err = rows.Scan(&eNID); err != nil { if err = rows.Scan(&eNID); err != nil {
return return
} }
@ -239,8 +239,8 @@ func (s *membershipStatements) SelectMembershipsFromRoomAndMembership(
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectMembershipsFromRoomAndMembership: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectMembershipsFromRoomAndMembership: rows.close() failed")
var eNID types.EventNID
for rows.Next() { for rows.Next() {
var eNID types.EventNID
if err = rows.Scan(&eNID); err != nil { if err = rows.Scan(&eNID); err != nil {
return return
} }
@ -275,8 +275,8 @@ func (s *membershipStatements) SelectRoomsWithMembership(
} }
defer internal.CloseAndLogIfError(ctx, rows, "SelectRoomsWithMembership: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "SelectRoomsWithMembership: rows.close() failed")
var roomNIDs []types.RoomNID var roomNIDs []types.RoomNID
var roomNID types.RoomNID
for rows.Next() { for rows.Next() {
var roomNID types.RoomNID
if err := rows.Scan(&roomNID); err != nil { if err := rows.Scan(&roomNID); err != nil {
return nil, err return nil, err
} }
@ -307,9 +307,9 @@ func (s *membershipStatements) SelectJoinedUsersSetForRooms(ctx context.Context,
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectJoinedUsersSetForRooms: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectJoinedUsersSetForRooms: rows.close() failed")
result := make(map[types.EventStateKeyNID]int) result := make(map[types.EventStateKeyNID]int)
var userID types.EventStateKeyNID
var count int
for rows.Next() { for rows.Next() {
var userID types.EventStateKeyNID
var count int
if err := rows.Scan(&userID, &count); err != nil { if err := rows.Scan(&userID, &count); err != nil {
return nil, err return nil, err
} }
@ -326,12 +326,12 @@ func (s *membershipStatements) SelectKnownUsers(ctx context.Context, txn *sql.Tx
} }
result := []string{} result := []string{}
defer internal.CloseAndLogIfError(ctx, rows, "SelectKnownUsers: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "SelectKnownUsers: rows.close() failed")
var resUserID string
for rows.Next() { for rows.Next() {
var userID string if err := rows.Scan(&resUserID); err != nil {
if err := rows.Scan(&userID); err != nil {
return nil, err return nil, err
} }
result = append(result, userID) result = append(result, resUserID)
} }
return result, rows.Err() return result, rows.Err()
} }

4
roomserver/storage/sqlite3/storage.go
View file

@ -107,7 +107,7 @@ func (d *Database) create(db *sql.DB) error {
if err := CreateInvitesTable(db); err != nil { if err := CreateInvitesTable(db); err != nil {
return err return err
} }
if err := createMembershipTable(db); err != nil { if err := CreateMembershipTable(db); err != nil {
return err return err
} }
if err := createPublishedTable(db); err != nil { if err := createPublishedTable(db); err != nil {
@ -161,7 +161,7 @@ func (d *Database) prepare(db *sql.DB, writer sqlutil.Writer, cache caching.Room
if err != nil { if err != nil {
return err return err
} }
membership, err := prepareMembershipTable(db) membership, err := PrepareMembershipTable(db)
if err != nil { if err != nil {
return err return err
} }