зеркало из https://github.com/github/vitess-gh.git
jeffjiang: fix code styles and add sanity check for QueryRuleInfo.SetRules
This commit is contained in:
Родитель
9dae47081c
Коммит
9785fb3330
|
@ -41,14 +41,16 @@ func NewQueryRuleInfo() *QueryRuleInfo {
|
||||||
// SetRules takes a external QueryRules structure and overwrite one of the
|
// SetRules takes a external QueryRules structure and overwrite one of the
|
||||||
// internal QueryRules as designated by queryRuleSet parameter
|
// internal QueryRules as designated by queryRuleSet parameter
|
||||||
func (qri *QueryRuleInfo) SetRules(queryRuleSet string, newRules *QueryRules) error {
|
func (qri *QueryRuleInfo) SetRules(queryRuleSet string, newRules *QueryRules) error {
|
||||||
|
if newRules == nil {
|
||||||
|
newRules = NewQueryRules()
|
||||||
|
}
|
||||||
qri.mu.Lock()
|
qri.mu.Lock()
|
||||||
defer qri.mu.Unlock()
|
defer qri.mu.Unlock()
|
||||||
if _, ok := qri.queryRulesMap[queryRuleSet]; ok {
|
if _, ok := qri.queryRulesMap[queryRuleSet]; ok {
|
||||||
qri.queryRulesMap[queryRuleSet] = newRules.Copy()
|
qri.queryRulesMap[queryRuleSet] = newRules.Copy()
|
||||||
return nil
|
return nil
|
||||||
} else {
|
|
||||||
return errors.New("QueryRules identifier " + queryRuleSet + " is not valid")
|
|
||||||
}
|
}
|
||||||
|
return errors.New("QueryRules identifier " + queryRuleSet + " is not valid")
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRules returns the corresponding QueryRules as designated by queryRuleSet parameter
|
// GetRules returns the corresponding QueryRules as designated by queryRuleSet parameter
|
||||||
|
@ -57,9 +59,8 @@ func (qri *QueryRuleInfo) GetRules(queryRuleSet string) (error, *QueryRules) {
|
||||||
defer qri.mu.Unlock()
|
defer qri.mu.Unlock()
|
||||||
if ruleset, ok := qri.queryRulesMap[queryRuleSet]; ok {
|
if ruleset, ok := qri.queryRulesMap[queryRuleSet]; ok {
|
||||||
return nil, ruleset.Copy()
|
return nil, ruleset.Copy()
|
||||||
} else {
|
|
||||||
return errors.New("QueryRules identifier " + queryRuleSet + " is not valid"), nil
|
|
||||||
}
|
}
|
||||||
|
return errors.New("QueryRules identifier " + queryRuleSet + " is not valid"), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// filterByPlan creates a new QueryRules by prefiltering on all query rules that are contained in internal
|
// filterByPlan creates a new QueryRules by prefiltering on all query rules that are contained in internal
|
||||||
|
|
Загрузка…
Ссылка в новой задаче