sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Remove deleted state logging lines from sync API (they are pointless)

Browse source
This commit is contained in:
Neil Alexander 2022-09-20 11:25:18 +01:00
parent e007b8038f
commit 97d7cf2232
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,6 @@ import (
"github.com/lib/pq" "github.com/lib/pq"
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
) )
const outputRoomEventsSchema = ` const outputRoomEventsSchema = `
@ -273,16 +272,6 @@ func (s *outputRoomEventsStatements) SelectStateInRange(
if err := rows.Scan(&eventID, &streamPos, &eventBytes, &excludeFromSync, &addIDs, &delIDs, &historyVisibility); err != nil { if err := rows.Scan(&eventID, &streamPos, &eventBytes, &excludeFromSync, &addIDs, &delIDs, &historyVisibility); err != nil {
return nil, nil, err return nil, nil, err
} }
// Sanity check for deleted state and whine if we see it. We don't need to do anything
// since it'll just mark the event as not being needed.
if len(addIDs) < len(delIDs) {
log.WithFields(log.Fields{
"since": r.From,
"current": r.To,
"adds": len(addIDs),
"dels": len(delIDs),
}).Warn("StateBetween: ignoring deleted state")
}
// TODO: Handle redacted events // TODO: Handle redacted events
var ev gomatrixserverlib.HeaderedEvent var ev gomatrixserverlib.HeaderedEvent

12
syncapi/storage/sqlite3/output_room_events_table.go
View file

@ -31,7 +31,6 @@ import (
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
) )
const outputRoomEventsSchema = ` const outputRoomEventsSchema = `
@ -228,17 +227,6 @@ func (s *outputRoomEventsStatements) SelectStateInRange(
return nil, nil, err return nil, nil, err
} }
// Sanity check for deleted state and whine if we see it. We don't need to do anything
// since it'll just mark the event as not being needed.
if len(addIDs) < len(delIDs) {
log.WithFields(log.Fields{
"since": r.From,
"current": r.To,
"adds": len(addIDsJSON),
"dels": len(delIDsJSON),
}).Warn("StateBetween: ignoring deleted state")
}
// TODO: Handle redacted events // TODO: Handle redacted events
var ev gomatrixserverlib.HeaderedEvent var ev gomatrixserverlib.HeaderedEvent
if err := ev.UnmarshalJSONWithEventID(eventBytes, eventID); err != nil { if err := ev.UnmarshalJSONWithEventID(eventBytes, eventID); err != nil {