Skip to content

Commit 6cef656

Browse files
JmPotatoJmPotato
committed
Use consts more
Signed-off-by: JmPotato <[email protected]>
1 parent 91a633c commit 6cef656

File tree

8 files changed

+92
-92
lines changed

8 files changed

+92
-92
lines changed

Diff for: ‎pkg/schedule/placement/rule_manager_test.go

+35-35
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ func TestAdjustRule(t *testing.T) {
7979
re := require.New(t)
8080
_, manager := newTestManager(t, false)
8181
rules := []Rule{
82-
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 3},
83-
{GroupID: "", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 3},
84-
{GroupID: "group", ID: "", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 3},
85-
{GroupID: "group", ID: "id", StartKeyHex: "123ab", EndKeyHex: "123abf", Role: "voter", Count: 3},
86-
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "1123abf", Role: "voter", Count: 3},
87-
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123aaa", Role: "voter", Count: 3},
82+
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 3},
83+
{GroupID: "", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 3},
84+
{GroupID: "group", ID: "", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 3},
85+
{GroupID: "group", ID: "id", StartKeyHex: "123ab", EndKeyHex: "123abf", Role: Voter, Count: 3},
86+
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "1123abf", Role: Voter, Count: 3},
87+
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123aaa", Role: Voter, Count: 3},
8888
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "master", Count: 3},
89-
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 0},
90-
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: -1},
91-
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 3, LabelConstraints: []LabelConstraint{{Op: "foo"}}},
89+
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 0},
90+
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: -1},
91+
{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 3, LabelConstraints: []LabelConstraint{{Op: "foo"}}},
9292
}
9393
re.NoError(manager.adjustRule(&rules[0], "group"))
9494

@@ -101,17 +101,17 @@ func TestAdjustRule(t *testing.T) {
101101
}
102102

103103
manager.SetKeyType(constant.Table.String())
104-
re.Error(manager.adjustRule(&Rule{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 3}, "group"))
104+
re.Error(manager.adjustRule(&Rule{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 3}, "group"))
105105

106106
manager.SetKeyType(constant.Txn.String())
107-
re.Error(manager.adjustRule(&Rule{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 3}, "group"))
107+
re.Error(manager.adjustRule(&Rule{GroupID: "group", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 3}, "group"))
108108

109109
re.Error(manager.adjustRule(&Rule{
110110
GroupID: "group",
111111
ID: "id",
112112
StartKeyHex: hex.EncodeToString(codec.EncodeBytes([]byte{0})),
113113
EndKeyHex: "123abf",
114-
Role: "voter",
114+
Role: Voter,
115115
Count: 3,
116116
}, "group"))
117117

