From e524a7359d57d33156559c584f07f03d67009146 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 17 Mar 2020 17:15:31 +0000 Subject: [PATCH] Remove new API --- roomserver/storage/postgres/events_table.go | 13 ------------- roomserver/storage/sqlite3/events_table.go | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/roomserver/storage/postgres/events_table.go b/roomserver/storage/postgres/events_table.go index f33809f6c..d9b269bc8 100644 --- a/roomserver/storage/postgres/events_table.go +++ b/roomserver/storage/postgres/events_table.go @@ -116,9 +116,6 @@ const bulkSelectEventNIDSQL = "" + const selectMaxEventDepthSQL = "" + "SELECT COALESCE(MAX(depth) + 1, 0) FROM roomserver_events WHERE event_nid = ANY($1)" -const selectRoomNIDForEventIDSQL = "" + - "SELECT room_nid FROM roomserver_events WHERE event_id = $1" - type eventStatements struct { insertEventStmt *sql.Stmt selectEventStmt *sql.Stmt @@ -133,7 +130,6 @@ type eventStatements struct { bulkSelectEventIDStmt *sql.Stmt bulkSelectEventNIDStmt *sql.Stmt selectMaxEventDepthStmt *sql.Stmt - selectRoomNIDForEventIDStmt *sql.Stmt } func (s *eventStatements) prepare(db *sql.DB) (err error) { @@ -156,7 +152,6 @@ func (s *eventStatements) prepare(db *sql.DB) (err error) { {&s.bulkSelectEventIDStmt, bulkSelectEventIDSQL}, {&s.bulkSelectEventNIDStmt, bulkSelectEventNIDSQL}, {&s.selectMaxEventDepthStmt, selectMaxEventDepthSQL}, - {&s.selectRoomNIDForEventIDStmt, selectRoomNIDForEventIDSQL}, }.prepare(db) } @@ -429,11 +424,3 @@ func eventNIDsAsArray(eventNIDs []types.EventNID) pq.Int64Array { } return nids } - -func (s *eventStatements) selectRoomNIDForEventID( - ctx context.Context, txn *sql.Tx, eventID string, -) (roomNID types.RoomNID, err error) { - selectStmt := common.TxStmt(txn, s.selectRoomNIDForEventIDStmt) - err = selectStmt.QueryRowContext(ctx, eventID).Scan(&roomNID) - return -} diff --git a/roomserver/storage/sqlite3/events_table.go b/roomserver/storage/sqlite3/events_table.go index 14f2b94c1..4fa095913 100644 --- a/roomserver/storage/sqlite3/events_table.go +++ b/roomserver/storage/sqlite3/events_table.go @@ -96,9 +96,6 @@ const bulkSelectEventNIDSQL = "" + const selectMaxEventDepthSQL = "" + "SELECT COALESCE(MAX(depth) + 1, 0) FROM roomserver_events WHERE event_nid IN ($1)" -const selectRoomNIDForEventIDSQL = "" + - "SELECT room_nid FROM roomserver_events WHERE event_id = $1" - type eventStatements struct { db *sql.DB insertEventStmt *sql.Stmt @@ -114,7 +111,6 @@ type eventStatements struct { bulkSelectEventReferenceStmt *sql.Stmt bulkSelectEventIDStmt *sql.Stmt bulkSelectEventNIDStmt *sql.Stmt - selectRoomNIDForEventIDStmt *sql.Stmt } func (s *eventStatements) prepare(db *sql.DB) (err error) { @@ -138,7 +134,6 @@ func (s *eventStatements) prepare(db *sql.DB) (err error) { {&s.bulkSelectEventReferenceStmt, bulkSelectEventReferenceSQL}, {&s.bulkSelectEventIDStmt, bulkSelectEventIDSQL}, {&s.bulkSelectEventNIDStmt, bulkSelectEventNIDSQL}, - {&s.selectRoomNIDForEventIDStmt, selectRoomNIDForEventIDSQL}, }.prepare(db) } @@ -481,11 +476,3 @@ func eventNIDsAsArray(eventNIDs []types.EventNID) string { b, _ := json.Marshal(eventNIDs) return string(b) } - -func (s *eventStatements) selectRoomNIDForEventID( - ctx context.Context, txn *sql.Tx, eventID string, -) (roomNID types.RoomNID, err error) { - selectStmt := common.TxStmt(txn, s.selectRoomNIDForEventIDStmt) - err = selectStmt.QueryRowContext(ctx, eventID).Scan(&roomNID) - return -}