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 4d80dff4583d278620d9b3ed437e9fcd8d4674ee. * 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>
157 lines
5.1 KiB
Go
157 lines
5.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"
|
|
"strings"
|
|
|
|
"github.com/matrix-org/dendrite/common"
|
|
"github.com/matrix-org/dendrite/roomserver/types"
|
|
)
|
|
|
|
const eventStateKeysSchema = `
|
|
CREATE TABLE IF NOT EXISTS roomserver_event_state_keys (
|
|
event_state_key_nid INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
event_state_key TEXT NOT NULL UNIQUE
|
|
);
|
|
INSERT INTO roomserver_event_state_keys (event_state_key_nid, event_state_key)
|
|
VALUES (1, '')
|
|
ON CONFLICT DO NOTHING;
|
|
`
|
|
|
|
// Same as insertEventTypeNIDSQL
|
|
const insertEventStateKeyNIDSQL = `
|
|
INSERT INTO roomserver_event_state_keys (event_state_key) VALUES ($1)
|
|
ON CONFLICT DO NOTHING;
|
|
`
|
|
|
|
const selectEventStateKeyNIDSQL = `
|
|
SELECT event_state_key_nid FROM roomserver_event_state_keys
|
|
WHERE event_state_key = $1
|
|
`
|
|
|
|
// Bulk lookup from string state key to numeric ID for that state key.
|
|
// Takes an array of strings as the query parameter.
|
|
const bulkSelectEventStateKeyNIDSQL = `
|
|
SELECT event_state_key, event_state_key_nid FROM roomserver_event_state_keys
|
|
WHERE event_state_key IN ($1)
|
|
`
|
|
|
|
// Bulk lookup from numeric ID to string state key for that state key.
|
|
// Takes an array of strings as the query parameter.
|
|
const bulkSelectEventStateKeySQL = `
|
|
SELECT event_state_key, event_state_key_nid FROM roomserver_event_state_keys
|
|
WHERE event_state_key_nid IN ($1)
|
|
`
|
|
|
|
type eventStateKeyStatements struct {
|
|
db *sql.DB
|
|
insertEventStateKeyNIDStmt *sql.Stmt
|
|
selectEventStateKeyNIDStmt *sql.Stmt
|
|
bulkSelectEventStateKeyNIDStmt *sql.Stmt
|
|
bulkSelectEventStateKeyStmt *sql.Stmt
|
|
}
|
|
|
|
func (s *eventStateKeyStatements) prepare(db *sql.DB) (err error) {
|
|
s.db = db
|
|
_, err = db.Exec(eventStateKeysSchema)
|
|
if err != nil {
|
|
return
|
|
}
|
|
return statementList{
|
|
{&s.insertEventStateKeyNIDStmt, insertEventStateKeyNIDSQL},
|
|
{&s.selectEventStateKeyNIDStmt, selectEventStateKeyNIDSQL},
|
|
{&s.bulkSelectEventStateKeyNIDStmt, bulkSelectEventStateKeyNIDSQL},
|
|
{&s.bulkSelectEventStateKeyStmt, bulkSelectEventStateKeySQL},
|
|
}.prepare(db)
|
|
}
|
|
|
|
func (s *eventStateKeyStatements) insertEventStateKeyNID(
|
|
ctx context.Context, txn *sql.Tx, eventStateKey string,
|
|
) (types.EventStateKeyNID, error) {
|
|
var eventStateKeyNID int64
|
|
var err error
|
|
var res sql.Result
|
|
insertStmt := txn.Stmt(s.insertEventStateKeyNIDStmt)
|
|
if res, err = insertStmt.ExecContext(ctx, eventStateKey); err == nil {
|
|
eventStateKeyNID, err = res.LastInsertId()
|
|
}
|
|
return types.EventStateKeyNID(eventStateKeyNID), err
|
|
}
|
|
|
|
func (s *eventStateKeyStatements) selectEventStateKeyNID(
|
|
ctx context.Context, txn *sql.Tx, eventStateKey string,
|
|
) (types.EventStateKeyNID, error) {
|
|
var eventStateKeyNID int64
|
|
stmt := txn.Stmt(s.selectEventStateKeyNIDStmt)
|
|
err := stmt.QueryRowContext(ctx, eventStateKey).Scan(&eventStateKeyNID)
|
|
return types.EventStateKeyNID(eventStateKeyNID), err
|
|
}
|
|
|
|
func (s *eventStateKeyStatements) bulkSelectEventStateKeyNID(
|
|
ctx context.Context, txn *sql.Tx, eventStateKeys []string,
|
|
) (map[string]types.EventStateKeyNID, error) {
|
|
iEventStateKeys := make([]interface{}, len(eventStateKeys))
|
|
for k, v := range eventStateKeys {
|
|
iEventStateKeys[k] = v
|
|
}
|
|
selectOrig := strings.Replace(bulkSelectEventStateKeyNIDSQL, "($1)", common.QueryVariadic(len(eventStateKeys)), 1)
|
|
|
|
rows, err := txn.QueryContext(ctx, selectOrig, iEventStateKeys...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close() // nolint: errcheck
|
|
result := make(map[string]types.EventStateKeyNID, len(eventStateKeys))
|
|
for rows.Next() {
|
|
var stateKey string
|
|
var stateKeyNID int64
|
|
if err := rows.Scan(&stateKey, &stateKeyNID); err != nil {
|
|
return nil, err
|
|
}
|
|
result[stateKey] = types.EventStateKeyNID(stateKeyNID)
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
func (s *eventStateKeyStatements) bulkSelectEventStateKey(
|
|
ctx context.Context, txn *sql.Tx, eventStateKeyNIDs []types.EventStateKeyNID,
|
|
) (map[types.EventStateKeyNID]string, error) {
|
|
iEventStateKeyNIDs := make([]interface{}, len(eventStateKeyNIDs))
|
|
for k, v := range eventStateKeyNIDs {
|
|
iEventStateKeyNIDs[k] = v
|
|
}
|
|
selectOrig := strings.Replace(bulkSelectEventStateKeyNIDSQL, "($1)", common.QueryVariadic(len(eventStateKeyNIDs)), 1)
|
|
|
|
rows, err := txn.QueryContext(ctx, selectOrig, iEventStateKeyNIDs...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close() // nolint: errcheck
|
|
result := make(map[types.EventStateKeyNID]string, len(eventStateKeyNIDs))
|
|
for rows.Next() {
|
|
var stateKey string
|
|
var stateKeyNID int64
|
|
if err := rows.Scan(&stateKey, &stateKeyNID); err != nil {
|
|
return nil, err
|
|
}
|
|
result[types.EventStateKeyNID(stateKeyNID)] = stateKey
|
|
}
|
|
return result, nil
|
|
}
|