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

Do the same over new changes that got merged

Browse source 
Signed-off-by: Kiril Vladimiroff <kiril@vladimiroff.org>
This commit is contained in:
Kiril Vladimiroff 2020-01-24 16:37:17 +02:00
parent 7abd114aa4
commit 9144f296bf
No known key found for this signature in database
GPG key ID: E8AC87A89B24A670
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
syncapi/storage/postgres/backward_extremities_table.go
View file

@ -91,6 +91,7 @@ func (s *backwardExtremitiesStatements) selectBackwardExtremitiesForRoom(
if err != nil { if err != nil {
return return
} }
defer rows.Close() // nolint: errcheck
for rows.Next() { for rows.Next() {
var eID string var eID string
@ -101,7 +102,7 @@ func (s *backwardExtremitiesStatements) selectBackwardExtremitiesForRoom(
eventIDs = append(eventIDs, eID) eventIDs = append(eventIDs, eID)
} }
return return eventIDs, rows.Err()
} }
func (s *backwardExtremitiesStatements) isBackwardExtremity( func (s *backwardExtremitiesStatements) isBackwardExtremity(

4
syncapi/storage/postgres/current_room_state_table.go
View file

@ -179,7 +179,7 @@ func (s *currentRoomStateStatements) selectRoomIDsWithMembership(
} }
result = append(result, roomID) result = append(result, roomID)
} }
return result, nil return result, rows.Err()
} }
// CurrentState returns all the current state events for the given room. // CurrentState returns all the current state events for the given room.
@ -267,7 +267,7 @@ func rowsToEvents(rows *sql.Rows) ([]gomatrixserverlib.Event, error) {
} }
result = append(result, ev) result = append(result, ev)
} }
return result, nil return result, rows.Err()
} }
func (s *currentRoomStateStatements) selectStateEvent( func (s *currentRoomStateStatements) selectStateEvent(

2
syncapi/storage/postgres/output_room_events_table.go
View file

@ -393,5 +393,5 @@ func rowsToStreamEvents(rows *sql.Rows) ([]types.StreamEvent, error) {
ExcludeFromSync: excludeFromSync, ExcludeFromSync: excludeFromSync,
}) })
} }
return result, nil return result, rows.Err()
} }

6
syncapi/storage/postgres/output_room_events_topology_table.go
View file

@ -134,6 +134,7 @@ func (s *outputRoomEventsTopologyStatements) selectEventIDsInRange(
} else if err != nil { } else if err != nil {
return return
} }
defer rows.Close() // nolint: errcheck
// Return the IDs. // Return the IDs.
var eventID string var eventID string
@ -144,7 +145,7 @@ func (s *outputRoomEventsTopologyStatements) selectEventIDsInRange(
eventIDs = append(eventIDs, eventID) eventIDs = append(eventIDs, eventID)
} }
return return eventIDs, rows.Err()
} }
// selectPositionInTopology returns the position of a given event in the // selectPositionInTopology returns the position of a given event in the
@ -176,6 +177,7 @@ func (s *outputRoomEventsTopologyStatements) selectEventIDsFromPosition(
} else if err != nil { } else if err != nil {
return return
} }
defer rows.Close() // nolint: errcheck
// Return the IDs. // Return the IDs.
var eventID string var eventID string
for rows.Next() { for rows.Next() {
@ -184,5 +186,5 @@ func (s *outputRoomEventsTopologyStatements) selectEventIDsFromPosition(
} }
eventIDs = append(eventIDs, eventID) eventIDs = append(eventIDs, eventID)
} }
return return eventIDs, rows.Err()
} }