Merge branch 'master' into issue_30135

br/pkg/storage/local.go

@@ -12,7 +12,7 @@ import (
 )
 
 const (
- localDirPerm os.FileMode = 0o755
+ localDirPerm os.FileMode = 0o777
  localFilePerm os.FileMode = 0o644
  // LocalURIPrefix represents the local storage prefix.
  LocalURIPrefix = "file://"

parser/ast/misc.go

@@ -1856,6 +1856,7 @@ const (
  AdminShowTelemetry
  AdminResetTelemetryID
  AdminReloadStatistics
+ AdminFlushPlanCache
 )
 
 // HandleRange represents a range where handle value >= Begin and < End.
@@ -1864,6 +1865,15 @@ type HandleRange struct {
  End int64
 }
 
+type StatementScope int
+
+const (
+ StatementScopeNone StatementScope = iota
+ StatementScopeSession
+ StatementScopeInstance
+ StatementScopeGlobal
+)
+
 // ShowSlowType defines the type for SlowSlow statement.
 type ShowSlowType int
 
@@ -1929,10 +1939,11 @@ type AdminStmt struct {
  JobIDs []int64
  JobNumber int64
 
- HandleRanges []HandleRange
- ShowSlow *ShowSlow
- Plugins []string
- Where ExprNode
+ HandleRanges []HandleRange
+ ShowSlow *ShowSlow
+ Plugins []string
+ Where ExprNode
+ StatementScope StatementScope
 }
 
 // Restore implements Node interface.
@@ -2070,6 +2081,14 @@ func (n *AdminStmt) Restore(ctx *format.RestoreCtx) error {
  ctx.WriteKeyWord("RESET TELEMETRY_ID")
  case AdminReloadStatistics:
  ctx.WriteKeyWord("RELOAD STATS_EXTENDED")
+ case AdminFlushPlanCache:
+ if n.StatementScope == StatementScopeSession {
+ ctx.WriteKeyWord("FLUSH SESSION PLAN_CACHE")
+ } else if n.StatementScope == StatementScopeInstance {
+ ctx.WriteKeyWord("FLUSH INSTANCE PLAN_CACHE")
+ } else if n.StatementScope == StatementScopeGlobal {
+ ctx.WriteKeyWord("FLUSH GLOBAL PLAN_CACHE")
+ }
  default:
  return errors.New("Unsupported AdminStmt type")
  }

parser/misc.go

@@ -532,6 +532,7 @@ var tokenMap = map[string]int{
  "PESSIMISTIC": pessimistic,
  "PLACEMENT": placement,
  "PLAN": plan,
+ "PLAN_CACHE": planCache,
  "PLUGINS": plugins,
  "POLICY": policy,
  "POSITION": position,