address comment: change restricted to internal

pingcap · Sep 6, 2018 · 2689501 · 2689501
1 parent e2ee36d
commit 2689501
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/distsql/distsql.go b/distsql/distsql.go
@@ -55,9 +55,9 @@ func Select(ctx context.Context, sctx sessionctx.Context, kvReq *kv.Request, fie
 		}, nil
 	}
 
-	restrLabel := metrics.LblGeneral
+	label := metrics.LblGeneral
 	if sctx.GetSessionVars().InRestrictedSQL {
-		restrLabel = metrics.LblRestricted
+		label = metrics.LblInternal
 	}
 	return &selectResult{
 		label:      "dag",
@@ -68,7 +68,7 @@ func Select(ctx context.Context, sctx sessionctx.Context, kvReq *kv.Request, fie
 		fieldTypes: fieldTypes,
 		ctx:        sctx,
 		feedback:   fb,
-		sqlType:    restrLabel,
+		sqlType:    label,
 	}, nil
 }
 
@@ -79,17 +79,17 @@ func Analyze(ctx context.Context, client kv.Client, kvReq *kv.Request, vars *kv.
 	if resp == nil {
 		return nil, errors.New("client returns nil response")
 	}
-	restrLabel := metrics.LblGeneral
+	label := metrics.LblGeneral
 	if isRestrict {
-		restrLabel = metrics.LblRestricted
+		label = metrics.LblInternal
 	}
 	result := &selectResult{
 		label:    "analyze",
 		resp:     resp,
 		results:  make(chan resultWithErr, kvReq.Concurrency),
 		closed:   make(chan struct{}),
 		feedback: statistics.NewQueryFeedback(0, nil, 0, false),
-		sqlType:  restrLabel,
+		sqlType:  label,
 	}
 	return result, nil
 }

diff --git a/distsql/distsql_test.go b/distsql/distsql_test.go
@@ -150,7 +150,7 @@ func (s *testSuite) TestAnalyze(c *C) {
 	result, ok := response.(*selectResult)
 	c.Assert(ok, IsTrue)
 	c.Assert(result.label, Equals, "analyze")
-	c.Assert(result.sqlType, Equals, "restricted")
+	c.Assert(result.sqlType, Equals, "internal")
 
 	response.Fetch(context.TODO())
 

diff --git a/executor/adapter.go b/executor/adapter.go
@@ -355,18 +355,18 @@ func (a *ExecStmt) logSlowQuery(txnTS uint64, succ bool) {
 		indexIDs = strings.Replace(fmt.Sprintf("index_ids:%v ", a.Ctx.GetSessionVars().StmtCtx.IndexIDs), " ", ",", -1)
 	}
 	user := sessVars.User
-	var restricted string
+	var internal string
 	if sessVars.InRestrictedSQL {
-		restricted = "[RESTRICTED] "
+		internal = "[INTERNAL] "
 	}
 	if costTime < threshold {
 		logutil.SlowQueryLogger.Debugf(
 			"[QUERY] %vcost_time:%v %s succ:%v con:%v user:%s txn_start_ts:%v database:%v %v%vsql:%v",
-			restricted, costTime, sessVars.StmtCtx.GetExecDetails(), succ, connID, user, txnTS, currentDB, tableIDs, indexIDs, sql)
+			internal, costTime, sessVars.StmtCtx.GetExecDetails(), succ, connID, user, txnTS, currentDB, tableIDs, indexIDs, sql)
 	} else {
 		logutil.SlowQueryLogger.Warnf(
 			"[SLOW_QUERY] %vcost_time:%v %s succ:%v con:%v user:%s txn_start_ts:%v database:%v %v%vsql:%v",
-			restricted, costTime, sessVars.StmtCtx.GetExecDetails(), succ, connID, user, txnTS, currentDB, tableIDs, indexIDs, sql)
+			internal, costTime, sessVars.StmtCtx.GetExecDetails(), succ, connID, user, txnTS, currentDB, tableIDs, indexIDs, sql)
 	}
 }
 

diff --git a/metrics/session.go b/metrics/session.go
@@ -109,7 +109,7 @@ const (
 	LblResult      = "result"
 	LblSQLType     = "sql_type"
 	LblGeneral     = "general"
-	LblRestricted  = "restricted"
+	LblInternal    = "internal"
 )
 
 func init() {

diff --git a/session/session.go b/session/session.go
@@ -567,7 +567,7 @@ func (s *session) ExecRestrictedSQL(sctx sessionctx.Context, sql string) ([]chun
 			fields = rs.Fields()
 		}
 	}
-	metrics.QueryDurationHistogram.WithLabelValues(metrics.LblRestricted).Observe(time.Since(startTime).Seconds())
+	metrics.QueryDurationHistogram.WithLabelValues(metrics.LblInternal).Observe(time.Since(startTime).Seconds())
 	return rows, fields, nil
 }
 
@@ -734,11 +734,11 @@ func (s *session) executeStatement(ctx context.Context, connID uint64, stmtNode
 		}
 		return nil, errors.Trace(err)
 	}
-	restrLabel := metrics.LblGeneral
+	label := metrics.LblGeneral
 	if s.sessionVars.InRestrictedSQL {
-		restrLabel = metrics.LblRestricted
+		label = metrics.LblInternal
 	}
-	metrics.SessionExecuteRunDuration.WithLabelValues(restrLabel).Observe(time.Since(startTime).Seconds())
+	metrics.SessionExecuteRunDuration.WithLabelValues(label).Observe(time.Since(startTime).Seconds())
 
 	if recordSet != nil {
 		recordSets = append(recordSets, recordSet)
@@ -772,11 +772,11 @@ func (s *session) execute(ctx context.Context, sql string) (recordSets []ast.Rec
 		log.Warnf("con:%d parse error:\n%v\n%s", connID, err, sql)
 		return nil, errors.Trace(err)
 	}
-	restrLabel := metrics.LblGeneral
+	label := metrics.LblGeneral
 	if s.sessionVars.InRestrictedSQL {
-		restrLabel = metrics.LblRestricted
+		label = metrics.LblInternal
 	}
-	metrics.SessionExecuteParseDuration.WithLabelValues(restrLabel).Observe(time.Since(startTS).Seconds())
+	metrics.SessionExecuteParseDuration.WithLabelValues(label).Observe(time.Since(startTS).Seconds())
 
 	compiler := executor.Compiler{Ctx: s}
 	for _, stmtNode := range stmtNodes {
@@ -794,7 +794,7 @@ func (s *session) execute(ctx context.Context, sql string) (recordSets []ast.Rec
 			log.Warnf("con:%d compile error:\n%v\n%s", connID, err, sql)
 			return nil, errors.Trace(err)
 		}
-		metrics.SessionExecuteCompileDuration.WithLabelValues(restrLabel).Observe(time.Since(startTS).Seconds())
+		metrics.SessionExecuteCompileDuration.WithLabelValues(label).Observe(time.Since(startTS).Seconds())
 
 		// Step3: Execute the physical plan.
 		if recordSets, err = s.executeStatement(ctx, connID, stmtNode, stmt, recordSets); err != nil {