This is an automated cherry-pick of pingcap#45814

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

executor/issuetest/BUILD.bazel

@@ -7,15 +7,24 @@ go_test(
  "main_test.go",
  ],
  flaky = True,
+<<<<<<< HEAD:executor/issuetest/BUILD.bazel
  shard_count = 50,
+=======
+ shard_count = 13,
+>>>>>>> c34f6fc83d6 (planner: store the hints of session variable (#45814)):session/test/vars/BUILD.bazel
  deps = [
  "//config",
  "//kv",
  "//meta/autoid",
  "//parser/auth",
  "//parser/charset",
  "//parser/mysql",
+<<<<<<< HEAD:executor/issuetest/BUILD.bazel
  "//session",
+=======
+ "//parser/terror",
+ "//sessionctx/stmtctx",
+>>>>>>> c34f6fc83d6 (planner: store the hints of session variable (#45814)):session/test/vars/BUILD.bazel
  "//sessionctx/variable",
  "//statistics",
  "//testkit",

planner/core/plan_cache.go

@@ -209,6 +209,9 @@ func getPointQueryPlan(stmt *ast.Prepared, sessVars *variable.SessionVars, stmtC
  }
  sessVars.FoundInPlanCache = true
  stmtCtx.PointExec = true
+ if pointGetPlan, ok := plan.(*PointGetPlan); ok && pointGetPlan != nil && pointGetPlan.stmtHints != nil {
+ sessVars.StmtCtx.StmtHints = *pointGetPlan.stmtHints
+ }
  return plan, names, true, nil
 }
 
@@ -251,6 +254,7 @@ func getGeneralPlan(sctx sessionctx.Context, isGeneralPlanCache bool, cacheKey k
  planCacheCounter.Inc()
  }
  stmtCtx.SetPlanDigest(stmt.NormalizedPlan, stmt.PlanDigest)
+ stmtCtx.StmtHints = *cachedVal.stmtHints
  return cachedVal.Plan, cachedVal.OutPutNames, true, nil
 }
 
@@ -289,7 +293,11 @@ func generateNewPlan(ctx context.Context, sctx sessionctx.Context, isGeneralPlan
  }
  sessVars.IsolationReadEngines[kv.TiFlash] = struct{}{}
  }
+<<<<<<< HEAD
  cached := NewPlanCacheValue(p, names, stmtCtx.TblInfo2UnionScan, paramTypes)
+=======
+ cached := NewPlanCacheValue(p, names, stmtCtx.TblInfo2UnionScan, matchOpts, &stmtCtx.StmtHints)
+>>>>>>> c34f6fc83d6 (planner: store the hints of session variable (#45814))
  stmt.NormalizedPlan, stmt.PlanDigest = NormalizePlan(p)
  stmtCtx.SetPlan(p)
  stmtCtx.SetPlanDigest(stmt.NormalizedPlan, stmt.PlanDigest)
@@ -687,12 +695,15 @@ func tryCachePointPlan(_ context.Context, sctx sessionctx.Context,
  names types.NameSlice
  )
 
- if _, _ok := p.(*PointGetPlan); _ok {
+ if plan, _ok := p.(*PointGetPlan); _ok {
  ok, err = IsPointGetWithPKOrUniqueKeyByAutoCommit(sctx, p)
  names = p.OutputNames()
  if err != nil {
  return err
  }
+ if ok {
+ plan.stmtHints = sctx.GetSessionVars().StmtCtx.StmtHints.Clone()
+ }
  }
 
  if ok {

planner/core/plan_cache_utils.go

@@ -28,6 +28,7 @@ import (
  "github.com/pingcap/tidb/parser/model"
  "github.com/pingcap/tidb/parser/mysql"
  "github.com/pingcap/tidb/sessionctx"
+ "github.com/pingcap/tidb/sessionctx/stmtctx"
  "github.com/pingcap/tidb/sessionctx/variable"
  "github.com/pingcap/tidb/types"
  driver "github.com/pingcap/tidb/types/parser_driver"
@@ -350,8 +351,15 @@ type PlanCacheValue struct {
  memoryUsage int64
 }
 
+<<<<<<< HEAD
 func (v *PlanCacheValue) varTypesUnchanged(txtVarTps []*types.FieldType) bool {
  return v.ParamTypes.CheckTypesCompatibility4PC(txtVarTps)
+=======
+ // matchOpts stores some fields help to choose a suitable plan
+ matchOpts *utilpc.PlanCacheMatchOpts
+ // stmtHints stores the hints which set session variables, because the hints won't be processed using cached plan.
+ stmtHints *stmtctx.StmtHints
+>>>>>>> c34f6fc83d6 (planner: store the hints of session variable (#45814))
 }
 
 // unKnownMemoryUsage represent the memory usage of uncounted structure, maybe need implement later
@@ -395,7 +403,11 @@ func (v *PlanCacheValue) MemoryUsage() (sum int64) {
 
 // NewPlanCacheValue creates a SQLCacheValue.
 func NewPlanCacheValue(plan Plan, names []*types.FieldName, srcMap map[*model.TableInfo]bool,
+<<<<<<< HEAD
  paramTypes []*types.FieldType) *PlanCacheValue {
+=======
+ matchOpts *utilpc.PlanCacheMatchOpts, stmtHints *stmtctx.StmtHints) *PlanCacheValue {
+>>>>>>> c34f6fc83d6 (planner: store the hints of session variable (#45814))
  dstMap := make(map[*model.TableInfo]bool)
  for k, v := range srcMap {
  dstMap[k] = v
@@ -408,7 +420,12 @@ func NewPlanCacheValue(plan Plan, names []*types.FieldName, srcMap map[*model.Ta
  Plan: plan,
  OutPutNames: names,
  TblInfo2UnionScan: dstMap,
+<<<<<<< HEAD
  ParamTypes: userParamTypes,
+=======
+ matchOpts: matchOpts,
+ stmtHints: stmtHints.Clone(),
+>>>>>>> c34f6fc83d6 (planner: store the hints of session variable (#45814))
  }
 }
 

planner/core/point_get_plan.go

@@ -96,6 +96,8 @@ type PointGetPlan struct {
  // probeParents records the IndexJoins and Applys with this operator in their inner children.
  // Please see comments in PhysicalPlan for details.
  probeParents []PhysicalPlan
+ // stmtHints should restore in executing context.
+ stmtHints *stmtctx.StmtHints
 }
 
 func (p *PointGetPlan) getEstRowCountForDisplay() float64 {