*: fix 'db' and 'Info' column of 'show processlist' (pingcap#10985) (p…

…ingcap#11000)
bb7133 · Jul 1, 2019 · d8defc5 · d8defc5
1 parent db151cc
commit d8defc5
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 11 deletions.
diff --git a/infoschema/tables.go b/infoschema/tables.go
@@ -526,7 +526,7 @@ var tableProcesslistCols = []columnInfo{
 	{"ID", mysql.TypeLonglong, 21, mysql.NotNullFlag, 0, nil},
 	{"USER", mysql.TypeVarchar, 16, mysql.NotNullFlag, "", nil},
 	{"HOST", mysql.TypeVarchar, 64, mysql.NotNullFlag, "", nil},
-	{"DB", mysql.TypeVarchar, 64, mysql.NotNullFlag, "", nil},
+	{"DB", mysql.TypeVarchar, 64, 0, nil, nil},
 	{"COMMAND", mysql.TypeVarchar, 16, mysql.NotNullFlag, "", nil},
 	{"TIME", mysql.TypeLong, 7, mysql.NotNullFlag, 0, nil},
 	{"STATE", mysql.TypeVarchar, 7, 0, nil, nil},

diff --git a/infoschema/tables_test.go b/infoschema/tables_test.go
@@ -334,6 +334,52 @@ func (s *testTableSuite) TestSomeTables(c *C) {
 			fmt.Sprintf("1 user-1 localhost information_schema Quit 9223372036 1 %s 0", "do something"),
 			fmt.Sprintf("2 user-2 localhost test Init DB 9223372036 2 %s 0", strings.Repeat("x", 101)),
 		))
+
+	sm = &mockSessionManager{make(map[uint64]*util.ProcessInfo, 2)}
+	sm.processInfoMap[1] = &util.ProcessInfo{
+		ID:      1,
+		User:    "user-1",
+		Host:    "localhost",
+		DB:      "information_schema",
+		Command: byte(1),
+		State:   1,
+		Info:    nil,
+		StmtCtx: tk.Se.GetSessionVars().StmtCtx,
+	}
+	sm.processInfoMap[2] = &util.ProcessInfo{
+		ID:      2,
+		User:    "user-2",
+		Host:    "localhost",
+		DB:      nil,
+		Command: byte(2),
+		State:   2,
+		Info:    strings.Repeat("x", 101),
+		StmtCtx: tk.Se.GetSessionVars().StmtCtx,
+	}
+	tk.Se.SetSessionManager(sm)
+	tk.MustQuery("select * from information_schema.PROCESSLIST order by ID;").Check(
+		testkit.Rows(
+			fmt.Sprintf("1 user-1 localhost information_schema Quit 9223372036 1 %s 0", "<nil>"),
+			fmt.Sprintf("2 user-2 localhost <nil> Init DB 9223372036 2 %s 0", strings.Repeat("x", 101)),
+		))
+	tk.MustQuery("SHOW PROCESSLIST;").Sort().Check(
+		testkit.Rows(
+			fmt.Sprintf("1 user-1 localhost information_schema Quit 9223372036 1 %s 0", "<nil>"),
+			fmt.Sprintf("2 user-2 localhost <nil> Init DB 9223372036 2 %s 0", strings.Repeat("x", 100)),
+		))
+	tk.MustQuery("SHOW FULL PROCESSLIST;").Sort().Check(
+		testkit.Rows(
+			fmt.Sprintf("1 user-1 localhost information_schema Quit 9223372036 1 %s 0", "<nil>"),
+			fmt.Sprintf("2 user-2 localhost <nil> Init DB 9223372036 2 %s 0", strings.Repeat("x", 101)),
+		))
+	tk.MustQuery("select * from information_schema.PROCESSLIST where db is null;").Check(
+		testkit.Rows(
+			fmt.Sprintf("2 user-2 localhost <nil> Init DB 9223372036 2 %s 0", strings.Repeat("x", 101)),
+		))
+	tk.MustQuery("select * from information_schema.PROCESSLIST where Info is null;").Check(
+		testkit.Rows(
+			fmt.Sprintf("1 user-1 localhost information_schema Quit 9223372036 1 %s 0", "<nil>"),
+		))
 }
 
 func (s *testSuite) TestSchemataCharacterSet(c *C) {

diff --git a/session/session.go b/session/session.go
@@ -792,13 +792,22 @@ func (s *session) ParseSQL(ctx context.Context, sql, charset, collation string)
 }
 
 func (s *session) SetProcessInfo(sql string, t time.Time, command byte, maxExecutionTime uint64) {
+	var db interface{}
+	if len(s.sessionVars.CurrentDB) > 0 {
+		db = s.sessionVars.CurrentDB
+	}
+
+	var info interface{}
+	if len(sql) > 0 {
+		info = sql
+	}
 	pi := util.ProcessInfo{
 		ID:      s.sessionVars.ConnectionID,
-		DB:      s.sessionVars.CurrentDB,
+		DB:      db,
 		Command: command,
 		Time:    t,
 		State:   s.Status(),
-		Info:    sql,
+		Info:    info,
 		StmtCtx: s.sessionVars.StmtCtx,
 
 		MaxExecutionTime: maxExecutionTime,

diff --git a/util/expensivequery/expensivequery.go b/util/expensivequery/expensivequery.go
@@ -49,7 +49,7 @@ func (eqh *Handle) Run() {
 		case <-ticker.C:
 			processInfo := eqh.sm.ShowProcessList()
 			for _, info := range processInfo {
-				if len(info.Info) == 0 {
+				if info.Info == nil {
 					continue
 				}
 				costTime := time.Since(info.Time)

diff --git a/util/processinfo.go b/util/processinfo.go
@@ -26,11 +26,11 @@ type ProcessInfo struct {
 	ID      uint64
 	User    string
 	Host    string
-	DB      string
+	DB      interface{}
 	Command byte
 	Time    time.Time
 	State   uint16
-	Info    string
+	Info    interface{}
 	StmtCtx *stmtctx.StatementContext
 	// MaxExecutionTime is the timeout for select statement, in milliseconds.
 	// If the query takes too long, kill it.
@@ -39,11 +39,13 @@ type ProcessInfo struct {
 
 // ToRowForShow returns []interface{} for the row data of "SHOW [FULL] PROCESSLIST".
 func (pi *ProcessInfo) ToRowForShow(full bool) []interface{} {
-	var info string
-	if full {
-		info = pi.Info
-	} else {
-		info = fmt.Sprintf("%.100v", pi.Info)
+	var info interface{}
+	if pi.Info != nil {
+		if full {
+			info = pi.Info.(string)
+		} else {
+			info = fmt.Sprintf("%.100v", pi.Info.(string))
+		}
 	}
 	t := uint64(time.Since(pi.Time) / time.Second)
 	return []interface{}{