b6ea1bc67a
* Move current work into single branch
* Initial massaging of clientapi etc (not working yet)
* Interfaces for accounts/devices databases
* Duplicate postgres package for sqlite3 (no changes made to it yet)
* Some keydb, accountdb, devicedb, common partition fixes, some more syncapi tweaking
* Fix accounts DB, device DB
* Update naffka dependency for SQLite
* Naffka SQLite
* Update naffka to latest master
* SQLite support for federationsender
* Mostly not-bad support for SQLite in syncapi (although there are problems where lots of events get classed incorrectly as backward extremities, probably because of IN/ANY clauses that are badly supported)
* Update Dockerfile -> Go 1.13.7, add build-base (as gcc and friends are needed for SQLite)
* Implement GET endpoints for account_data in clientapi
* Nuke filtering for now...
* Revert "Implement GET endpoints for account_data in clientapi"
This reverts commit 4d80dff458
.
* Implement GET endpoints for account_data in clientapi (#861)
* Implement GET endpoints for account_data in clientapi
* Fix accountDB parameter
* Remove fmt.Println
* Fix insertAccountData SQLite query
* Fix accountDB storage interfaces
* Add empty push rules into account data on account creation (#862)
* Put SaveAccountData into the right function this time
* Not sure if roomserver is better or worse now
* sqlite work
* Allow empty last sent ID for the first event
* sqlite: room creation works
* Support sending messages
* Nuke fmt.println
* Move QueryVariadic etc into common, other device fixes
* Fix some linter issues
* Fix bugs
* Fix some linting errors
* Fix errcheck lint errors
* Make naffka use postgres as fallback, fix couple of compile errors
* What on earth happened to the /rooms/{roomID}/send/{eventType} routing
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
144 lines
4.1 KiB
Go
144 lines
4.1 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 (
|
|
"context"
|
|
"database/sql"
|
|
|
|
"github.com/lib/pq"
|
|
"github.com/matrix-org/dendrite/common"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
const accountDataSchema = `
|
|
CREATE TABLE IF NOT EXISTS syncapi_account_data_type (
|
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
user_id TEXT NOT NULL,
|
|
room_id TEXT NOT NULL,
|
|
type TEXT NOT NULL,
|
|
UNIQUE (user_id, room_id, type)
|
|
);
|
|
`
|
|
|
|
const insertAccountDataSQL = "" +
|
|
"INSERT INTO syncapi_account_data_type (id, user_id, room_id, type) VALUES ($1, $2, $3, $4)" +
|
|
" ON CONFLICT (user_id, room_id, type) DO UPDATE" +
|
|
" SET id = EXCLUDED.id"
|
|
|
|
const selectAccountDataInRangeSQL = "" +
|
|
"SELECT room_id, type FROM syncapi_account_data_type" +
|
|
" WHERE user_id = $1 AND id > $2 AND id <= $3" +
|
|
" AND ( $4 IS NULL OR type IN ($4) )" +
|
|
" AND ( $5 IS NULL OR NOT(type IN ($5)) )" +
|
|
" ORDER BY id ASC LIMIT $6"
|
|
|
|
const selectMaxAccountDataIDSQL = "" +
|
|
"SELECT MAX(id) FROM syncapi_account_data_type"
|
|
|
|
type accountDataStatements struct {
|
|
streamIDStatements *streamIDStatements
|
|
insertAccountDataStmt *sql.Stmt
|
|
selectAccountDataInRangeStmt *sql.Stmt
|
|
selectMaxAccountDataIDStmt *sql.Stmt
|
|
}
|
|
|
|
func (s *accountDataStatements) prepare(db *sql.DB, streamID *streamIDStatements) (err error) {
|
|
s.streamIDStatements = streamID
|
|
_, err = db.Exec(accountDataSchema)
|
|
if err != nil {
|
|
return
|
|
}
|
|
if s.insertAccountDataStmt, err = db.Prepare(insertAccountDataSQL); err != nil {
|
|
return
|
|
}
|
|
if s.selectAccountDataInRangeStmt, err = db.Prepare(selectAccountDataInRangeSQL); err != nil {
|
|
return
|
|
}
|
|
if s.selectMaxAccountDataIDStmt, err = db.Prepare(selectMaxAccountDataIDSQL); err != nil {
|
|
return
|
|
}
|
|
return
|
|
}
|
|
|
|
func (s *accountDataStatements) insertAccountData(
|
|
ctx context.Context, txn *sql.Tx,
|
|
userID, roomID, dataType string,
|
|
) (pos types.StreamPosition, err error) {
|
|
pos, err = s.streamIDStatements.nextStreamID(ctx, txn)
|
|
if err != nil {
|
|
return
|
|
}
|
|
insertStmt := common.TxStmt(txn, s.insertAccountDataStmt)
|
|
_, err = insertStmt.ExecContext(ctx, pos, userID, roomID, dataType)
|
|
return
|
|
}
|
|
|
|
func (s *accountDataStatements) selectAccountDataInRange(
|
|
ctx context.Context,
|
|
userID string,
|
|
oldPos, newPos types.StreamPosition,
|
|
accountDataFilterPart *gomatrixserverlib.EventFilter,
|
|
) (data map[string][]string, err error) {
|
|
data = make(map[string][]string)
|
|
|
|
// If both positions are the same, it means that the data was saved after the
|
|
// latest room event. In that case, we need to decrement the old position as
|
|
// it would prevent the SQL request from returning anything.
|
|
if oldPos == newPos {
|
|
oldPos--
|
|
}
|
|
|
|
rows, err := s.selectAccountDataInRangeStmt.QueryContext(ctx, userID, oldPos, newPos,
|
|
pq.StringArray(filterConvertTypeWildcardToSQL(accountDataFilterPart.Types)),
|
|
pq.StringArray(filterConvertTypeWildcardToSQL(accountDataFilterPart.NotTypes)),
|
|
accountDataFilterPart.Limit,
|
|
)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
for rows.Next() {
|
|
var dataType string
|
|
var roomID string
|
|
|
|
if err = rows.Scan(&roomID, &dataType); err != nil {
|
|
return
|
|
}
|
|
|
|
if len(data[roomID]) > 0 {
|
|
data[roomID] = append(data[roomID], dataType)
|
|
} else {
|
|
data[roomID] = []string{dataType}
|
|
}
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (s *accountDataStatements) selectMaxAccountDataID(
|
|
ctx context.Context, txn *sql.Tx,
|
|
) (id int64, err error) {
|
|
var nullableID sql.NullInt64
|
|
stmt := common.TxStmt(txn, s.selectMaxAccountDataIDStmt)
|
|
err = stmt.QueryRowContext(ctx).Scan(&nullableID)
|
|
if nullableID.Valid {
|
|
id = nullableID.Int64
|
|
}
|
|
return
|
|
}
|