sessionctx: remove statusVars

yts1dx · Nov 18, 2015 · 06f285c · 06f285c
1 parent e804b23
commit 06f285c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/sessionctx/variable/statusvar.go b/sessionctx/variable/statusvar.go
@@ -17,7 +17,6 @@ import (
 	"github.com/juju/errors"
 )
 
-var statusVars map[string]*StatusVal
 var statisticsList []Statistics
 var globalStatusScopes = make(map[string]ScopeFlag)
 
@@ -45,8 +44,7 @@ func RegisterStatistics(s Statistics) {
 
 // GetStatusVars gets registered statistics status variables.
 func GetStatusVars() (map[string]*StatusVal, error) {
-	statusVars = make(map[string]*StatusVal)
-	ret := make(map[string]*StatusVal)
+	statusVars := make(map[string]*StatusVal)
 
 	for _, statistics := range statisticsList {
 		vals, err := statistics.Stats()
@@ -57,7 +55,6 @@ func GetStatusVars() (map[string]*StatusVal, error) {
 		for name, val := range vals {
 			scope := statistics.GetScope(name)
 			statusVars[name] = &StatusVal{Value: val, Scope: scope}
-			ret[name] = &StatusVal{Value: val, Scope: scope}
 		}
 	}
 
@@ -67,10 +64,10 @@ func GetStatusVars() (map[string]*StatusVal, error) {
 	}
 	for status := range defaultStatusVars {
 		// To get more accurate value from the global status variables table.
-		ret[status] = &StatusVal{Scope: DefaultScopeFlag}
+		statusVars[status] = &StatusVal{Scope: DefaultScopeFlag}
 	}
 
-	return ret, nil
+	return statusVars, nil
 }
 
 // GetDefaultStatusVars gets status variables from the global status variables table.

diff --git a/sessionctx/variable/statusvar_test.go b/sessionctx/variable/statusvar_test.go
@@ -65,8 +65,6 @@ func (s *testStatusVarSuite) TestStatusVar(c *C) {
 
 	vars, err := GetStatusVars()
 	c.Assert(err, IsNil)
-	for status, val := range vars {
-		v := statusVars[status]
-		c.Assert(v, DeepEquals, val)
-	}
+	v := &StatusVal{Scope: DefaultScopeFlag, Value: testStatusVal}
+	c.Assert(v, DeepEquals, vars[testStatus])
 }