From d59d3aa86ef9b68c22793ea3c1f0a49c4c6a12c5 Mon Sep 17 00:00:00 2001
From: keyixie <keyixie@tencent.com>
Date: Tue, 12 Nov 2019 20:56:48 +0800
Subject: [PATCH] Makefile: Replace Gometalinter to Golangci-lint

---
 Makefile                   | 13 ++++++-------
 executor/simple.go         |  2 --
 server/sql_info_fetcher.go |  1 -
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index ca04834d3d622..7f9ff809ce649 100644
--- a/Makefile
+++ b/Makefile
@@ -83,13 +83,10 @@ goword:tools/bin/goword
 gosec:tools/bin/gosec
 	tools/bin/gosec $$($(PACKAGE_DIRECTORIES))
 
-check-static:tools/bin/gometalinter tools/bin/misspell tools/bin/ineffassign
-	@ # TODO: enable megacheck.
-	@ # TODO: gometalinter has been DEPRECATED.
-	@ # https://github.com/alecthomas/gometalinter/issues/590
-	tools/bin/gometalinter --disable-all --deadline 120s \
-	  --enable misspell \
-	  --enable ineffassign \
+check-static: tools/bin/golangci-lint
+	tools/bin/golangci-lint run -v --disable-all --deadline=3m \
+	  --enable=misspell \
+	  --enable=ineffassign \
 	  $$($(PACKAGE_DIRECTORIES))
 
 check-slow:tools/bin/gometalinter tools/bin/gosec
@@ -271,6 +268,8 @@ tools/bin/misspell:tools/check/go.mod
 tools/bin/ineffassign:tools/check/go.mod
 	cd tools/check; \
 	$(GO) build -o ../bin/ineffassign github.com/gordonklaus/ineffassign
+tools/bin/golangci-lint:
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ./tools/bin v1.21.0
 
 # Usage:
 #
diff --git a/executor/simple.go b/executor/simple.go
index b949de2f3f580..0c12411a91095 100644
--- a/executor/simple.go
+++ b/executor/simple.go
@@ -722,7 +722,6 @@ func (e *SimpleExec) executeAlterUser(s *ast.AlterUserStmt) error {
 }
 
 func (e *SimpleExec) executeGrantRole(s *ast.GrantRoleStmt) error {
-	failedUsers := make([]string, 0, len(s.Users))
 	sessionVars := e.ctx.GetSessionVars()
 	for i, user := range s.Users {
 		if user.CurrentUser {
@@ -759,7 +758,6 @@ func (e *SimpleExec) executeGrantRole(s *ast.GrantRoleStmt) error {
 		for _, role := range s.Roles {
 			sql := fmt.Sprintf(`INSERT IGNORE INTO %s.%s (FROM_HOST, FROM_USER, TO_HOST, TO_USER) VALUES ('%s','%s','%s','%s')`, mysql.SystemDB, mysql.RoleEdgeTable, role.Hostname, role.Username, user.Hostname, user.Username)
 			if _, err := e.ctx.(sqlexec.SQLExecutor).Execute(context.Background(), sql); err != nil {
-				failedUsers = append(failedUsers, user.String())
 				logutil.BgLogger().Error(fmt.Sprintf("Error occur when executing %s", sql))
 				if _, err := e.ctx.(sqlexec.SQLExecutor).Execute(context.Background(), "rollback"); err != nil {
 					return err
diff --git a/server/sql_info_fetcher.go b/server/sql_info_fetcher.go
index 204233d8acd42..0a251d7fc6665 100644
--- a/server/sql_info_fetcher.go
+++ b/server/sql_info_fetcher.go
@@ -250,7 +250,6 @@ func (sh *sqlInfoFetcher) getExplainAnalyze(ctx context.Context, sql string, res
 	rows, err := session.ResultSetToStringSlice(ctx, sh.s, recordSets[0])
 	if err != nil {
 		terror.Log(err)
-		rows = nil
 		return
 	}
 	resultChan <- &explainAnalyzeResult{rows: rows}