Remove unused partition_offset_table
MODIFY
appservice/storage/postgres/storage.go
appservice/storage/postgres/storage.go
@@ -28,7 +28,6 @@ import (
// Database stores events intended to be later sent to application services
type Database struct {
- sqlutil.PartitionOffsetStatements
events eventsStatements
txnID txnStatements
db *sql.DB
@@ -46,9 +45,6 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*Database, error) {
if err = result.prepare(); err != nil {
return nil, err
}
- if err = result.PartitionOffsetStatements.Prepare(result.db, result.writer, "appservice"); err != nil {
- return nil, err
- }
return &result, nil
}

MODIFY
appservice/storage/sqlite3/storage.go
appservice/storage/sqlite3/storage.go
@@ -27,7 +27,6 @@ import (
// Database stores events intended to be later sent to application services
type Database struct {
- sqlutil.PartitionOffsetStatements
events eventsStatements
txnID txnStatements
db *sql.DB
@@ -45,9 +44,6 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*Database, error) {
if err = result.prepare(); err != nil {
return nil, err
}
- if err = result.PartitionOffsetStatements.Prepare(result.db, result.writer, "appservice"); err != nil {
- return nil, err
- }
return &result, nil
}

MODIFY
federationapi/storage/postgres/storage.go
federationapi/storage/postgres/storage.go
@@ -30,7 +30,6 @@ import (
// Database stores information needed by the federation sender
type Database struct {
shared.Database
- sqlutil.PartitionOffsetStatements
db *sql.DB
writer sqlutil.Writer
}
@@ -104,8 +103,5 @@ func NewDatabase(dbProperties *config.DatabaseOptions, cache caching.FederationC
NotaryServerKeysMetadata: notaryMetadata,
ServerSigningKeys: serverSigningKeys,
}
- if err = d.PartitionOffsetStatements.Prepare(d.db, d.writer, "federationsender"); err != nil {
- return nil, err
- }
return &d, nil
}

MODIFY
federationapi/storage/sqlite3/storage.go
federationapi/storage/sqlite3/storage.go
@@ -29,7 +29,6 @@ import (
// Database stores information needed by the federation sender
type Database struct {
shared.Database
- sqlutil.PartitionOffsetStatements
db *sql.DB
writer sqlutil.Writer
}
@@ -103,8 +102,5 @@ func NewDatabase(dbProperties *config.DatabaseOptions, cache caching.FederationC
NotaryServerKeysMetadata: notaryKeysMetadata,
ServerSigningKeys: serverSigningKeys,
}
- if err = d.PartitionOffsetStatements.Prepare(d.db, d.writer, "federationsender"); err != nil {
- return nil, err
- }
return &d, nil
}

DELETE
internal/sqlutil/partition_offset_table.go
-// 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 sqlutil
-
-import (
- "context"
- "database/sql"
- "strings"
-)
-
-// A PartitionOffset is the offset into a partition of the input log.
-type PartitionOffset struct {
- // The ID of the partition.
- Partition int32
- // The offset into the partition.
- Offset int64
-}
-
-const partitionOffsetsSchema = `
--- The offsets that the server has processed up to.
-CREATE TABLE IF NOT EXISTS ${prefix}_partition_offsets (
- -- The name of the topic.
- topic TEXT NOT NULL,
- -- The 32-bit partition ID
- partition INTEGER NOT NULL,
- -- The 64-bit offset.
- partition_offset BIGINT NOT NULL,
- UNIQUE (topic, partition)
-);
-`
-
-const selectPartitionOffsetsSQL = "" +
- "SELECT partition, partition_offset FROM ${prefix}_partition_offsets WHERE topic = $1"
-
-const upsertPartitionOffsetsSQL = "" +
- "INSERT INTO ${prefix}_partition_offsets (topic, partition, partition_offset) VALUES ($1, $2, $3)" +
- " ON CONFLICT (topic, partition)" +
- " DO UPDATE SET partition_offset = $3"
-
-// PartitionOffsetStatements represents a set of statements that can be run on a partition_offsets table.
-type PartitionOffsetStatements struct {
- db *sql.DB
- writer Writer
- selectPartitionOffsetsStmt *sql.Stmt
- upsertPartitionOffsetStmt *sql.Stmt
-}
-
-// Prepare converts the raw SQL statements into prepared statements.
-// Takes a prefix to prepend to the table name used to store the partition offsets.
-// This allows multiple components to share the same database schema.
-func (s *PartitionOffsetStatements) Prepare(db *sql.DB, writer Writer, prefix string) (err error) {
- s.db = db
- s.writer = writer
- _, err = db.Exec(strings.Replace(partitionOffsetsSchema, "${prefix}", prefix, -1))
- if err != nil {
- return
- }
- if s.selectPartitionOffsetsStmt, err = db.Prepare(
- strings.Replace(selectPartitionOffsetsSQL, "${prefix}", prefix, -1),
- ); err != nil {
- return
- }
- if s.upsertPartitionOffsetStmt, err = db.Prepare(
- strings.Replace(upsertPartitionOffsetsSQL, "${prefix}", prefix, -1),
- ); err != nil {
- return
- }
- return
-}
-
-// PartitionOffsets implements PartitionStorer
-func (s *PartitionOffsetStatements) PartitionOffsets(
- ctx context.Context, topic string,
-) ([]PartitionOffset, error) {
- return s.selectPartitionOffsets(ctx, topic)
-}
-
-// SetPartitionOffset implements PartitionStorer
-func (s *PartitionOffsetStatements) SetPartitionOffset(
- ctx context.Context, topic string, partition int32, offset int64,
-) error {
- return s.upsertPartitionOffset(ctx, topic, partition, offset)
-}
-
-// selectPartitionOffsets returns all the partition offsets for the given topic.
-func (s *PartitionOffsetStatements) selectPartitionOffsets(
- ctx context.Context, topic string,
-) (results []PartitionOffset, err error) {
- rows, err := s.selectPartitionOffsetsStmt.QueryContext(ctx, topic)
- if err != nil {
- return nil, err
- }
- defer checkNamedErr(rows.Close, &err)
- for rows.Next() {
- var offset PartitionOffset
- if err = rows.Scan(&offset.Partition, &offset.Offset); err != nil {
- return nil, err
- }
- results = append(results, offset)
- }
- err = rows.Err()
- return results, err
-}
-
-// checkNamedErr calls fn and overwrite err if it was nil and fn returned non-nil
-func checkNamedErr(fn func() error, err *error) {
- if e := fn(); e != nil && *err == nil {
- *err = e
- }
-}
-
-// UpsertPartitionOffset updates or inserts the partition offset for the given topic.
-func (s *PartitionOffsetStatements) upsertPartitionOffset(
- ctx context.Context, topic string, partition int32, offset int64,
-) error {
- return s.writer.Do(s.db, nil, func(txn *sql.Tx) error {
- stmt := TxStmt(txn, s.upsertPartitionOffsetStmt)
- _, err := stmt.ExecContext(ctx, topic, partition, offset)
- return err
- })
-}

MODIFY
keyserver/storage/postgres/storage.go
keyserver/storage/postgres/storage.go
@@ -70,8 +70,5 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*shared.Database, error)
CrossSigningKeysTable: csk,
CrossSigningSigsTable: css,
}
- if err = d.PartitionOffsetStatements.Prepare(db, d.Writer, "keyserver"); err != nil {
- return nil, err
- }
return d, nil
}

