executor: support plan replayer multi sqls

executor/builder.go

@@ -977,8 +977,16 @@ func (b *executorBuilder) buildPlanReplayer(v *plannercore.PlanReplayer) Executo
 	}
 	e := &PlanReplayerExec{
 		baseExecutor: newBaseExecutor(b.ctx, v.Schema(), v.ID()),
-		ExecStmts:    []ast.StmtNode{v.ExecStmt},
-		Analyze:      v.Analyze,
+		DumpInfo: &PlanReplayerDumpInfo{
+			Analyze: v.Analyze,
+			Path:    v.File,
+			ctx:     b.ctx,
+		},
+	}
+	if v.ExecStmt != nil {
+		e.DumpInfo.ExecStmts = []ast.StmtNode{v.ExecStmt}
+	} else {
+		e.baseExecutor = newBaseExecutor(b.ctx, nil, v.ID())
 	}
 	return e
 }

executor/executor_test.go

@@ -154,6 +154,8 @@ func TestPlanReplayer(t *testing.T) {
 	tk.MustExec("alter table t set tiflash replica 1")
 	tk.MustQuery("plan replayer dump explain select * from t where a=10")
 	tk.MustQuery("plan replayer dump explain select /*+ read_from_storage(tiflash[t]) */ * from t")
+	tk.MustExec("plan replayer dump explain './test/data/plan_replayer_test.txt'")
+	require.True(t, len(tk.Session().GetSessionVars().LastPlanReplayerToken) > 0)
 
 	tk.MustExec("create table t1 (a int)")
 	tk.MustExec("create table t2 (a int)")

executor/plan_replayer.go

@@ -34,6 +34,7 @@ import (
 	"github.com/pingcap/tidb/config"
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/infoschema"
+	"github.com/pingcap/tidb/parser"
 	"github.com/pingcap/tidb/parser/ast"
 	"github.com/pingcap/tidb/parser/model"
 	"github.com/pingcap/tidb/sessionctx"
@@ -61,10 +62,18 @@ const (
 // PlanReplayerExec represents a plan replayer executor.
 type PlanReplayerExec struct {
 	baseExecutor
+	DumpInfo *PlanReplayerDumpInfo
+	endFlag  bool
+}
+
+// PlanReplayerDumpInfo indicates dump info
+type PlanReplayerDumpInfo struct {
 	ExecStmts []ast.StmtNode
 	Analyze   bool
-
-	endFlag bool
+	Path      string
+	File      *os.File
+	FileName  string
+	ctx       sessionctx.Context
 }
 
 type tableNamePair struct {
@@ -146,16 +155,56 @@ func (e *PlanReplayerExec) Next(ctx context.Context, req *chunk.Chunk) error {
 	if e.endFlag {
 		return nil
 	}
-	if e.ExecStmts == nil {
+	err := e.createFile(domain.GetPlanReplayerDirName())
+	if err != nil {
+		return err
+	}
+	if len(e.DumpInfo.Path) > 0 {
+		err = e.prepare()
+		if err != nil {
+			return err
+		}
+		e.endFlag = true
+		e.ctx.GetSessionVars().LastPlanReplayerToken = e.DumpInfo.FileName
+		return nil
+	}
+	if e.DumpInfo.ExecStmts == nil {
 		return errors.New("plan replayer: sql is empty")
 	}
-	res, err := e.dump(ctx, domain.GetPlanReplayerDirName())
+	err = e.DumpInfo.dump(ctx)
 	if err != nil {
 		return err
 	}
-	req.AppendString(0, res)
+	req.AppendString(0, e.DumpInfo.FileName)
 	e.endFlag = true
-	e.ctx.GetSessionVars().LastPlanReplayerToken = res
+	e.ctx.GetSessionVars().LastPlanReplayerToken = e.DumpInfo.FileName
+	return nil
+}
+
+func (e *PlanReplayerExec) createFile(path string) error {
+	// Create path
+	err := os.MkdirAll(path, os.ModePerm)
+	if err != nil {
+		return errors.AddStack(err)
+	}
+
+	// Generate key and create zip file
+	time := time.Now().UnixNano()
+	b := make([]byte, 16)
+	//nolint: gosec
+	_, err = rand.Read(b)
+	if err != nil {
+		return err
+	}
+	key := base64.URLEncoding.EncodeToString(b)
+	fileName := fmt.Sprintf("replayer_%v_%v.zip", key, time)
+	zf, err := os.Create(filepath.Join(path, fileName))
+	if err != nil {
+		return errors.AddStack(err)
+	}
+	e.DumpInfo.File = zf
+	e.DumpInfo.FileName = fileName
+	e.ctx.GetSessionVars().LastPlanReplayerToken = e.DumpInfo.FileName
 	return nil
 }
 
@@ -188,28 +237,9 @@ func (e *PlanReplayerExec) Next(ctx context.Context, req *chunk.Chunk) error {
      |-explain2.txt
      |-....
 */
-func (e *PlanReplayerExec) dump(ctx context.Context, path string) (fileName string, err error) {
-	// Create path
-	err = os.MkdirAll(path, os.ModePerm)
-	if err != nil {
-		return "", errors.AddStack(err)
-	}
-
-	// Generate key and create zip file
-	time := time.Now().UnixNano()
-	b := make([]byte, 16)
-	//nolint: gosec
-	_, err = rand.Read(b)
-	if err != nil {
-		return "", err
-	}
-	key := base64.URLEncoding.EncodeToString(b)
-	fileName = fmt.Sprintf("replayer_%v_%v.zip", key, time)
-	zf, err := os.Create(filepath.Join(path, fileName))
-	if err != nil {
-		return "", errors.AddStack(err)
-	}
-
+func (e *PlanReplayerDumpInfo) dump(ctx context.Context) (err error) {
+	fileName := e.FileName
+	zf := e.File
 	// Create zip writer
 	zw := zip.NewWriter(zf)
 	defer func() {
@@ -225,12 +255,12 @@ func (e *PlanReplayerExec) dump(ctx context.Context, path string) (fileName stri
 
 	// Dump config
 	if err = dumpConfig(zw); err != nil {
-		return "", err
+		return err
 	}
 
 	// Dump meta
 	if err = dumpMeta(zw); err != nil {
-		return "", err
+		return err
 	}
 
 	// Retrieve current DB
@@ -241,50 +271,50 @@ func (e *PlanReplayerExec) dump(ctx context.Context, path string) (fileName stri
 	// Retrieve all tables
 	pairs, err := e.extractTableNames(ctx, e.ExecStmts, dbName)
 	if err != nil {
-		return "", errors.AddStack(fmt.Errorf("plan replayer: invalid SQL text, err: %v", err))
+		return errors.AddStack(fmt.Errorf("plan replayer: invalid SQL text, err: %v", err))
 	}
 
 	// Dump Schema and View
 	if err = dumpSchemas(e.ctx, zw, pairs); err != nil {
-		return "", err
+		return err
 	}
 
 	// Dump tables tiflash replicas
 	if err = dumpTiFlashReplica(e.ctx, zw, pairs); err != nil {
-		return "", err
+		return err
 	}
 
 	// Dump stats
 	if err = dumpStats(zw, pairs, do); err != nil {
-		return "", err
+		return err
 	}
 
 	// Dump variables
 	if err = dumpVariables(e.ctx, zw); err != nil {
-		return "", err
+		return err
 	}
 
 	// Dump sql
 	if err = dumpSQLs(e.ExecStmts, zw); err != nil {
-		return "", err
+		return err
 	}
 
 	// Dump session bindings
 	if err = dumpSessionBindings(e.ctx, zw); err != nil {
-		return "", err
+		return err
 	}
 
 	// Dump global bindings
 	if err = dumpGlobalBindings(e.ctx, zw); err != nil {
-		return "", err
+		return err
 	}
 
 	// Dump explain
 	if err = dumpExplain(e.ctx, zw, e.ExecStmts, e.Analyze); err != nil {
-		return "", err
+		return err
 	}
 
-	return fileName, nil
+	return nil
 }
 
 func dumpConfig(zw *zip.Writer) error {
@@ -498,7 +528,7 @@ func dumpExplain(ctx sessionctx.Context, zw *zip.Writer, execStmts []ast.StmtNod
 	return nil
 }
 
-func (e *PlanReplayerExec) extractTableNames(ctx context.Context,
+func (e *PlanReplayerDumpInfo) extractTableNames(ctx context.Context,
 	ExecStmts []ast.StmtNode, curDB model.CIStr) (map[tableNamePair]struct{}, error) {
 	tableExtractor := &tableNameExtractor{
 		ctx:      ctx,
@@ -529,6 +559,38 @@ func (e *PlanReplayerExec) extractTableNames(ctx context.Context,
 	return r, nil
 }
 
+func (e *PlanReplayerExec) prepare() error {
+	if len(e.DumpInfo.Path) == 0 {
+		return errors.New("plan replayer: file path is empty")
+	}
+	val := e.ctx.Value(PlanReplayerDumpVarKey)
+	if val != nil {
+		e.ctx.SetValue(PlanReplayerDumpVarKey, nil)
+		return errors.New("plan replayer: previous plan replayer dump option isn't closed normally, please try again")
+	}
+	e.ctx.SetValue(PlanReplayerDumpVarKey, e.DumpInfo)
+	return nil
+}
+
+// DumpSQLsFromFile dumps plan replayer results for sqls from file
+func (e *PlanReplayerDumpInfo) DumpSQLsFromFile(ctx context.Context, b []byte) error {
+	sqls := strings.Split(string(b), ";")
+	p := parser.New()
+	e.ExecStmts = make([]ast.StmtNode, 0)
+	for _, sql := range sqls {
+		s := strings.Trim(sql, "\n")
+		if len(s) < 1 {
+			continue
+		}
+		node, err := p.ParseOneStmt(s, "", "")
+		if err != nil {
+			return fmt.Errorf("parse sql error, sql:%v, err:%v", s, err)
+		}
+		e.ExecStmts = append(e.ExecStmts, node)
+	}
+	return e.dump(ctx)
+}
+
 func getStatsForTable(do *domain.Domain, pair tableNamePair) (*handle.JSONTable, error) {
 	is := do.InfoSchema()
 	h := do.StatsHandle()
@@ -644,14 +706,17 @@ type PlanReplayerLoadInfo struct {
 	Ctx  sessionctx.Context
 }
 
-type planReplayerLoadKeyType int
+type planReplayerKeyType int
 
-func (k planReplayerLoadKeyType) String() string {
+func (k planReplayerKeyType) String() string {
 	return "plan_replayer_load_var"
 }
 
 // PlanReplayerLoadVarKey is a variable key for plan replayer load.
-const PlanReplayerLoadVarKey planReplayerLoadKeyType = 0
+const PlanReplayerLoadVarKey planReplayerKeyType = 0
+
+// PlanReplayerDumpVarKey is a variable key for plan replayer dump.
+const PlanReplayerDumpVarKey planReplayerKeyType = 1
 
 // Next implements the Executor Next interface.
 func (e *PlanReplayerLoadExec) Next(ctx context.Context, req *chunk.Chunk) error {

executor/testdata/plan_replayer_test.txt

@@ -0,0 +1 @@
+select * from t;select * from t;

server/conn.go

@@ -1815,6 +1815,24 @@ func (cc *clientConn) handlePlanReplayerLoad(ctx context.Context, planReplayerLo
 	return planReplayerLoadInfo.Update(data)
 }
 
+func (cc *clientConn) handlePlanReplayerDump(ctx context.Context, e *executor.PlanReplayerDumpInfo) error {
+	if cc.capability&mysql.ClientLocalFiles == 0 {
+		return errNotAllowedCommand
+	}
+	if e == nil {
+		return errors.New("plan replayer dump: executor is empty")
+	}
+	data, err := cc.getDataFromPath(ctx, e.Path)
+	if err != nil {
+		logutil.BgLogger().Error(err.Error())
+		return err
+	}
+	if len(data) == 0 {
+		return nil
+	}
+	return e.DumpSQLsFromFile(ctx, data)
+}
+
 func (cc *clientConn) audit(eventType plugin.GeneralEvent) {
 	err := plugin.ForeachPlugin(plugin.Audit, func(p *plugin.Plugin) error {
 		audit := plugin.DeclareAuditManifest(p.Manifest)
@@ -2117,6 +2135,15 @@ func (cc *clientConn) handleQuerySpecial(ctx context.Context, status uint16) (bo
 		}
 	}
 
+	planReplayerDump := cc.ctx.Value(executor.PlanReplayerDumpVarKey)
+	if planReplayerDump != nil {
+		handled = true
+		defer cc.ctx.SetValue(executor.PlanReplayerDumpVarKey, nil)
+		//nolint:forcetypeassert
+		if err := cc.handlePlanReplayerDump(ctx, planReplayerDump.(*executor.PlanReplayerDumpInfo)); err != nil {
+			return handled, err
+		}
+	}
 	return handled, cc.writeOkWith(ctx, mysql.OKHeader, true, status)
 }