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

Tweaks, debug logging

Browse source
This commit is contained in:
Neil Alexander 2021-01-19 14:39:51 +00:00
parent 0142fa53cc
commit f13e546e49
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ 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"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@ -81,22 +82,11 @@ const selectMaxEventIDSQL = "" +
const updateEventJSONSQL = "" + const updateEventJSONSQL = "" +
"UPDATE syncapi_output_room_events SET headered_event_json=$1 WHERE event_id=$2" "UPDATE syncapi_output_room_events SET headered_event_json=$1 WHERE event_id=$2"
// In order for us to apply the state updates correctly, rows need to be ordered in the order they were received (id).
/*
$1 = oldPos,
$2 = newPos,
$3 = pq.StringArray(stateFilterPart.Senders),
$4 = pq.StringArray(stateFilterPart.NotSenders),
$5 = pq.StringArray(filterConvertTypeWildcardToSQL(stateFilterPart.Types)),
$6 = pq.StringArray(filterConvertTypeWildcardToSQL(stateFilterPart.NotTypes)),
$7 = stateFilterPart.ContainsURL,
$8 = stateFilterPart.Limit,
*/
const selectStateInRangeSQL = "" + const selectStateInRangeSQL = "" +
"SELECT id, headered_event_json, exclude_from_sync, add_state_ids, remove_state_ids" + "SELECT id, headered_event_json, exclude_from_sync, add_state_ids, remove_state_ids" +
" FROM syncapi_output_room_events" + " FROM syncapi_output_room_events" +
" WHERE (id > $1 AND id <= $2)" + // old/new pos " WHERE (id > $1 AND id <= $2)" +
" AND (add_state_ids IS NOT NULL OR remove_state_ids IS NOT NULL)" + " AND ((add_state_ids IS NOT NULL AND add_state_ids != '') OR (remove_state_ids IS NOT NULL AND remove_state_ids != ''))" +
" $FILTERS" " $FILTERS"
const deleteEventsForRoomSQL = "" + const deleteEventsForRoomSQL = "" +
@ -180,10 +170,13 @@ func (s *outputRoomEventsStatements) prepareWithFilters(
} }
filters += " ORDER BY id " + order filters += " ORDER BY id " + order
filters += fmt.Sprintf(" LIMIT $%d", offset+1) filters += fmt.Sprintf(" LIMIT $%d", offset+1)
params = append(params, limit) params = append(params, limit)
query = strings.Replace(query, " $FILTERS", filters, 1) query = strings.Replace(query, " $FILTERS", filters, 1)
logrus.Infof("QUERY: %s", query)
logrus.Infof("PARAMS: %v", params)
stmt, err := s.db.Prepare(query) stmt, err := s.db.Prepare(query)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("s.db.Prepare: %w", err) return nil, nil, fmt.Errorf("s.db.Prepare: %w", err)
@ -333,11 +326,13 @@ func (s *outputRoomEventsStatements) InsertEvent(
return 0, err return 0, err
} }
addStateJSON, err := json.Marshal(addState) var addStateJSON, removeStateJSON []byte
if err != nil { if len(addState) > 0 {
return 0, err addStateJSON, err = json.Marshal(addState)
}
if len(removeState) > 0 {
removeStateJSON, err = json.Marshal(removeState)
} }
removeStateJSON, err := json.Marshal(removeState)
if err != nil { if err != nil {
return 0, err return 0, err
} }