fixed imports

clientapi/auth/storage/accounts/postgres/account_data_table.go

@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/matrix-org/gomatrixserverlib"

clientapi/auth/storage/accounts/postgres/membership_table.go

@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"

common/keydb/postgres/server_key_table.go

@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"

common/log.go

@@ -17,13 +17,14 @@ package common
 import (
 	"context"
 	"fmt"
-	"github.com/matrix-org/util"
 	"os"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+	"github.com/matrix-org/util"
+
 	"github.com/matrix-org/dendrite/common/config"
 	"github.com/matrix-org/dugong"
 	"github.com/sirupsen/logrus"

common/partition_offset_table.go

@@ -90,7 +90,7 @@ func (s *PartitionOffsetStatements) selectPartitionOffsets(
 	if err != nil {
 		return nil, err
 	}
-	defer common.LogIfError(ctx, rows.Close(), "rows.close() failed")
+	defer LogIfError(ctx, rows.Close(), "rows.close() failed")
 	var results []PartitionOffset
 	for rows.Next() {
 		var offset PartitionOffset

mediaapi/storage/postgres/thumbnail_table.go

@@ -18,9 +18,10 @@ package postgres
 import (
 	"context"
 	"database/sql"
-	"github.com/matrix-org/dendrite/common"
 	"time"
 
+	"github.com/matrix-org/dendrite/common"
+
 	"github.com/matrix-org/dendrite/mediaapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 )

mediaapi/storage/sqlite3/thumbnail_table.go

@@ -18,9 +18,10 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	"github.com/matrix-org/dendrite/common"
 	"time"
 
+	"github.com/matrix-org/dendrite/common"
+
 	"github.com/matrix-org/dendrite/mediaapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 )

publicroomsapi/storage/postgres/public_rooms_table.go

@@ -20,6 +20,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"

roomserver/storage/postgres/event_json_table.go

@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/matrix-org/dendrite/roomserver/types"

roomserver/storage/postgres/event_types_table.go

@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"

roomserver/storage/postgres/room_aliases_table.go

@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 )
 

roomserver/storage/postgres/state_block_table.go

@@ -19,9 +19,10 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/matrix-org/dendrite/common"
 	"sort"
 
+	"github.com/matrix-org/dendrite/common"
+
 	"github.com/lib/pq"
 	"github.com/matrix-org/dendrite/roomserver/types"
 	"github.com/matrix-org/util"

roomserver/storage/postgres/state_snapshot_table.go

@@ -19,6 +19,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/lib/pq"

syncapi/storage/postgres/backward_extremities_table.go

@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 )
 

syncapi/storage/postgres/output_room_events_topology_table.go

@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/matrix-org/dendrite/syncapi/types"

syncapi/storage/sqlite3/account_data_table.go

@@ -18,6 +18,7 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
+
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/matrix-org/dendrite/syncapi/types"