enabled govet (#663)

* fixed unreachable code

* fixed unkeyed fields

* enabled govet in golangci

Co-authored-by: Reinier Schoof <[email protected]>

Author: skoef

.golangci.yml

@@ -15,9 +15,9 @@ linters:
     - nakedret
     - unconvert
     - whitespace
+    - govet
     # ToDo:
     #- gosimple
-    #- govet
     #- ineffassign
     #- gocritic
     #- golint
@@ -26,3 +26,10 @@ linters-settings:
     allow-unused: false
     allow-leading-space: false
     require-specific: true
+
+  govet:
+    enable-all: true
+    disable:
+      - fieldalignment
+      - lostcancel
+      - shadow

canal/sync.go

@@ -181,8 +181,6 @@ func (c *Canal) runSyncBinlog() error {
 			}
 		}
 	}
-
-	return nil
 }
 
 type node struct {
@@ -298,8 +296,6 @@ func (c *Canal) WaitUntilPos(pos mysql.Position, timeout time.Duration) error {
 			}
 		}
 	}
-
-	return nil
 }
 
 func (c *Canal) GetMasterPos() (mysql.Position, error) {

client/conn.go

@@ -263,24 +263,23 @@ func (c *Conn) FieldList(table string, wildcard string) ([]*Field, error) {
 	var f *Field
 	if data[0] == ERR_HEADER {
 		return nil, c.handleErrorPacket(data)
-	} else {
-		for {
-			if data, err = c.ReadPacket(); err != nil {
-				return nil, errors.Trace(err)
-			}
-
-			// EOF Packet
-			if c.isEOFPacket(data) {
-				return fs, nil
-			}
-
-			if f, err = FieldData(data).Parse(); err != nil {
-				return nil, errors.Trace(err)
-			}
-			fs = append(fs, f)
+	}
+
+	for {
+		if data, err = c.ReadPacket(); err != nil {
+			return nil, errors.Trace(err)
+		}
+
+		// EOF Packet
+		if c.isEOFPacket(data) {
+			return fs, nil
+		}
+
+		if f, err = FieldData(data).Parse(); err != nil {
+			return nil, errors.Trace(err)
 		}
+		fs = append(fs, f)
 	}
-	return nil, fmt.Errorf("field list error")
 }
 
 func (c *Conn) SetAutoCommit() error {

client/resp.go

@@ -29,7 +29,6 @@ func (c *Conn) readUntilEOF() (err error) {
 			return
 		}
 	}
-	return
 }
 
 func (c *Conn) isEOFPacket(data []byte) bool {

replication/backup.go

@@ -92,6 +92,4 @@ func (b *BinlogSyncer) StartBackup(backupDir string, p Position, timeout time.Du
 			return errors.Trace(io.ErrShortWrite)
 		}
 	}
-
-	return nil
 }

replication/json_binary.go

@@ -391,8 +391,6 @@ func (d *jsonBinaryDecoder) decodeOpaque(data []byte) interface{} {
 	default:
 		return hack.String(data)
 	}
-
-	return nil
 }
 
 func (d *jsonBinaryDecoder) decodeDecimal(data []byte) interface{} {

server/caching_sha2_cache_test.go

@@ -192,21 +192,33 @@ func (h *testCacheHandler) handleQuery(query string, binary bool) (*mysql.Result
 		if err != nil {
 			return nil, errors.Trace(err)
 		} else {
-			return &mysql.Result{0, 0, 0, 0, r}, nil
+			return &mysql.Result{
+				Status:       0,
+				Warnings:     0,
+				InsertId:     0,
+				AffectedRows: 0,
+				Resultset:    r,
+			}, nil
 		}
 	case "insert":
-		return &mysql.Result{0, 0, 1, 0, nil}, nil
-	case "delete":
-		return &mysql.Result{0, 0, 0, 1, nil}, nil
-	case "update":
-		return &mysql.Result{0, 0, 0, 1, nil}, nil
-	case "replace":
-		return &mysql.Result{0, 0, 0, 1, nil}, nil
+		return &mysql.Result{
+			Status:       0,
+			Warnings:     0,
+			InsertId:     1,
+			AffectedRows: 0,
+			Resultset:    nil,
+		}, nil
+	case "delete", "update", "replace":
+		return &mysql.Result{
+			Status:       0,
+			Warnings:     0,
+			InsertId:     0,
+			AffectedRows: 1,
+			Resultset:    nil,
+		}, nil
 	default:
 		return nil, fmt.Errorf("invalid query %s", query)
 	}
-
-	return nil, nil
 }
 
 func (h *testCacheHandler) HandleQuery(query string) (*mysql.Result, error) {

server/command.go

@@ -134,8 +134,6 @@ func (c *Conn) dispatch(data []byte) interface{} {
 	default:
 		return c.h.HandleOtherCommand(cmd, data)
 	}
-
-	return fmt.Errorf("command %d is not handled correctly", cmd)
 }
 
 type EmptyHandler struct {

server/server_test.go

@@ -239,21 +239,33 @@ func (h *testHandler) handleQuery(query string, binary bool) (*mysql.Result, err
 		if err != nil {
 			return nil, errors.Trace(err)
 		} else {
-			return &mysql.Result{0, 0, 0, 0, r}, nil
+			return &mysql.Result{
+				Status:       0,
+				Warnings:     0,
+				InsertId:     0,
+				AffectedRows: 0,
+				Resultset:    r,
+			}, nil
 		}
 	case "insert":
-		return &mysql.Result{0, 0, 1, 0, nil}, nil
-	case "delete":
-		return &mysql.Result{0, 0, 0, 1, nil}, nil
-	case "update":
-		return &mysql.Result{0, 0, 0, 1, nil}, nil
-	case "replace":
-		return &mysql.Result{0, 0, 0, 1, nil}, nil
+		return &mysql.Result{
+			Status:       0,
+			Warnings:     0,
+			InsertId:     1,
+			AffectedRows: 0,
+			Resultset:    nil,
+		}, nil
+	case "delete", "update", "replace":
+		return &mysql.Result{
+			Status:       0,
+			Warnings:     0,
+			InsertId:     0,
+			AffectedRows: 1,
+			Resultset:    nil,
+		}, nil
 	default:
 		return nil, fmt.Errorf("invalid query %s", query)
 	}
-
-	return nil, nil
 }
 
 func (h *testHandler) HandleQuery(query string) (*mysql.Result, error) {