lint: gofumpt (#996)

* lint: gofumpt * golangci-lint --fix --------- Co-authored-by: lance6716 <lance6716@gmail.com>

Author: serprex

.golangci.yml

@@ -3,18 +3,19 @@ linters:
  enable:
  # All code is ready for:
  - errcheck
- - staticcheck
- - typecheck
- - unused
- - misspell
- - nolintlint
+ - gofumpt
  - goimports
- - nakedret
- - unconvert
- - whitespace
  - govet
  - gosimple
  - ineffassign
+ - misspell
+ - nakedret
+ - nolintlint
+ - staticcheck
+ - typecheck
+ - unconvert
+ - unused
+ - whitespace
  # ToDo:
  #- gocritic
  #- golint

canal/canal.go

@@ -58,8 +58,10 @@ type Canal struct {
 }
 
 // canal will retry fetching unknown table's meta after UnknownTableRetryPeriod
-var UnknownTableRetryPeriod = time.Second * time.Duration(10)
-var ErrExcludedTable = errors.New("excluded table meta")
+var (
+UnknownTableRetryPeriod = time.Second * time.Duration(10)
+ErrExcludedTable = errors.New("excluded table meta")
+)
 
 func NewCanal(cfg *Config) (*Canal, error) {
 c := new(Canal)

canal/canal_test.go

@@ -230,6 +230,7 @@ func TestCreateTableExp(t *testing.T) {
 }
 }
 }
+
 func TestAlterTableExp(t *testing.T) {
 cases := []string{
 "ALTER TABLE /*generated by server*/ `mydb`.`mytable` ADD `field2` DATE NULL AFTER `field1`;",

canal/handler.go

@@ -24,15 +24,16 @@ type EventHandler interface {
 String() string
 }
 
-type DummyEventHandler struct {
-}
+type DummyEventHandler struct{}
 
 func (h *DummyEventHandler) OnRotate(*replication.EventHeader, *replication.RotateEvent) error {
 return nil
 }
+
 func (h *DummyEventHandler) OnTableChanged(*replication.EventHeader, string, string) error {
 return nil
 }
+
 func (h *DummyEventHandler) OnDDL(*replication.EventHeader, mysql.Position, *replication.QueryEvent) error {
 return nil
 }
@@ -41,9 +42,11 @@ func (h *DummyEventHandler) OnXID(*replication.EventHeader, mysql.Position) erro
 func (h *DummyEventHandler) OnGTID(*replication.EventHeader, mysql.BinlogGTIDEvent) error {
 return nil
 }
+
 func (h *DummyEventHandler) OnPosSynced(*replication.EventHeader, mysql.Position, mysql.GTIDSet, bool) error {
 return nil
 }
+
 func (h *DummyEventHandler) OnRowsQueryEvent(*replication.RowsQueryEvent) error {
 return nil
 }

canal/rows_test.go

@@ -28,20 +28,24 @@ func TestRowsEvent_handleUnsigned(t *testing.T) {
 // column 10 is out of range and should be ignored, don't panic.
 UnsignedColumns: []int{1, 3, 5, 7, 9, 10},
 },
-Rows: [][]interface{}{{
-int8(8), int8(8),
-int16(16), int16(16),
-int32(32), int32(32),
-int64(64), int64(64),
-int(128), int(128)},
+Rows: [][]interface{}{
+{
+int8(8), int8(8),
+int16(16), int16(16),
+int32(32), int32(32),
+int64(64), int64(64),
+int(128), int(128),
+},
 },
 },
-wantRows: [][]interface{}{{
-int8(8), uint8(8),
-int16(16), uint16(16),
-int32(32), uint32(32),
-int64(64), uint64(64),
-int(128), uint(128)},
+wantRows: [][]interface{}{
+{
+int8(8), uint8(8),
+int16(16), uint16(16),
+int32(32), uint32(32),
+int64(64), uint64(64),
+int(128), uint(128),
+},
 },
 },
 }

canal/sync.go

@@ -252,6 +252,7 @@ func (c *Canal) updateTable(header *replication.EventHeader, db, table string) (
 }
 return
 }
+
 func (c *Canal) updateReplicationDelay(ev *replication.BinlogEvent) {
 var newDelay uint32
 now := uint32(utils.Now().Unix())

client/common_test.go

@@ -4,6 +4,8 @@ import (
 "flag"
 )
 
-var testUser = flag.String("user", "root", "MySQL user")
-var testPassword = flag.String("pass", "", "MySQL password")
-var testDB = flag.String("db", "test", "MySQL test database")
+var (
+testUser = flag.String("user", "root", "MySQL user")
+testPassword = flag.String("pass", "", "MySQL password")
+testDB = flag.String("db", "test", "MySQL test database")
+)

client/conn_test.go

@@ -203,7 +203,7 @@ func (s *connTestSuite) TestSetQueryAttributes() {
 err := s.c.SetQueryAttributes(qa)
 require.NoError(s.T(), err)
 expected := []mysql.QueryAttribute{
-mysql.QueryAttribute{
+{
 Name: "qattr1",
 Value: "qattr1val",
 },

client/example_client_test.go

@@ -11,11 +11,10 @@ func Example() {
 // Connect MySQL at 127.0.0.1:3306, with user root, an empty password and database test
 conn, err := client.Connect("127.0.0.1:3306", "root", "", "test")
 // Or to use SSL/TLS connection if MySQL server supports TLS
-//conn, err := client.Connect("127.0.0.1:3306", "root", "", "test", func(c *Conn) {c.UseSSL(true)})
-
+// conn, err := client.Connect("127.0.0.1:3306", "root", "", "test", func(c *Conn) {c.UseSSL(true)})
 // Or to set your own client-side certificates for identity verification for security
-//tlsConfig := NewClientTLSConfig(caPem, certPem, keyPem, false, "your-server-name")
-//conn, err := client.Connect("127.0.0.1:3306", "root", "", "test", func(c *Conn) {c.SetTLSConfig(tlsConfig)})
+// tlsConfig := NewClientTLSConfig(caPem, certPem, keyPem, false, "your-server-name")
+// conn, err := client.Connect("127.0.0.1:3306", "root", "", "test", func(c *Conn) {c.SetTLSConfig(tlsConfig)})
 if err != nil {
 msg := fmt.Sprintf(`
 This example needs a MySQL listening on 127.0.0.1:3006 with user "root" and 

client/pool.go

@@ -569,9 +569,9 @@ func (pool *Pool) ping(conn *Conn) error {
 // So before call Close, Call PutConn to put all connections that in use back to connection pool first.
 func (pool *Pool) Close() {
 pool.cancel()
-//wait newConnectionProducer exit.
+// wait newConnectionProducer exit.
 pool.wg.Wait()
-//close idle connections
+// close idle connections
 pool.synchro.Lock()
 for _, connection := range pool.synchro.idleConnections {
 pool.synchro.stats.TotalCount--