diff options
author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-01-03 14:07:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-03 14:07:05 +0000 |
commit | c28577ea25d4f9c82110450f7f371905c2750f71 (patch) | |
tree | 7eda596a39f4c6ef2fbb2fc3f6a7caeb4ccc77d1 /syncapi/storage | |
parent | 6cab62246816baf1fdd026744727cba9a7b21c28 (diff) |
Implement storage interfaces (#841)
* Implement interfaces for federationsender storage
* Implement interfaces for mediaapi storage
* Implement interfaces for publicroomsapi storage
* Implement interfaces for roomserver storage
* Implement interfaces for syncapi storage
* Implement interfaces for keydb storage
* common.PartitionStorer in publicroomsapi interface
* Update copyright notices
Diffstat (limited to 'syncapi/storage')
-rw-r--r-- | syncapi/storage/postgres/account_data_table.go (renamed from syncapi/storage/account_data_table.go) | 5 | ||||
-rw-r--r-- | syncapi/storage/postgres/current_room_state_table.go (renamed from syncapi/storage/current_room_state_table.go) | 5 | ||||
-rw-r--r-- | syncapi/storage/postgres/filtering.go (renamed from syncapi/storage/filtering.go) | 2 | ||||
-rw-r--r-- | syncapi/storage/postgres/invites_table.go (renamed from syncapi/storage/invites_table.go) | 17 | ||||
-rw-r--r-- | syncapi/storage/postgres/output_room_events_table.go (renamed from syncapi/storage/output_room_events_table.go) | 5 | ||||
-rw-r--r-- | syncapi/storage/postgres/syncserver.go (renamed from syncapi/storage/syncserver.go) | 5 | ||||
-rw-r--r-- | syncapi/storage/storage.go | 63 |
7 files changed, 92 insertions, 10 deletions
diff --git a/syncapi/storage/account_data_table.go b/syncapi/storage/postgres/account_data_table.go index 7b4803e3..33cfffad 100644 --- a/syncapi/storage/account_data_table.go +++ b/syncapi/storage/postgres/account_data_table.go @@ -1,4 +1,5 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2017-2018 New Vector Ltd +// Copyright 2019-2020 The Matrix.org Foundation C.I.C. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package storage +package postgres import ( "context" diff --git a/syncapi/storage/current_room_state_table.go b/syncapi/storage/postgres/current_room_state_table.go index 1ab70879..dbfa111b 100644 --- a/syncapi/storage/current_room_state_table.go +++ b/syncapi/storage/postgres/current_room_state_table.go @@ -1,4 +1,5 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2017-2018 New Vector Ltd +// Copyright 2019-2020 The Matrix.org Foundation C.I.C. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package storage +package postgres import ( "context" diff --git a/syncapi/storage/filtering.go b/syncapi/storage/postgres/filtering.go index 27b0b888..dcc42136 100644 --- a/syncapi/storage/filtering.go +++ b/syncapi/storage/postgres/filtering.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package storage +package postgres import ( "strings" diff --git a/syncapi/storage/invites_table.go b/syncapi/storage/postgres/invites_table.go index 9f52087f..ced4bfc4 100644 --- a/syncapi/storage/invites_table.go +++ b/syncapi/storage/postgres/invites_table.go @@ -1,4 +1,19 @@ -package storage +// Copyright 2017-2018 New Vector Ltd +// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package postgres import ( "context" diff --git a/syncapi/storage/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index e1803a17..3927f0c3 100644 --- a/syncapi/storage/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -1,4 +1,5 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2017-2018 New Vector Ltd +// Copyright 2019-2020 The Matrix.org Foundation C.I.C. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package storage +package postgres import ( "context" diff --git a/syncapi/storage/syncserver.go b/syncapi/storage/postgres/syncserver.go index cda44d2e..fc7b4e40 100644 --- a/syncapi/storage/syncserver.go +++ b/syncapi/storage/postgres/syncserver.go @@ -1,4 +1,5 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2017-2018 New Vector Ltd +// Copyright 2019-2020 The Matrix.org Foundation C.I.C. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package storage +package postgres import ( "context" diff --git a/syncapi/storage/storage.go b/syncapi/storage/storage.go new file mode 100644 index 00000000..eedb42f0 --- /dev/null +++ b/syncapi/storage/storage.go @@ -0,0 +1,63 @@ +// Copyright 2020 The Matrix.org Foundation C.I.C. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package storage + +import ( + "context" + "errors" + "net/url" + "time" + + "github.com/matrix-org/dendrite/clientapi/auth/authtypes" + "github.com/matrix-org/dendrite/common" + "github.com/matrix-org/dendrite/roomserver/api" + "github.com/matrix-org/dendrite/syncapi/storage/postgres" + "github.com/matrix-org/dendrite/syncapi/types" + "github.com/matrix-org/dendrite/typingserver/cache" + "github.com/matrix-org/gomatrixserverlib" +) + +type Database interface { + common.PartitionStorer + AllJoinedUsersInRooms(ctx context.Context) (map[string][]string, error) + Events(ctx context.Context, eventIDs []string) ([]gomatrixserverlib.Event, error) + WriteEvent(ctx context.Context, ev *gomatrixserverlib.Event, addStateEvents []gomatrixserverlib.Event, addStateEventIDs, removeStateEventIDs []string, transactionID *api.TransactionID) (pduPosition int64, returnErr error) + GetStateEvent(ctx context.Context, roomID, evType, stateKey string) (*gomatrixserverlib.Event, error) + GetStateEventsForRoom(ctx context.Context, roomID string, stateFilterPart *gomatrixserverlib.FilterPart) (stateEvents []gomatrixserverlib.Event, err error) + SyncPosition(ctx context.Context) (types.SyncPosition, error) + IncrementalSync(ctx context.Context, device authtypes.Device, fromPos, toPos types.SyncPosition, numRecentEventsPerRoom int, wantFullState bool) (*types.Response, error) + CompleteSync(ctx context.Context, userID string, numRecentEventsPerRoom int) (*types.Response, error) + GetAccountDataInRange(ctx context.Context, userID string, oldPos, newPos int64, accountDataFilterPart *gomatrixserverlib.FilterPart) (map[string][]string, error) + UpsertAccountData(ctx context.Context, userID, roomID, dataType string) (int64, error) + AddInviteEvent(ctx context.Context, inviteEvent gomatrixserverlib.Event) (int64, error) + RetireInviteEvent(ctx context.Context, inviteEventID string) error + SetTypingTimeoutCallback(fn cache.TimeoutCallbackFn) + AddTypingUser(userID, roomID string, expireTime *time.Time) int64 + RemoveTypingUser(userID, roomID string) int64 +} + +// NewPublicRoomsServerDatabase opens a database connection. +func NewSyncServerDatasource(dataSourceName string) (Database, error) { + uri, err := url.Parse(dataSourceName) + if err != nil { + return nil, err + } + switch uri.Scheme { + case "postgres": + return postgres.NewSyncServerDatasource(dataSourceName) + default: + return nil, errors.New("unknown schema") + } +} |