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

Revert "Fix issue where the EventReferenceSHA256 is not set"

Browse source 
This reverts commit 8ae34c4e5f.
This commit is contained in:
Till Faelligen 2022-05-09 14:09:36 +02:00
parent 7358de6638
commit 596c987a81
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -421,13 +421,11 @@ func (s *eventStatements) BulkSelectEventReference(
defer internal.CloseAndLogIfError(ctx, rows, "bulkSelectEventReference: rows.close() failed")
results := make([]gomatrixserverlib.EventReference, len(eventNIDs))
i := 0
var eventSHA []byte
for ; rows.Next(); i++ {
result := &results[i]
if err = rows.Scan(&result.EventID, &eventSHA); err != nil {
if err = rows.Scan(&result.EventID, &result.EventSHA256); err != nil {
return nil, err
}
result.EventSHA256 = eventSHA
}
if err = rows.Err(); err != nil {
return nil, err

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

@ -457,13 +457,11 @@ func (s *eventStatements) BulkSelectEventReference(
defer internal.CloseAndLogIfError(ctx, rows, "bulkSelectEventReference: rows.close() failed")
results := make([]gomatrixserverlib.EventReference, len(eventNIDs))
i := 0
var eventSHA []byte
for ; rows.Next(); i++ {
result := &results[i]
if err = rows.Scan(&result.EventID, &eventSHA); err != nil {
if err = rows.Scan(&result.EventID, &result.EventSHA256); err != nil {
return nil, err
}
result.EventSHA256 = eventSHA
}
if i != len(eventNIDs) {
return nil, fmt.Errorf("storage: event NIDs missing from the database (%d != %d)", i, len(eventNIDs))