aboutsummaryrefslogtreecommitdiff
path: root/syncapi/storage/shared/syncserver.go
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-05-13 17:28:42 +0100
committerGitHub <noreply@github.com>2020-05-13 17:28:42 +0100
commita25d477cdb8f1ba49b3b5e9d931f808ae45b4853 (patch)
tree3f61860296096112f6993c68233a4b71673ff4ca /syncapi/storage/shared/syncserver.go
parentbdddd83753e31c69e99a695b01cf9009ba7cb6c8 (diff)
Initial syncapi storage refactor to share pq/sqlite code (#1030)
* Initial syncapi storage refactor to share pq/sqlite code This goes down a different route than https://github.com/matrix-org/dendrite/pull/985 which tried to even reduce the boilerplate of `ExecContext` etc. The previous pattern fails badly when there are subtle differences in parameters and hence the shared boilerplate to read from `QueryContext` breaks. Rather than attacking it at that level, the main place where we want to reuse code is for the `syncserver.go` itself - the database implementation which has lots of complex logic. So instead, this commit: - Makes `invites_table.go` an interface. - Makes `SyncServerDatasource` use that interface - This means some functions are now identical for pq/sqlite, so factor them out to a temporary `shared.Database` struct which will grow until it replaces all of `SyncServerDatasource`. * Missing files
Diffstat (limited to 'syncapi/storage/shared/syncserver.go')
-rw-r--r--syncapi/storage/shared/syncserver.go37
1 files changed, 37 insertions, 0 deletions
diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go
new file mode 100644
index 00000000..e89976df
--- /dev/null
+++ b/syncapi/storage/shared/syncserver.go
@@ -0,0 +1,37 @@
+package shared
+
+import (
+ "context"
+ "database/sql"
+
+ "github.com/matrix-org/dendrite/common"
+ "github.com/matrix-org/dendrite/syncapi/storage/tables"
+ "github.com/matrix-org/dendrite/syncapi/types"
+ "github.com/matrix-org/gomatrixserverlib"
+)
+
+// Database is a temporary struct until we have made syncserver.go the same for both pq/sqlite
+// For now this contains the shared functions
+type Database struct {
+ DB *sql.DB
+ Invites tables.Invites
+}
+
+func (d *Database) AddInviteEvent(
+ ctx context.Context, inviteEvent gomatrixserverlib.HeaderedEvent,
+) (sp types.StreamPosition, err error) {
+ err = common.WithTransaction(d.DB, func(txn *sql.Tx) error {
+ sp, err = d.Invites.InsertInviteEvent(ctx, txn, inviteEvent)
+ return err
+ })
+ return
+}
+
+func (d *Database) RetireInviteEvent(
+ ctx context.Context, inviteEventID string,
+) error {
+ // TODO: Record that invite has been retired in a stream so that we can
+ // notify the user in an incremental sync.
+ err := d.Invites.DeleteInviteEvent(ctx, inviteEventID)
+ return err
+}