Run gofmt on all go files

pskopnik · pskopnik · commit 685e6b2629e0 · 2023-04-18T18:25:13.000+02:00
diff --git a/bench/checksum_write_back/types.go b/bench/checksum_write_back/types.go
@@ -72,7 +72,7 @@ func (t Time) Value() (driver.Value, error) {
 // values! However, the most common mysql database driver does not support
 // uint64 at all.
 //
-//     https://github.com/go-sql-driver/mysql/issues/715
+//	https://github.com/go-sql-driver/mysql/issues/715
 type NullUint64 struct {
 	Uint64 uint64
 	Valid  bool
diff --git a/cmd/lsdf-checksum-worker/main.go b/cmd/lsdf-checksum-worker/main.go
@@ -8,11 +8,11 @@ import (
 
 	"golang.org/x/sys/unix"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/apex/log"
 	"github.com/apex/log/handlers/json"
 	"github.com/apex/log/handlers/logfmt"
 	"github.com/apex/log/handlers/text"
-	"github.com/alecthomas/kingpin/v2"
 	"gopkg.in/yaml.v3"
 
 	"git.scc.kit.edu/sdm/lsdf-checksum/worker"
diff --git a/master/medasync/queries.go b/master/medasync/queries.go
@@ -21,16 +21,16 @@ const truncateInsertsQuery = meda.GenericQuery(`
 //
 // The query requires several parameters:
 //
-//     previous_id - The ID previously returned by the query, i.e. the last ID
-//                   of the previous chunk. For the first query, this should be
-//                   set to 0.
-//     chunk_size  - Number of records to be included in the chunk.
+//	previous_id - The ID previously returned by the query, i.e. the last ID
+//	              of the previous chunk. For the first query, this should be
+//	              set to 0.
+//	chunk_size  - Number of records to be included in the chunk.
 //
 // The query outputs zero or a single row with one column. After the query has
 // returned the last chunk, subsequent queries (with previous_id = last row ID
 // of last chunk) return no rows.
 //
-//     id - The ID of the last row included in the chunk.
+//	id - The ID of the last row included in the chunk.
 const nextInsertsChunkQuery = meda.GenericQuery(`
 	(
 		SELECT
@@ -51,16 +51,16 @@ const nextInsertsChunkQuery = meda.GenericQuery(`
 //
 // The query requires several parameters:
 //
-//     previous_id - The ID previously returned by the query, i.e. the last ID
-//                   of the previous chunk. For the first query, this should be
-//                   set to 0.
-//     chunk_size  - Number of records to be included in the chunk.
+//	previous_id - The ID previously returned by the query, i.e. the last ID
+//	              of the previous chunk. For the first query, this should be
+//	              set to 0.
+//	chunk_size  - Number of records to be included in the chunk.
 //
 // The query outputs zero or a single row with one column. After the query has
 // returned the last chunk, subsequent queries (with previous_id = last row ID
 // of last chunk) return no rows.
 //
-//     id - The ID of the last row included in the chunk.
+//	id - The ID of the last row included in the chunk.
 const nextFilesChunkQuery = meda.GenericQuery(`
 	(
 		SELECT
@@ -80,18 +80,18 @@ const nextFilesChunkQuery = meda.GenericQuery(`
 //
 // The query requires several parameters:
 //
-//     run_id           - The ID of the run for which the synchronisation
-//                        takes place.
-//     incremental_mode - 1 if the synchronisation takes place in incremental
-//                        mode, 0 otherwise.
-//     incremental_mode - 1 if the synchronisation takes place in incremental
-//                        mode, 0 otherwise.
-//     run_id           - The ID of the run for which the synchronisation
-//                        takes place.
-//     prev_inserts_id  - The last ID of the inserts table included in the
-//                        previous chunk.
-//     last_inserts_id  - The last ID of the inserts table included in the
-//                        current chunk.
+//	run_id           - The ID of the run for which the synchronisation
+//	                   takes place.
+//	incremental_mode - 1 if the synchronisation takes place in incremental
+//	                   mode, 0 otherwise.
+//	incremental_mode - 1 if the synchronisation takes place in incremental
+//	                   mode, 0 otherwise.
+//	run_id           - The ID of the run for which the synchronisation
+//	                   takes place.
+//	prev_inserts_id  - The last ID of the inserts table included in the
+//	                   previous chunk.
+//	last_inserts_id  - The last ID of the inserts table included in the
+//	                   current chunk.
 //
 // The to_be_read field is set to 1 if not running in incremental mode. In
 // incremental mode the field is set to 1 if the modification_time differs.
@@ -151,12 +151,12 @@ const updateQuery = meda.GenericQuery(`
 //
 // The query requires one parameter:
 //
-//     run_id          - The ID of the run for which the synchronisation takes
-//                       place.
-//     prev_inserts_id - The last ID of the inserts table included in the
-//                       previous chunk.
-//     last_inserts_id - The last ID of the inserts table included in the
-//                        current chunk.
+//	run_id          - The ID of the run for which the synchronisation takes
+//	                  place.
+//	prev_inserts_id - The last ID of the inserts table included in the
+//	                  previous chunk.
+//	last_inserts_id - The last ID of the inserts table included in the
+//	                   current chunk.
 //
 // After execution, the number of inserted / copied rows can be retrieved
 // using RowsAffected().
@@ -181,12 +181,12 @@ const insertQuery = meda.GenericQuery(`
 //
 // The query requires one parameter:
 //
-//     run_id        - The ID of the run for which the synchronisation takes
-//                     place.
-//     prev_files_id - The last ID of the files table included in the previous
-//                     chunk.
-//     last_files_id - The last ID of the files table included in the current
-//                     chunk.
+//	run_id        - The ID of the run for which the synchronisation takes
+//	                place.
+//	prev_files_id - The last ID of the files table included in the previous
+//	                chunk.
+//	last_files_id - The last ID of the files table included in the current
+//	                chunk.
 //
 // After execution, the number of deleted rows can be retrieved using
 // RowsAffected().
diff --git a/master/workqueue/writebacker.go b/master/workqueue/writebacker.go
@@ -383,7 +383,7 @@ func (w *WriteBacker) issueChecksumWarning(ctx context.Context, file *meda.File,
 	if err != nil {
 		err = pkgErrors.Wrap(err, "(*WriteBacker).issueChecksumWarning")
 		fieldLogger.WithError(err).WithFields(log.Fields{
-			"action":                 "escalating",
+			"action": "escalating",
 		}).Error("Encountered error while issuing checksum warning")
 	}
 
diff --git a/meda/types.go b/meda/types.go
@@ -81,7 +81,7 @@ func (t Time) Value() (driver.Value, error) {
 // values! However, the most common mysql database driver does not support
 // uint64 at all.
 //
-//     https://github.com/go-sql-driver/mysql/issues/715
+//	https://github.com/go-sql-driver/mysql/issues/715
 type NullUint64 struct {
 	Uint64 uint64
 	Valid  bool
diff --git a/scaleadpt/driver_cli.go b/scaleadpt/driver_cli.go
@@ -40,7 +40,7 @@ const gpfsMountType = "gpfs"
 // The implementation is an adapted copy of the gofsutil's
 // defaultEntryScanFunc, see:
 //
-//    https://github.com/akutz/gofsutil/blob/master/gofsutil_mount.go#L99
+//	https://github.com/akutz/gofsutil/blob/master/gofsutil_mount.go#L99
 func gpfsEntryScan(ctx context.Context, entry gofsutil.Entry, cache map[string]gofsutil.Entry) (gofsutil.Info, bool, error) {
 	var info gofsutil.Info
 
@@ -105,8 +105,8 @@ var _ error = &CLIGPFSError{}
 
 // CLIGPFSError is an error type containing GPFS specific information.
 //
-//   https://www.ibm.com/support/knowledgecenter/en/STXKQY_4.2.3/com.ibm.spectrum.scale.v4r23.doc/bl1pdg_message.htm
-//   https://www.ibm.com/support/knowledgecenter/STXKQY_4.2.3/com.ibm.spectrum.scale.v4r23.doc/bl1pdg_messageseveritytags.htm
+//	https://www.ibm.com/support/knowledgecenter/en/STXKQY_4.2.3/com.ibm.spectrum.scale.v4r23.doc/bl1pdg_message.htm
+//	https://www.ibm.com/support/knowledgecenter/STXKQY_4.2.3/com.ibm.spectrum.scale.v4r23.doc/bl1pdg_messageseveritytags.htm
 type CLIGPFSError struct {
 	CLIError
 
@@ -716,14 +716,14 @@ func (g *gpfsCmdOutReader) ReadRow() ([]string, error) {
 //
 // Scan allows simplified access similar to bufio.Scanner.
 //
-//    for reader.Scan() {
-//    	row := reader.Row()
+//	for reader.Scan() {
+//		row := reader.Row()
 //
-//    	// do something with row
-//    }
-//    if err = reader.Err(); err != nil {
-//    	return nil, err
-//    }
+//		// do something with row
+//	}
+//	if err = reader.Err(); err != nil {
+//		return nil, err
+//	}
 func (g *gpfsCmdOutReader) Scan() bool {
 	row, err := g.ReadRow()
 	if err != nil {
diff --git a/scaleadpt/filelist/unescapeurl.go b/scaleadpt/filelist/unescapeurl.go
@@ -30,10 +30,10 @@ func appendUnescapeUrl(dst, in []byte) ([]byte, error) {
 		}
 
 		dst = append(dst, in[:ind]...)
-		if ind + 2 >= len(in) {
+		if ind+2 >= len(in) {
 			return dst, errInvalidEscape
 		}
-		dst = append(dst, hexToInt(in[ind+1])<<4 + hexToInt(in[ind+2]))
+		dst = append(dst, hexToInt(in[ind+1])<<4+hexToInt(in[ind+2]))
 
 		in = in[ind+3:]
 	}
diff --git a/scaleadpt/snapshot.go b/scaleadpt/snapshot.go
@@ -27,7 +27,7 @@ func (s *Snapshot) Delete() error {
 // It contains all information in the output of the mmsnapdir command, see the
 // reference for more details:
 //
-//    https://www.ibm.com/support/knowledgecenter/en/STXKQY_4.2.3/com.ibm.spectrum.scale.v4r23.doc/bl1adm_mmsnapdir.htm
+//	https://www.ibm.com/support/knowledgecenter/en/STXKQY_4.2.3/com.ibm.spectrum.scale.v4r23.doc/bl1adm_mmsnapdir.htm
 type SnapshotDirsInfo struct {
 	// Global is the name of the global snapshots subdirectory.
 	Global string
diff --git a/tools/e2e-tester/main.go b/tools/e2e-tester/main.go
@@ -9,8 +9,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"gopkg.in/yaml.v3"
 	_ "github.com/go-sql-driver/mysql"
+	"gopkg.in/yaml.v3"
 
 	"git.scc.kit.edu/sdm/lsdf-checksum/scaleadpt"
 )
@@ -168,7 +168,7 @@ func clearDatabase(driver, dataSourceName string) error {
 		}
 	}
 
-	_, err = tx.ExecContext(ctx, "SET FOREIGN_KEY_CHECKS = 1;");
+	_, err = tx.ExecContext(ctx, "SET FOREIGN_KEY_CHECKS = 1;")
 	if err != nil {
 		return fmt.Errorf("clearDatabase: enable foreign key checks: %w", err)
 	}
diff --git a/workqueue/scheduler/oderbook.go b/workqueue/scheduler/oderbook.go
@@ -8,7 +8,7 @@ import (
 type orderBookOrder struct {
 	total     int
 	fulfilled int
-	book     *orderBook
+	book      *orderBook
 }
 
 func (o *orderBookOrder) Total() int {
@@ -133,7 +133,7 @@ func (o *orderBook) AcquireOrder(ctx context.Context, max uint) (orderBookOrder,
 			}
 			return orderBookOrder{
 				total: int(c),
-				book: o,
+				book:  o,
 			}, nil
 		}
 	}
diff --git a/workqueue/scheduler/scheduler.go b/workqueue/scheduler/scheduler.go
@@ -85,8 +85,8 @@ type Scheduler[T workqueue.JobPayload] struct {
 
 func New[T workqueue.JobPayload](queue *workqueue.QueueClient[T], config Config) *Scheduler[T] {
 	return &Scheduler[T]{
-		config: config,
-		queue: queue,
+		config:    config,
+		queue:     queue,
 		orderBook: *newOrderBook(),
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ func (w WriteBacker) issueChecksumWarning(ctx context.Context, file meda.File,`
`383`	`383`	`if err != nil {`
`384`	`384`	`err = pkgErrors.Wrap(err, "(*WriteBacker).issueChecksumWarning")`
`385`	`385`	`fieldLogger.WithError(err).WithFields(log.Fields{`
`386`		`- "action": "escalating",`
	`386`	`+ "action": "escalating",`
`387`	`387`	`}).Error("Encountered error while issuing checksum warning")`
`388`	`388`	`}`
`389`	`389`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ func appendUnescapeUrl(dst, in []byte) ([]byte, error) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`dst = append(dst, in[:ind]...)`
`33`		`- if ind + 2 >= len(in) {`
	`33`	`+ if ind+2 >= len(in) {`
`34`	`34`	`return dst, errInvalidEscape`
`35`	`35`	`}`
`36`		`- dst = append(dst, hexToInt(in[ind+1])<<4 + hexToInt(in[ind+2]))`
	`36`	`+ dst = append(dst, hexToInt(in[ind+1])<<4+hexToInt(in[ind+2]))`
`37`	`37`
`38`	`38`	`in = in[ind+3:]`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`"os/exec"`
`10`	`10`	`"path/filepath"`
`11`	`11`
`12`		`- "gopkg.in/yaml.v3"`
`13`	`12`	`_ "github.com/go-sql-driver/mysql"`
	`13`	`+ "gopkg.in/yaml.v3"`
`14`	`14`
`15`	`15`	`"git.scc.kit.edu/sdm/lsdf-checksum/scaleadpt"`
`16`	`16`	`)`
`@@ -168,7 +168,7 @@ func clearDatabase(driver, dataSourceName string) error {`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`171`		`- _, err = tx.ExecContext(ctx, "SET FOREIGN_KEY_CHECKS = 1;");`
	`171`	`+ _, err = tx.ExecContext(ctx, "SET FOREIGN_KEY_CHECKS = 1;")`
`172`	`172`	`if err != nil {`
`173`	`173`	`return fmt.Errorf("clearDatabase: enable foreign key checks: %w", err)`
`174`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`type orderBookOrder struct {`
`9`	`9`	`total int`
`10`	`10`	`fulfilled int`
`11`		`- book *orderBook`
	`11`	`+ book *orderBook`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`func (o *orderBookOrder) Total() int {`
`@@ -133,7 +133,7 @@ func (o *orderBook) AcquireOrder(ctx context.Context, max uint) (orderBookOrder,`
`133`	`133`	`}`
`134`	`134`	`return orderBookOrder{`
`135`	`135`	`total: int(c),`
`136`		`- book: o,`
	`136`	`+ book: o,`
`137`	`137`	`}, nil`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ type Scheduler[T workqueue.JobPayload] struct {`
`85`	`85`
`86`	`86`	`func New[T workqueue.JobPayload](queue workqueue.QueueClient[T], config Config) Scheduler[T] {`
`87`	`87`	`return &Scheduler[T]{`
`88`		`- config: config,`
`89`		`- queue: queue,`
	`88`	`+ config: config,`
	`89`	`+ queue: queue,`
`90`	`90`	`orderBook: *newOrderBook(),`
`91`	`91`	`}`
`92`	`92`	`}`