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

Linting

Browse source
This commit is contained in:
Kegan Dougal 2020-04-29 18:33:21 +01:00
parent 73d92fb078
commit 9cacf38049
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roomserver/query/query.go
View file

@ -277,6 +277,7 @@ func (r *RoomserverQueryAPI) QueryMembershipsForRoom(
response.JoinEvents = []gomatrixserverlib.ClientEvent{} response.JoinEvents = []gomatrixserverlib.ClientEvent{}
var events []types.Event var events []types.Event
var stateEntries []types.StateEntry
if stillInRoom { if stillInRoom {
var eventNIDs []types.EventNID var eventNIDs []types.EventNID
eventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, roomNID, request.JoinedOnly) eventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, roomNID, request.JoinedOnly)
@ -286,7 +287,7 @@ func (r *RoomserverQueryAPI) QueryMembershipsForRoom(
events, err = r.DB.Events(ctx, eventNIDs) events, err = r.DB.Events(ctx, eventNIDs)
} else { } else {
stateEntries, err := stateBeforeEvent(ctx, r.DB, membershipEventNID) stateEntries, err = stateBeforeEvent(ctx, r.DB, membershipEventNID)
if err != nil { if err != nil {
logrus.WithField("membership_event_nid", membershipEventNID).WithError(err).Error("failed to load state before event") logrus.WithField("membership_event_nid", membershipEventNID).WithError(err).Error("failed to load state before event")
return err return err

10
roomserver/storage/sqlite3/events_table.go
View file

@ -97,7 +97,6 @@ const selectRoomNIDForEventNIDSQL = "" +
type eventStatements struct { type eventStatements struct {
db *sql.DB db *sql.DB
insertEventStmt *sql.Stmt insertEventStmt *sql.Stmt
insertEventResultStmt *sql.Stmt
selectEventStmt *sql.Stmt selectEventStmt *sql.Stmt
bulkSelectStateEventByIDStmt *sql.Stmt bulkSelectStateEventByIDStmt *sql.Stmt
bulkSelectStateAtEventByIDStmt *sql.Stmt bulkSelectStateAtEventByIDStmt *sql.Stmt
@ -146,7 +145,7 @@ func (s *eventStatements) insertEvent(
referenceSHA256 []byte, referenceSHA256 []byte,
authEventNIDs []types.EventNID, authEventNIDs []types.EventNID,
depth int64, depth int64,
) (types.EventNID, types.StateSnapshotNID, error) { ) (types.EventNID, error) {
// attempt to insert: the last_row_id is the event NID // attempt to insert: the last_row_id is the event NID
insertStmt := common.TxStmt(txn, s.insertEventStmt) insertStmt := common.TxStmt(txn, s.insertEventStmt)
result, err := insertStmt.ExecContext( result, err := insertStmt.ExecContext(
@ -154,15 +153,14 @@ func (s *eventStatements) insertEvent(
eventID, referenceSHA256, eventNIDsAsArray(authEventNIDs), depth, eventID, referenceSHA256, eventNIDsAsArray(authEventNIDs), depth,
) )
if err != nil { if err != nil {
return 0, 0, err return 0, err
} }
modified, err := result.RowsAffected() modified, err := result.RowsAffected()
if modified == 0 && err == nil { if modified == 0 && err == nil {
return 0, 0, sql.ErrNoRows return 0, sql.ErrNoRows
} }
// the snapshot will always be 0 at this point
eventNID, err := result.LastInsertId() eventNID, err := result.LastInsertId()
return types.EventNID(eventNID), types.StateSnapshotNID(0), err return types.EventNID(eventNID), err
} }
func (s *eventStatements) selectEvent( func (s *eventStatements) selectEvent(

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

@ -124,7 +124,7 @@ func (d *Database) StoreEvent(
} }
} }
if eventNID, stateNID, err = d.statements.insertEvent( if eventNID, err = d.statements.insertEvent(
ctx, ctx,
txn, txn,
roomNID, roomNID,