From 4eec8da6b504e2b14f7c95e5177dae00010473e3 Mon Sep 17 00:00:00 2001
From: Mark Haines <mjark@negativecurvature.net>
Date: Mon, 17 Jul 2017 14:15:07 +0100
Subject: [PATCH] Remove unused config for kafka topic

---
 .../matrix-org/dendrite/common/config/config.go       | 10 ++++------
 .../matrix-org/dendrite/common/test/config.go         |  8 ++++----
 .../matrix-org/dendrite/roomserver/storage/sql.go     |  7 -------
 .../matrix-org/dendrite/roomserver/storage/storage.go | 11 -----------
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/github.com/matrix-org/dendrite/common/config/config.go b/src/github.com/matrix-org/dendrite/common/config/config.go
index 311312a9d..4b362b5ff 100644
--- a/src/github.com/matrix-org/dendrite/common/config/config.go
+++ b/src/github.com/matrix-org/dendrite/common/config/config.go
@@ -19,13 +19,14 @@ import (
 	"crypto/sha256"
 	"encoding/pem"
 	"fmt"
-	"github.com/matrix-org/gomatrixserverlib"
-	"golang.org/x/crypto/ed25519"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/matrix-org/gomatrixserverlib"
+	"golang.org/x/crypto/ed25519"
+	"gopkg.in/yaml.v2"
 )
 
 // Version is the current version of the config format.
@@ -95,8 +96,6 @@ type Dendrite struct {
 		Addresses []string `yaml:"addresses"`
 		// The names of the topics to use when reading and writing from kafka.
 		Topics struct {
-			// Topic for roomserver/api.InputRoomEvent events.
-			InputRoomEvent Topic `yaml:"input_room_event"`
 			// Topic for roomserver/api.OutputRoomEvent events.
 			OutputRoomEvent Topic `yaml:"output_room_event"`
 			// Topic for user updates (profile, presence)
@@ -298,7 +297,6 @@ func (config *Dendrite) check() error {
 	}
 
 	checkNotZero("kafka.addresses", int64(len(config.Kafka.Addresses)))
-	checkNotEmpty("kafka.topics.input_room_event", string(config.Kafka.Topics.InputRoomEvent))
 	checkNotEmpty("kafka.topics.output_room_event", string(config.Kafka.Topics.OutputRoomEvent))
 	checkNotEmpty("database.account", string(config.Database.Account))
 	checkNotEmpty("database.device", string(config.Database.Device))
diff --git a/src/github.com/matrix-org/dendrite/common/test/config.go b/src/github.com/matrix-org/dendrite/common/test/config.go
index 8c957e77a..e429d06b0 100644
--- a/src/github.com/matrix-org/dendrite/common/test/config.go
+++ b/src/github.com/matrix-org/dendrite/common/test/config.go
@@ -21,14 +21,15 @@ import (
 	"encoding/base64"
 	"encoding/pem"
 	"fmt"
-	"github.com/matrix-org/dendrite/common/config"
-	"github.com/matrix-org/gomatrixserverlib"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"math/big"
 	"os"
 	"path/filepath"
 	"time"
+
+	"github.com/matrix-org/dendrite/common/config"
+	"github.com/matrix-org/gomatrixserverlib"
+	"gopkg.in/yaml.v2"
 )
 
 const (
@@ -80,7 +81,6 @@ func MakeConfig(configDir, kafkaURI, database, host string, startPort int) (*con
 	cfg.Kafka.Addresses = []string{kafkaURI}
 	// TODO: Different servers should be using different topics.
 	// Make this configurable somehow?
-	cfg.Kafka.Topics.InputRoomEvent = "test.room.input"
 	cfg.Kafka.Topics.OutputRoomEvent = "test.room.output"
 
 	// TODO: Use different databases for the different schemas.
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go b/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
index fcc5eb882..fcb414f02 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
@@ -16,12 +16,9 @@ package storage
 
 import (
 	"database/sql"
-
-	"github.com/matrix-org/dendrite/common"
 )
 
 type statements struct {
-	common.PartitionOffsetStatements
 	eventTypeStatements
 	eventStateKeyStatements
 	roomStatements
@@ -35,10 +32,6 @@ type statements struct {
 func (s *statements) prepare(db *sql.DB) error {
 	var err error
 
-	if err = s.PartitionOffsetStatements.Prepare(db); err != nil {
-		return err
-	}
-
 	if err = s.eventTypeStatements.prepare(db); err != nil {
 		return err
 	}
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go b/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go
index 1dfc89d4c..50e2f44d6 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go
@@ -18,7 +18,6 @@ import (
 	"database/sql"
 	// Import the postgres database driver.
 	_ "github.com/lib/pq"
-	"github.com/matrix-org/dendrite/common"
 	"github.com/matrix-org/dendrite/roomserver/types"
 	"github.com/matrix-org/gomatrixserverlib"
 )
@@ -42,16 +41,6 @@ func Open(dataSourceName string) (*Database, error) {
 	return &d, nil
 }
 
-// PartitionOffsets implements input.ConsumerDatabase
-func (d *Database) PartitionOffsets(topic string) ([]common.PartitionOffset, error) {
-	return d.statements.SelectPartitionOffsets(topic)
-}
-
-// SetPartitionOffset implements input.ConsumerDatabase
-func (d *Database) SetPartitionOffset(topic string, partition int32, offset int64) error {
-	return d.statements.UpsertPartitionOffset(topic, partition, offset)
-}
-
 // StoreEvent implements input.EventDatabase
 func (d *Database) StoreEvent(event gomatrixserverlib.Event, authEventNIDs []types.EventNID) (types.RoomNID, types.StateAtEvent, error) {
 	var (