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

Track partition offsets and only log unsafe for non-selects

Browse source
This commit is contained in:
Kegan Dougal 2020-09-01 19:17:01 +01:00
parent bfecc8e0e9
commit 7bf2a27319
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/sqlutil/trace.go
View file

@ -53,7 +53,7 @@ func (in *traceInterceptor) StmtQueryContext(ctx context.Context, stmt driver.St
safe = w.Safe() safe = w.Safe()
} }
} }
if safe != "" { if safe != "" && !strings.HasPrefix(query, "SELECT ") {
logrus.Infof("unsafe: %s -- %s", safe, query) logrus.Infof("unsafe: %s -- %s", safe, query)
} }
@ -75,7 +75,7 @@ func (in *traceInterceptor) StmtExecContext(ctx context.Context, stmt driver.Stm
safe = w.Safe() safe = w.Safe()
} }
} }
if safe != "" { if safe != "" && !strings.HasPrefix(query, "SELECT ") {
logrus.Infof("unsafe: %s -- %s", safe, query) logrus.Infof("unsafe: %s -- %s", safe, query)
} }

13
syncapi/storage/sqlite3/syncserver.go
View file

@ -258,3 +258,16 @@ func (d *SyncServerDatasource) PutFilter(ctx context.Context, localpart string,
func (d *SyncServerDatasource) RedactEvent(ctx context.Context, redactedEventID string, redactedBecause *gomatrixserverlib.HeaderedEvent) error { func (d *SyncServerDatasource) RedactEvent(ctx context.Context, redactedEventID string, redactedBecause *gomatrixserverlib.HeaderedEvent) error {
return d.Database.RedactEvent(d.dbctx, redactedEventID, redactedBecause) return d.Database.RedactEvent(d.dbctx, redactedEventID, redactedBecause)
} }
func (d *SyncServerDatasource) PartitionOffsets(
ctx context.Context, topic string,
) ([]sqlutil.PartitionOffset, error) {
return d.PartitionOffsetStatements.PartitionOffsets(d.dbctx, topic)
}
// SetPartitionOffset implements PartitionStorer
func (d *SyncServerDatasource) SetPartitionOffset(
ctx context.Context, topic string, partition int32, offset int64,
) error {
return d.PartitionOffsetStatements.SetPartitionOffset(d.dbctx, topic, partition, offset)
}