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

And the filter queries

Browse source
This commit is contained in:
Neil Alexander 2022-09-28 09:59:17 +01:00
parent 4738a192b6
commit 1f4b038a6e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
syncapi/storage/postgres/filter_table.go
View file

@ -112,8 +112,14 @@ func (s *filterStatements) InsertFilter(
// This can result in a race condition when two clients try to insert the // This can result in a race condition when two clients try to insert the
// same filter and localpart at the same time, however this is not a // same filter and localpart at the same time, however this is not a
// problem as both calls will result in the same filterID // problem as both calls will result in the same filterID
<<<<<<< Updated upstream
err = sqlutil.TxStmt(txn, s.selectFilterIDByContentStmt).QueryRowContext(ctx, err = sqlutil.TxStmt(txn, s.selectFilterIDByContentStmt).QueryRowContext(ctx,
localpart, filterJSON).Scan(&existingFilterID) localpart, filterJSON).Scan(&existingFilterID)
=======
err = sqlutil.TxStmt(txn, s.selectFilterIDByContentStmt).QueryRowContext(
ctx, localpart, filterJSON,
).Scan(&existingFilterID)
>>>>>>> Stashed changes
if err != nil && err != sql.ErrNoRows { if err != nil && err != sql.ErrNoRows {
return "", err return "", err
} }

6
syncapi/storage/sqlite3/filter_table.go
View file

@ -116,8 +116,14 @@ func (s *filterStatements) InsertFilter(
// This can result in a race condition when two clients try to insert the // This can result in a race condition when two clients try to insert the
// same filter and localpart at the same time, however this is not a // same filter and localpart at the same time, however this is not a
// problem as both calls will result in the same filterID // problem as both calls will result in the same filterID
<<<<<<< Updated upstream
err = sqlutil.TxStmt(txn, s.selectFilterIDByContentStmt).QueryRowContext(ctx, err = sqlutil.TxStmt(txn, s.selectFilterIDByContentStmt).QueryRowContext(ctx,
localpart, filterJSON).Scan(&existingFilterID) localpart, filterJSON).Scan(&existingFilterID)
=======
err = sqlutil.TxStmt(txn, s.selectFilterIDByContentStmt).QueryRowContext(
ctx, localpart, filterJSON,
).Scan(&existingFilterID)
>>>>>>> Stashed changes
if err != nil && err != sql.ErrNoRows { if err != nil && err != sql.ErrNoRows {
return "", err return "", err
} }