diff options
| author | Kegsay <kegan@matrix.org> | 2020-05-21 14:40:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 14:40:13 +0100 |
| commit | 24d8df664c21fa8bd68d80b5585a496e264c410a (patch) | |
| tree | 0a176d6dfd7f81522c5739b53313366b552b0ce1 /roomserver/storage/sqlite3/state_snapshot_table.go | |
| parent | 3fdb045116c9cd2f2a3badfebec0645d0381bacb (diff) | |
Fix #897 and shuffle directory around (#1054)
* Fix #897 and shuffle directory around
* Update find-lint
* goimports
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Diffstat (limited to 'roomserver/storage/sqlite3/state_snapshot_table.go')
| -rw-r--r-- | roomserver/storage/sqlite3/state_snapshot_table.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roomserver/storage/sqlite3/state_snapshot_table.go b/roomserver/storage/sqlite3/state_snapshot_table.go index f367a779..8682627a 100644 --- a/roomserver/storage/sqlite3/state_snapshot_table.go +++ b/roomserver/storage/sqlite3/state_snapshot_table.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/common" + "github.com/matrix-org/dendrite/internal" "github.com/matrix-org/dendrite/roomserver/types" ) @@ -89,7 +89,7 @@ func (s *stateSnapshotStatements) bulkSelectStateBlockNIDs( for k, v := range stateNIDs { nids[k] = v } - selectOrig := strings.Replace(bulkSelectStateBlockNIDsSQL, "($1)", common.QueryVariadic(len(nids)), 1) + selectOrig := strings.Replace(bulkSelectStateBlockNIDsSQL, "($1)", internal.QueryVariadic(len(nids)), 1) selectStmt, err := txn.Prepare(selectOrig) if err != nil { return nil, err @@ -99,7 +99,7 @@ func (s *stateSnapshotStatements) bulkSelectStateBlockNIDs( if err != nil { return nil, err } - defer common.CloseAndLogIfError(ctx, rows, "bulkSelectStateBlockNIDs: rows.close() failed") + defer internal.CloseAndLogIfError(ctx, rows, "bulkSelectStateBlockNIDs: rows.close() failed") results := make([]types.StateBlockNIDList, len(stateNIDs)) i := 0 for ; rows.Next(); i++ { |