address comment

Author: imtbkcat

executor/errors.go

@@ -49,6 +49,7 @@ var (
 	ErrTableaccessDenied           = terror.ClassExecutor.New(mysql.ErrTableaccessDenied, mysql.MySQLErrName[mysql.ErrTableaccessDenied])
 	ErrBadDB                       = terror.ClassExecutor.New(mysql.ErrBadDB, mysql.MySQLErrName[mysql.ErrBadDB])
 	ErrWrongObject                 = terror.ClassExecutor.New(mysql.ErrWrongObject, mysql.MySQLErrName[mysql.ErrWrongObject])
+	ErrRoleNotGranted              = terror.ClassPrivilege.New(mysql.ErrRoleNotGranted, mysql.MySQLErrName[mysql.ErrRoleNotGranted])
 )
 
 func init() {

executor/simple.go

@@ -103,10 +103,8 @@ func (e *SimpleExec) executeSetRole(s *ast.SetRoleStmt) error {
 	checker := privilege.GetPrivilegeManager(e.ctx)
 	ok, roleName := checker.ActiveRoles(e.ctx, roleList)
 	if !ok {
-		errCode := mysql.ErrRoleNotGranted
-		errRoleNotGranted := terror.ClassPrivilege.New(terror.ErrCode(errCode), mysql.MySQLErrName[uint16(errCode)])
 		u := e.ctx.GetSessionVars().User
-		return errRoleNotGranted.GenWithStackByArgs(roleName, u.String())
+		return ErrRoleNotGranted.GenWithStackByArgs(roleName, u.String())
 	}
 	return nil
 }

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/go-sql-driver/mysql v0.0.0-20170715192408-3955978caca4
 	github.com/gogo/protobuf v1.2.0 // indirect
 	github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
-	github.com/golang/protobuf v1.2.0
+	github.com/golang/protobuf v1.3.0
 	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
 	github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c
 	github.com/gorilla/context v1.1.1 // indirect
@@ -58,7 +58,7 @@ require (
 	github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 // indirect
 	github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446 // indirect
-	github.com/shirou/gopsutil v2.18.10+incompatible
+	github.com/shirou/gopsutil v2.18.12+incompatible
 	github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20181020040650-a97a25d856ca // indirect
 	github.com/sirupsen/logrus v1.2.0
@@ -88,4 +88,4 @@ require (
 	sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67
 )
 
-replace github.com/pingcap/parser => github.com/imtbkcat/parser v0.0.0-20190306131438-36bf9d091519
+replace github.com/pingcap/parser => github.com/imtbkcat/parser setrole

go.sum

@@ -75,7 +75,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.5.1 h1:3scN4iuXkNOyP98jF55Lv8a9j1o/Iwv
 github.com/grpc-ecosystem/grpc-gateway v1.5.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imtbkcat/parser v0.0.0-20190306131438-36bf9d091519/go.mod h1:qupHD3o7J0aBb3bbVyXRnxe9kKy2MTY/6POS6NO/Ei8=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=

privilege/privileges/cache.go

@@ -106,12 +106,12 @@ type columnsPrivRecord struct {
 }
 
 // RoleGraphEdgesTable is used to cache relationship between and role.
-type RoleGraphEdgesTable struct {
+type roleGraphEdgesTable struct {
 	roleList map[string]bool
 }
 
 // Find method is used to find role from table
-func (g RoleGraphEdgesTable) Find(user, host string) bool {
+func (g roleGraphEdgesTable) Find(user, host string) bool {
 	if host == "" {
 		host = "%"
 	}
@@ -120,10 +120,7 @@ func (g RoleGraphEdgesTable) Find(user, host string) bool {
 		return false
 	}
 	_, ok := g.roleList[key]
-	if ok {
-		return true
-	}
-	return false
+	return ok
 }
 
 // MySQLPrivilege is the in-memory cache of mysql privilege tables.
@@ -132,10 +129,10 @@ type MySQLPrivilege struct {
 	DB          []dbRecord
 	TablesPriv  []tablesPrivRecord
 	ColumnsPriv []columnsPrivRecord
-	RoleGraph   map[string]RoleGraphEdgesTable
+	RoleGraph   map[string]roleGraphEdgesTable
 }
 
-// FindRole is used to detect whether this is an edge between user and role
+// FindRole is used to detect whether there is edges between users and roles.
 func (p *MySQLPrivilege) FindRole(user string, host string, role *auth.RoleIdentity) bool {
 	rec := p.matchUser(user, host)
 	r := p.matchUser(role.Username, role.Hostname)
@@ -199,7 +196,7 @@ func noSuchTable(err error) bool {
 
 // LoadRoleGraph loads the mysql.role_edges table from database.
 func (p *MySQLPrivilege) LoadRoleGraph(ctx sessionctx.Context) error {
-	p.RoleGraph = make(map[string]RoleGraphEdgesTable)
+	p.RoleGraph = make(map[string]roleGraphEdgesTable)
 	err := p.loadTable(ctx, "select FROM_USER, FROM_HOST, TO_USER, TO_HOST from mysql.role_edges;", p.decodeRoleEdgesTable)
 	if err != nil {
 		return errors.Trace(err)
@@ -449,12 +446,12 @@ func (p *MySQLPrivilege) decodeRoleEdgesTable(row chunk.Row, fs []*ast.ResultFie
 	}
 	fromKey := fromUser + "@" + fromHost
 	toKey := toUser + "@" + toHost
-	if _, ok := p.RoleGraph[toKey]; ok {
-		p.RoleGraph[toKey].roleList[fromKey] = true
-	} else {
-		p.RoleGraph[toKey] = RoleGraphEdgesTable{roleList: make(map[string]bool)}
-		p.RoleGraph[toKey].roleList[fromKey] = true
+	roleGraph, ok := p.RoleGraph[toKey]
+	if !ok {
+		roleGraph = roleGraphEdgesTable{roleList: make(map[string]bool)}
+		p.RoleGraph[toKey] = roleGraph
 	}
+	roleGraph.roleList[fromKey] = true
 	return nil
 }