MODIFY
keyserver/storage/shared/storage.go
keyserver/storage/shared/storage.go
@@ -36,7 +36,6 @@ type Database struct {
StaleDeviceListsTable tables.StaleDeviceLists
CrossSigningKeysTable tables.CrossSigningKeys
CrossSigningSigsTable tables.CrossSigningSigs
- sqlutil.PartitionOffsetStatements
}
func (d *Database) ExistingOneTimeKeys(ctx context.Context, userID, deviceID string, keyIDsWithAlgorithms []string) (map[string]json.RawMessage, error) {

MODIFY
keyserver/storage/sqlite3/storage.go
keyserver/storage/sqlite3/storage.go
@@ -69,8 +69,5 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*shared.Database, error)
CrossSigningKeysTable: csk,
CrossSigningSigsTable: css,
}
- if err = d.PartitionOffsetStatements.Prepare(db, d.Writer, "keyserver"); err != nil {
- return nil, err
- }
return d, nil
}

MODIFY
syncapi/storage/postgres/syncserver.go
syncapi/storage/postgres/syncserver.go
@@ -32,7 +32,6 @@ type SyncServerDatasource struct {
shared.Database
db *sql.DB
writer sqlutil.Writer
- sqlutil.PartitionOffsetStatements
}
// NewDatabase creates a new sync server database
@@ -43,9 +42,6 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*SyncServerDatasource, e
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

MODIFY
syncapi/storage/sqlite3/syncserver.go
syncapi/storage/sqlite3/syncserver.go
@@ -30,7 +30,6 @@ type SyncServerDatasource struct {
shared.Database
db *sql.DB
writer sqlutil.Writer
- sqlutil.PartitionOffsetStatements
streamID streamIDStatements
}
@@ -50,9 +49,6 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*SyncServerDatasource, e
}
func (d *SyncServerDatasource) prepare(dbProperties *config.DatabaseOptions) (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
}

Remove unused partition_offset_table (#2288)