Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

planner: cherry-pick enforce-mpp to v5.0 #26382

Merged
merged 18 commits into from
Jul 20, 2021
Merged

planner: cherry-pick enforce-mpp to v5.0 #26382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bcf9061
planner: enforce push mpp down (#24849)
LittleFall Jul 20, 2021
d4bffc0
planner: Revert `tidb_allow_mpp` modification for downgrade compatibi…
LittleFall Jun 11, 2021
2f0373d
fix build and test
LittleFall Jul 20, 2021
d348691
config: add config for `tidb_enforce_mpp` and remove the global scope…
LittleFall Jun 11, 2021
ca609ec
fix cp bug.
LittleFall Jul 20, 2021
6c66105
planner: enforce projection push down (#25450)
fzhedu Jun 22, 2021
2cbddd7
fix cp
LittleFall Jul 20, 2021
d3d2f52
planner: Log warnings when agg function can not be pushdown in explai…
windtalker Jun 24, 2021
7c425ac
planner: add warnings about joins when tidb_enforce_mpp is enabled. (…
LittleFall Jul 15, 2021
9555492
fix test
LittleFall Jul 20, 2021
2fcdd59
Merge branch 'track/release-5.0' into cherrypick/enforce-mpp2
LittleFall Jul 20, 2021
be748f2
make fmt
LittleFall Jul 20, 2021
aa028ce
fix test
LittleFall Jul 20, 2021
96cc867
fix test
LittleFall Jul 20, 2021
eeff2be
fix!
LittleFall Jul 20, 2021
92e9386
fix test
LittleFall Jul 20, 2021
7b44ab7
set this variable.
LittleFall Jul 20, 2021
134e9c8
Merge branch 'release-5.0' into cherrypick/enforce-mpp2
ti-chi-bot Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
config: add config for tidb_enforce_mpp and remove the global scope… 
… of it. (#25369)
  • Loading branch information
@LittleFall
LittleFall committed Jul 20, 2021
commit d348691a4c8c1f3a87209d0dd12729bacb00cd2a
2 changes: 2 additions & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ type Performance struct {
MemProfileInterval string `toml:"mem-profile-interval" json:"mem-profile-interval"`
IndexUsageSyncLease string `toml:"index-usage-sync-lease" json:"index-usage-sync-lease"`
GOGC int `toml:"gogc" json:"gogc"`
EnforceMPP bool `toml:"enforce-mpp" json:"enforce-mpp"`
}

// PlanCache is the PlanCache section of the config.
Expand Down Expand Up @@ -618,6 +619,7 @@ var defaultConf = Config{
// TODO: set indexUsageSyncLease to 60s.
IndexUsageSyncLease: "0s",
GOGC: 100,
EnforceMPP: false,
},
ProxyProtocol: ProxyProtocol{
Networks: "",
Expand Down
4 changes: 2 additions & 2 deletions sessionctx/variable/sysvar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,8 @@ var defaultSysVars = []*SysVar{
return oracle.LocalTxnScope
}()},
/* TiDB specific variables */
{Scope: ScopeGlobal | ScopeSession, Name: TiDBAllowMPPExecution, Type: TypeBool, Value: BoolToOnOff(DefTiDBAllowMPPExecution)},
{Scope: ScopeGlobal | ScopeSession, Name: TiDBEnforceMPPExecution, Type: TypeBool, Value: BoolToOnOff(DefTiDBEnforceMPPExecution)},
{Scope: ScopeGlobal | ScopeSession, Name: TiDBAllowMPPExecution, Type: TypeBool, Value: BoolToOnOff(config.GetGlobalConfig().Performance.EnforceMPP)},
{Scope: ScopeSession, Name: TiDBEnforceMPPExecution, Type: TypeBool, Value: BoolToOnOff(DefTiDBEnforceMPPExecution)},
{Scope: ScopeGlobal | ScopeSession, Name: TiDBBCJThresholdCount, Value: strconv.Itoa(DefBroadcastJoinThresholdCount), Type: TypeInt, MinValue: 0, MaxValue: math.MaxInt64},
{Scope: ScopeGlobal | ScopeSession, Name: TiDBBCJThresholdSize, Value: strconv.Itoa(DefBroadcastJoinThresholdSize), Type: TypeInt, MinValue: 0, MaxValue: math.MaxInt64},
{Scope: ScopeSession, Name: TiDBSnapshot, Value: ""},
Expand Down
3 changes: 2 additions & 1 deletion tidb-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,8 @@ func setGlobalVars() {
variable.SetSysVar(variable.Socket, cfg.Socket)
variable.SetSysVar(variable.DataDir, cfg.Path)
variable.SetSysVar(variable.TiDBSlowQueryFile, cfg.Log.SlowQueryFile)
variable.SetSysVar(variable.TiDBIsolationReadEngines, strings.Join(cfg.IsolationRead.Engines, ", "))
variable.SetSysVar(variable.TiDBIsolationReadEngines, strings.Join(cfg.IsolationRead.Engines, ","))
variable.SetSysVar(variable.TiDBEnforceMPPExecution, variable.BoolToOnOff(config.GetGlobalConfig().Performance.EnforceMPP))
variable.MemoryUsageAlarmRatio.Store(cfg.Performance.MemoryUsageAlarmRatio)

// For CI environment we default enable prepare-plan-cache.
Expand Down