@@ -120,7 +120,7 @@ func TestAdjustRule(t *testing.T) {
120120
ID: "id",
121121
StartKeyHex: hex.EncodeToString(codec.EncodeBytes([]byte{0})),
122122
EndKeyHex: hex.EncodeToString(codec.EncodeBytes([]byte{1})),
123-
Role: "learner",
123+
Role: Learner,
124124
Count: 1,
125125
IsWitness: true,
126126
LabelConstraints: []LabelConstraint{{Key: "engine", Op: "in", Values: []string{"tiflash"}}},
@@ -130,15 +130,15 @@ func TestAdjustRule(t *testing.T) {
130130
func TestLeaderCheck(t *testing.T) {
131131
re := require.New(t)
132132
_, manager := newTestManager(t, false)
133-
re.Regexp(".*needs at least one leader or voter.*", manager.SetRule(&Rule{GroupID: DefaultGroupID, ID: DefaultRuleID, Role: "learner", Count: 3}).Error())
134-
re.Regexp(".*define multiple leaders by count 2.*", manager.SetRule(&Rule{GroupID: "g2", ID: "33", Role: "leader", Count: 2}).Error())
133+
re.Regexp(".*needs at least one leader or voter.*", manager.SetRule(&Rule{GroupID: DefaultGroupID, ID: DefaultRuleID, Role: Learner, Count: 3}).Error())
134+
re.Regexp(".*define multiple leaders by count 2.*", manager.SetRule(&Rule{GroupID: "g2", ID: "33", Role: Leader, Count: 2}).Error())
135135
re.Regexp(".*multiple leader replicas.*", manager.Batch([]RuleOp{
136136
{
137-
Rule: &Rule{GroupID: "g2", ID: "foo1", Role: "leader", Count: 1},
137+
Rule: &Rule{GroupID: "g2", ID: "foo1", Role: Leader, Count: 1},
138138
Action: RuleOpAdd,
139139
},
140140
{
141-
Rule: &Rule{GroupID: "g2", ID: "foo2", Role: "leader", Count: 1},
141+
Rule: &Rule{GroupID: "g2", ID: "foo2", Role: Leader, Count: 1},
142142
Action: RuleOpAdd,
143143
},
144144
}).Error())
@@ -148,9 +148,9 @@ func TestSaveLoad(t *testing.T) {
148148
re := require.New(t)
149149
store, manager := newTestManager(t, false)
150150
rules := []*Rule{
151-
{GroupID: DefaultGroupID, ID: DefaultRuleID, Role: "voter", Count: 5},
152-
{GroupID: "foo", ID: "baz", StartKeyHex: "", EndKeyHex: "abcd", Role: "voter", Count: 1},
153-
{GroupID: "foo", ID: "bar", Role: "learner", Count: 1},
151+
{GroupID: DefaultGroupID, ID: DefaultRuleID, Role: Voter, Count: 5},
152+
{GroupID: "foo", ID: "baz", StartKeyHex: "", EndKeyHex: "abcd", Role: Voter, Count: 1},
153+
{GroupID: "foo", ID: "bar", Role: Learner, Count: 1},
154154
}
155155
for _, r := range rules {
156156
re.NoError(manager.SetRule(r.Clone()))
@@ -193,9 +193,9 @@ func TestKeys(t *testing.T) {
193193
re := require.New(t)
194194
_, manager := newTestManager(t, false)
195195
rules := []*Rule{
196-
{GroupID: "1", ID: "1", Role: "voter", Count: 1, StartKeyHex: "", EndKeyHex: ""},
197-
{GroupID: "2", ID: "2", Role: "voter", Count: 1, StartKeyHex: "11", EndKeyHex: "ff"},
198-
{GroupID: "2", ID: "3", Role: "voter", Count: 1, StartKeyHex: "22", EndKeyHex: "dd"},
196+
{GroupID: "1", ID: "1", Role: Voter, Count: 1, StartKeyHex: "", EndKeyHex: ""},
197+
{GroupID: "2", ID: "2", Role: Voter, Count: 1, StartKeyHex: "11", EndKeyHex: "ff"},
198+
{GroupID: "2", ID: "3", Role: Voter, Count: 1, StartKeyHex: "22", EndKeyHex: "dd"},
199199
}
200200

201201
toDelete := []RuleOp{}
@@ -211,8 +211,8 @@ func TestKeys(t *testing.T) {
211211
manager.Batch(toDelete)
212212
checkRules(t, manager.GetAllRules(), [][2]string{{DefaultGroupID, DefaultRuleID}})
213213

214-
rules = append(rules, &Rule{GroupID: "3", ID: "4", Role: "voter", Count: 1, StartKeyHex: "44", EndKeyHex: "ee"},
215-
&Rule{GroupID: "3", ID: "5", Role: "voter", Count: 1, StartKeyHex: "44", EndKeyHex: "dd"})
214+
rules = append(rules, &Rule{GroupID: "3", ID: "4", Role: Voter, Count: 1, StartKeyHex: "44", EndKeyHex: "ee"},
215+
&Rule{GroupID: "3", ID: "5", Role: Voter, Count: 1, StartKeyHex: "44", EndKeyHex: "dd"})
216216
manager.SetRules(rules)
217217
checkRules(t, manager.GetAllRules(), [][2]string{{"1", "1"}, {"2", "2"}, {"2", "3"}, {"3", "4"}, {"3", "5"}, {DefaultGroupID, DefaultRuleID}})
218218

@@ -282,10 +282,10 @@ func TestKeys(t *testing.T) {
282282
func TestDeleteByIDPrefix(t *testing.T) {
283283
_, manager := newTestManager(t, false)
284284
manager.SetRules([]*Rule{
285-
{GroupID: "g1", ID: "foo1", Role: "voter", Count: 1},
286-
{GroupID: "g2", ID: "foo1", Role: "voter", Count: 1},
287-
{GroupID: "g2", ID: "foobar", Role: "voter", Count: 1},
288-
{GroupID: "g2", ID: "baz2", Role: "voter", Count: 1},
285+
{GroupID: "g1", ID: "foo1", Role: Voter, Count: 1},
286+
{GroupID: "g2", ID: "foo1", Role: Voter, Count: 1},
287+
{GroupID: "g2", ID: "foobar", Role: Voter, Count: 1},
288+
{GroupID: "g2", ID: "baz2", Role: Voter, Count: 1},
289289
})
290290
manager.DeleteRule(DefaultGroupID, DefaultRuleID)
291291
checkRules(t, manager.GetAllRules(), [][2]string{{"g1", "foo1"}, {"g2", "baz2"}, {"g2", "foo1"}, {"g2", "foobar"}})
@@ -304,20 +304,20 @@ func TestRangeGap(t *testing.T) {
304304
err := manager.DeleteRule(DefaultGroupID, DefaultRuleID)
305305
re.Error(err)
306306

307-
err = manager.SetRule(&Rule{GroupID: DefaultGroupID, ID: "foo", StartKeyHex: "", EndKeyHex: "abcd", Role: "voter", Count: 1})
307+
err = manager.SetRule(&Rule{GroupID: DefaultGroupID, ID: "foo", StartKeyHex: "", EndKeyHex: "abcd", Role: Voter, Count: 1})
308308
re.NoError(err)
309309
// |-- default --|
310310
// |-- foo --|
311311
// still cannot delete default since it will cause ("abcd", "") has no rules inside.
312312
err = manager.DeleteRule(DefaultGroupID, DefaultRuleID)
313313
re.Error(err)
314-
err = manager.SetRule(&Rule{GroupID: DefaultGroupID, ID: "bar", StartKeyHex: "abcd", EndKeyHex: "", Role: "voter", Count: 1})
314+
err = manager.SetRule(&Rule{GroupID: DefaultGroupID, ID: "bar", StartKeyHex: "abcd", EndKeyHex: "", Role: Voter, Count: 1})
315315
re.NoError(err)
316316
// now default can be deleted.
317317
err = manager.DeleteRule(DefaultGroupID, DefaultRuleID)
318318
re.NoError(err)
319319
// cannot change range since it will cause ("abaa", "abcd") has no rules inside.
320-
err = manager.SetRule(&Rule{GroupID: DefaultGroupID, ID: "foo", StartKeyHex: "", EndKeyHex: "abaa", Role: "voter", Count: 1})
320+
err = manager.SetRule(&Rule{GroupID: DefaultGroupID, ID: "foo", StartKeyHex: "", EndKeyHex: "abaa", Role: Voter, Count: 1})
321321
re.Error(err)
322322
}
323323

@@ -334,7 +334,7 @@ func TestGroupConfig(t *testing.T) {
334334
re.Equal(pd2, manager.GetRuleGroup(DefaultGroupID))
335335

336336
// new group g without config
337-
err = manager.SetRule(&Rule{GroupID: "g", ID: "1", Role: "voter", Count: 1})
337+
err = manager.SetRule(&Rule{GroupID: "g", ID: "1", Role: Voter, Count: 1})
338338
re.NoError(err)
339339
g1 := &RuleGroup{ID: "g"}
340340
re.Equal(g1, manager.GetRuleGroup("g"))
@@ -363,13 +363,13 @@ func TestRuleVersion(t *testing.T) {
363363
rule1 := manager.GetRule(DefaultGroupID, DefaultRuleID)
364364
re.Equal(uint64(0), rule1.Version)
365365
// create new rule
366-
newRule := &Rule{GroupID: "g1", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 3}
366+
newRule := &Rule{GroupID: "g1", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 3}
367367
err := manager.SetRule(newRule)
368368
re.NoError(err)
369369
newRule = manager.GetRule("g1", "id")
370370
re.Equal(uint64(0), newRule.Version)
371371
// update rule
372-
newRule = &Rule{GroupID: "g1", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: "voter", Count: 2}
372+
newRule = &Rule{GroupID: "g1", ID: "id", StartKeyHex: "123abc", EndKeyHex: "123abf", Role: Voter, Count: 2}
373373
err = manager.SetRule(newRule)
374374
re.NoError(err)
375375
newRule = manager.GetRule("g1", "id")

Diff for: ‎pkg/schedule/placement/rule_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestBuildRuleList(t *testing.T) {
112112
defaultRule := &Rule{
113113
GroupID: DefaultGroupID,
114114
ID: DefaultRuleID,
115-
Role: "voter",
115+
Role: Voter,
116116
StartKey: []byte{},
117117
EndKey: []byte{},
118118
Count: 3,
@@ -128,7 +128,7 @@ func TestBuildRuleList(t *testing.T) {
128128
Override: true,
129129
StartKey: byteStart,
130130
EndKey: byteEnd,
131-
Role: "voter",
131+
Role: Voter,
132132
Count: 5,
133133
}
134134

Diff for: ‎server/api/region_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ func (suite *regionsReplicatedTestSuite) TestCheckRegionsReplicated() {
697697
Index: 5,
698698
Rules: []*placement.Rule{
699699
{
700-
ID: "foo", Index: 1, Role: "voter", Count: 1,
700+
ID: "foo", Index: 1, Role: placement.Voter, Count: 1,
701701
},
702702
},
703703
},
@@ -738,7 +738,7 @@ func (suite *regionsReplicatedTestSuite) TestCheckRegionsReplicated() {
738738
mustRegionHeartbeat(re, suite.svr, r1)
739739

740740
bundle[0].Rules = append(bundle[0].Rules, &placement.Rule{
741-
ID: "bar", Index: 1, Role: "voter", Count: 1,
741+
ID: "bar", Index: 1, Role: placement.Voter, Count: 1,
742742
})
743743
data, err = json.Marshal(bundle)
744744
suite.NoError(err)
@@ -755,7 +755,7 @@ func (suite *regionsReplicatedTestSuite) TestCheckRegionsReplicated() {
755755
Index: 6,
756756
Rules: []*placement.Rule{
757757
{
758-
ID: "foo", Index: 1, Role: "voter", Count: 2,
758+
ID: "foo", Index: 1, Role: placement.Voter, Count: 2,
759759
},
760760
},
761761
})

Diff for: ‎server/cluster/cluster_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -1669,23 +1669,23 @@ func TestCalculateStoreSize1(t *testing.T) {
16691669
}
16701670

16711671
cluster.ruleManager.SetRule(
1672-
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "zone1", StartKey: []byte(""), EndKey: []byte(""), Role: "voter", Count: 2,
1672+
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "zone1", StartKey: []byte(""), EndKey: []byte(""), Role: placement.Voter, Count: 2,
16731673
LabelConstraints: []placement.LabelConstraint{
16741674
{Key: "zone", Op: "in", Values: []string{"zone1"}},
16751675
},
16761676
LocationLabels: []string{"rack", "host"}},
16771677
)
16781678

16791679
cluster.ruleManager.SetRule(
1680-
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "zone2", StartKey: []byte(""), EndKey: []byte(""), Role: "voter", Count: 2,
1680+
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "zone2", StartKey: []byte(""), EndKey: []byte(""), Role: placement.Voter, Count: 2,
16811681
LabelConstraints: []placement.LabelConstraint{
16821682
{Key: "zone", Op: "in", Values: []string{"zone2"}},
16831683
},
16841684
LocationLabels: []string{"rack", "host"}},
16851685
)
16861686

16871687
cluster.ruleManager.SetRule(
1688-
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "zone3", StartKey: []byte(""), EndKey: []byte(""), Role: "follower", Count: 1,
1688+
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "zone3", StartKey: []byte(""), EndKey: []byte(""), Role: placement.Follower, Count: 1,
16891689
LabelConstraints: []placement.LabelConstraint{
16901690
{Key: "zone", Op: "in", Values: []string{"zone3"}},
16911691
},
@@ -1753,23 +1753,23 @@ func TestCalculateStoreSize2(t *testing.T) {
17531753
}
17541754

17551755
cluster.ruleManager.SetRule(
1756-
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "dc1", StartKey: []byte(""), EndKey: []byte(""), Role: "voter", Count: 2,
1756+
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "dc1", StartKey: []byte(""), EndKey: []byte(""), Role: placement.Voter, Count: 2,
17571757
LabelConstraints: []placement.LabelConstraint{
17581758
{Key: "dc", Op: "in", Values: []string{"dc1"}},
17591759
},
17601760
LocationLabels: []string{"dc", "logic", "rack", "host"}},
17611761
)
17621762

17631763
cluster.ruleManager.SetRule(
1764-
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "logic3", StartKey: []byte(""), EndKey: []byte(""), Role: "voter", Count: 1,
1764+
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "logic3", StartKey: []byte(""), EndKey: []byte(""), Role: placement.Voter, Count: 1,
17651765
LabelConstraints: []placement.LabelConstraint{
17661766
{Key: "logic", Op: "in", Values: []string{"logic3"}},
17671767
},
17681768
LocationLabels: []string{"dc", "logic", "rack", "host"}},
17691769
)
17701770

17711771
cluster.ruleManager.SetRule(
1772-
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "logic4", StartKey: []byte(""), EndKey: []byte(""), Role: "learner", Count: 1,
1772+
&placement.Rule{GroupID: placement.DefaultGroupID, ID: "logic4", StartKey: []byte(""), EndKey: []byte(""), Role: placement.Learner, Count: 1,
17731773
LabelConstraints: []placement.LabelConstraint{
17741774
{Key: "logic", Op: "in", Values: []string{"logic4"}},
17751775
},

Diff for: ‎tests/integrations/mcs/scheduling/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func (suite *apiTestSuite) TestAPIForward() {
243243
{
244244
GroupID: placement.DefaultGroupID,
245245
ID: placement.DefaultRuleID,
246-
Role: "voter",
246+
Role: placement.Voter,
247247
Count: 3,
248248
LocationLabels: []string{},
249249
},

Diff for: ‎tests/integrations/mcs/scheduling/rule_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (suite *ruleTestSuite) TestRuleWatch() {
9393
rule := &placement.Rule{
9494
GroupID: "2",
9595
ID: "3",
96-
Role: "voter",
96+
Role: placement.Voter,
9797
Count: 1,
9898
StartKeyHex: "22",
9999
EndKeyHex: "dd",

0 commit comments

Comments
 (0)