bcb89ada5e
* fix conversion from int to string yields a string of one rune, not a string of digits
* Add receipts table to syncapi
* Use StreamingToken as the since value
* Add required method to testEDUProducer
* Make receipt json creation "easier" to read
* Add receipts api to the eduserver
* Add receipts endpoint
* Add eduserver kafka consumer
* Add missing kafka config
* Add passing tests to whitelist
Signed-off-by: Till Faelligen <tfaelligen@gmail.com>
* Fix copy & paste error
* Fix column count error
* Make outbound federation receipts pass
* Make "Inbound federation rejects receipts from wrong remote" pass
* Don't use errors package
* - Add TODO for batching requests
- Rename variable
* Return a better error message
* - Use OutputReceiptEvent instead of InputReceiptEvent as result
- Don't use the errors package for errors
- Defer CloseAndLogIfError to close rows
- Fix Copyright
* Better creation/usage of JoinResponse
* Query all joined rooms instead of just one
* Update gomatrixserverlib
* Add sqlite3 migration
* Add postgres migration
* Ensure required sequence exists before running migrations
* Clarification on comment
* - Fix a bug when creating client receipts
- Use concrete types instead of interface{}
* Remove dead code
Use key for timestamp
* Fix postgres query...
* Remove single purpose struct
* Use key/value directly
* Only apply receipts on initial sync or if edu positions differ,
otherwise we'll be sending the same receipts over and over again.
* Actually update the id, so it is correctly send in syncs
* Set receipt on request to /read_markers
* Fix issue with receipts getting overwritten
* Use fmt.Errorf instead of pkg/errors
* Revert "Add postgres migration"
This reverts commit 722fe5a04628882b787d096942459961db159b06.
* Revert "Add sqlite3 migration"
This reverts commit d113b03f6495a4b8f8bcf158a3d00b510b4240cc.
* Fix selectRoomReceipts query
* Make golangci-lint happy
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
106 lines
3.0 KiB
Go
106 lines
3.0 KiB
Go
// 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 (
|
|
"database/sql"
|
|
|
|
// Import the postgres database driver.
|
|
_ "github.com/lib/pq"
|
|
"github.com/matrix-org/dendrite/eduserver/cache"
|
|
"github.com/matrix-org/dendrite/internal/config"
|
|
"github.com/matrix-org/dendrite/internal/sqlutil"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/shared"
|
|
)
|
|
|
|
// SyncServerDatasource represents a sync server datasource which manages
|
|
// both the database for PDUs and caches for EDUs.
|
|
type SyncServerDatasource struct {
|
|
shared.Database
|
|
db *sql.DB
|
|
writer sqlutil.Writer
|
|
sqlutil.PartitionOffsetStatements
|
|
}
|
|
|
|
// NewDatabase creates a new sync server database
|
|
func NewDatabase(dbProperties *config.DatabaseOptions) (*SyncServerDatasource, error) {
|
|
var d SyncServerDatasource
|
|
var err error
|
|
if d.db, err = sqlutil.Open(dbProperties); err != nil {
|
|
return nil, err
|
|
}
|
|
d.writer = sqlutil.NewDummyWriter()
|
|
if err = d.PartitionOffsetStatements.Prepare(d.db, d.writer, "syncapi"); err != nil {
|
|
return nil, err
|
|
}
|
|
accountData, err := NewPostgresAccountDataTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
events, err := NewPostgresEventsTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
currState, err := NewPostgresCurrentRoomStateTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
invites, err := NewPostgresInvitesTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
peeks, err := NewPostgresPeeksTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
topology, err := NewPostgresTopologyTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
backwardExtremities, err := NewPostgresBackwardsExtremitiesTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
sendToDevice, err := NewPostgresSendToDeviceTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
filter, err := NewPostgresFilterTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
receipts, err := NewPostgresReceiptsTable(d.db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
d.Database = shared.Database{
|
|
DB: d.db,
|
|
Writer: d.writer,
|
|
Invites: invites,
|
|
Peeks: peeks,
|
|
AccountData: accountData,
|
|
OutputEvents: events,
|
|
Topology: topology,
|
|
CurrentRoomState: currState,
|
|
BackwardExtremities: backwardExtremities,
|
|
Filter: filter,
|
|
SendToDevice: sendToDevice,
|
|
Receipts: receipts,
|
|
EDUCache: cache.New(),
|
|
}
|
|
return &d, nil
|
|
}
|