mirror of
https://github.com/matrix-org/dendrite
synced 2024-12-25 22:03:49 +01:00
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 commit722fe5a046
. * Revert "Add sqlite3 migration" This reverts commitd113b03f64
. * Fix selectRoomReceipts query * Make golangci-lint happy Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
118 lines
3.2 KiB
Go
118 lines
3.2 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 sqlite3
|
|
|
|
import (
|
|
"database/sql"
|
|
|
|
// Import the sqlite3 package
|
|
_ "github.com/mattn/go-sqlite3"
|
|
|
|
"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
|
|
streamID streamIDStatements
|
|
}
|
|
|
|
// NewDatabase creates a new sync server database
|
|
// nolint: gocyclo
|
|
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.NewExclusiveWriter()
|
|
if err = d.prepare(); err != nil {
|
|
return nil, err
|
|
}
|
|
return &d, nil
|
|
}
|
|
|
|
func (d *SyncServerDatasource) prepare() (err error) {
|
|
if err = d.PartitionOffsetStatements.Prepare(d.db, d.writer, "syncapi"); err != nil {
|
|
return err
|
|
}
|
|
if err = d.streamID.prepare(d.db); err != nil {
|
|
return err
|
|
}
|
|
accountData, err := NewSqliteAccountDataTable(d.db, &d.streamID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
events, err := NewSqliteEventsTable(d.db, &d.streamID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
roomState, err := NewSqliteCurrentRoomStateTable(d.db, &d.streamID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
invites, err := NewSqliteInvitesTable(d.db, &d.streamID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
peeks, err := NewSqlitePeeksTable(d.db, &d.streamID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
topology, err := NewSqliteTopologyTable(d.db)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
bwExtrem, err := NewSqliteBackwardsExtremitiesTable(d.db)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
sendToDevice, err := NewSqliteSendToDeviceTable(d.db)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
filter, err := NewSqliteFilterTable(d.db)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
receipts, err := NewSqliteReceiptsTable(d.db, &d.streamID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
d.Database = shared.Database{
|
|
DB: d.db,
|
|
Writer: d.writer,
|
|
Invites: invites,
|
|
Peeks: peeks,
|
|
AccountData: accountData,
|
|
OutputEvents: events,
|
|
BackwardExtremities: bwExtrem,
|
|
CurrentRoomState: roomState,
|
|
Topology: topology,
|
|
Filter: filter,
|
|
SendToDevice: sendToDevice,
|
|
Receipts: receipts,
|
|
EDUCache: cache.New(),
|
|
}
|
|
return nil
|
|
}
|