remove an unnecessary argument (pingcap#9857)

cqlxcnp · Mar 22, 2019 · e53b56b · e53b56b
1 parent f478af0
commit e53b56b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/executor/show.go b/executor/show.go
@@ -236,7 +236,7 @@ func (e *ShowExec) fetchShowProcessList() error {
 		if !hasProcessPriv && pi.User != loginUser.Username {
 			continue
 		}
-		row := pi.ToRow(mysql.Command2Str, e.Full)
+		row := pi.ToRow(e.Full)
 		e.appendRow(row)
 	}
 	return nil

diff --git a/infoschema/tables.go b/infoschema/tables.go
@@ -640,7 +640,7 @@ func dataForProcesslist(ctx sessionctx.Context) [][]types.Datum {
 			continue
 		}
 
-		rows := pi.ToRow(mysql.Command2Str, true)
+		rows := pi.ToRow(true)
 		record := types.MakeDatums(rows...)
 		records = append(records, record)
 	}

diff --git a/util/processinfo.go b/util/processinfo.go
@@ -16,6 +16,8 @@ package util
 import (
 	"fmt"
 	"time"
+
+	"github.com/pingcap/parser/mysql"
 )
 
 // ProcessInfo is a struct used for show processlist statement.
@@ -31,7 +33,7 @@ type ProcessInfo struct {
 }
 
 // ToRow returns []interface{} for the row data of "show processlist" and "select * from infoschema.processlist".
-func (pi *ProcessInfo) ToRow(cmd2str map[byte]string, full bool) []interface{} {
+func (pi *ProcessInfo) ToRow(full bool) []interface{} {
 	var info string
 	if full {
 		info = pi.Info
@@ -44,7 +46,7 @@ func (pi *ProcessInfo) ToRow(cmd2str map[byte]string, full bool) []interface{} {
 		pi.User,
 		pi.Host,
 		pi.DB,
-		cmd2str[pi.Command],
+		mysql.Command2Str[pi.Command],
 		t,
 		fmt.Sprintf("%d", pi.State),
 		info,