database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #988 from pingcap/coocood/remove-restricted-var

Browse Source 
tidb: remove RestrictedSQLExecutorKey variable in context.
This commit is contained in:
Ewan Chou
2016-03-17 12:19:29 +08:00
parent cf2b1a2916 15356cdd88
commit de9f7c9965
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
session.go
View File

@ -45,7 +45,6 @@ import (
"github.com/pingcap/tidb/store/localstore"
"github.com/pingcap/tidb/terror"
"github.com/pingcap/tidb/util"
"github.com/pingcap/tidb/util/sqlexec"
"github.com/pingcap/tidb/util/types"
)
@ -251,11 +250,6 @@ func (s *session) Retry() error {
// ExecRestrictedSQL implements SQLHelper interface.
// This is used for executing some restricted sql statements.
func (s *session) ExecRestrictedSQL(ctx context.Context, sql string) (ast.RecordSet, error) {
if ctx.Value(&sqlexec.RestrictedSQLExecutorKeyType{}) != nil {
// We do not support run this function concurrently.
// TODO: Maybe we should remove this restriction latter.
return nil, errors.New("Should not call ExecRestrictedSQL concurrently.")
}
rawStmts, err := Parse(ctx, sql)
if err != nil {
return nil, errors.Trace(err)
@ -273,8 +267,6 @@ func (s *session) ExecRestrictedSQL(ctx context.Context, sql string) (ast.Record
// For example only support DML on system meta table.
// TODO: Add more restrictions.
log.Debugf("Executing %s [%s]", st.OriginText(), sql)
ctx.SetValue(&sqlexec.RestrictedSQLExecutorKeyType{}, true)
defer ctx.ClearValue(&sqlexec.RestrictedSQLExecutorKeyType{})
rs, err := st.Exec(ctx)
return rs, errors.Trace(err)
}
@ -331,9 +323,6 @@ func (s *session) SetGlobalSysVar(ctx context.Context, name string, value string
// IsAutocommit checks if it is in the auto-commit mode.
func (s *session) isAutocommit(ctx context.Context) bool {
if ctx.Value(&sqlexec.RestrictedSQLExecutorKeyType{}) != nil {
return false
}
autocommit, ok := variable.GetSessionVars(ctx).Systems["autocommit"]
if !ok {
if s.initing {
@ -357,9 +346,6 @@ func (s *session) isAutocommit(ctx context.Context) bool {
}
func (s *session) ShouldAutocommit(ctx context.Context) bool {
if ctx.Value(&sqlexec.RestrictedSQLExecutorKeyType{}) != nil {
return false
}
// With START TRANSACTION, autocommit remains disabled until you end
// the transaction with COMMIT or ROLLBACK.
if variable.GetSessionVars(ctx).Status&mysql.ServerStatusInTrans == 0 && s.isAutocommit(ctx) {

8
util/sqlexec/restricted_sql_executor.go
View File

@ -18,14 +18,6 @@ import (
"github.com/pingcap/tidb/context"
)
// RestrictedSQLExecutorKeyType is a dummy type to avoid naming collision in session.
type RestrictedSQLExecutorKeyType struct{}
// String implements Stringer interface.
func (k *RestrictedSQLExecutorKeyType) String() string {
return "restricted_sql_executor"
}
// RestrictedSQLExecutor is an interface provides executing restricted sql statement.
// Why we need this interface?
// When we execute some management statements, we need to operate system tables.