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

placement: give default 2 followers for non-sugar syntax #31000

Merged
merged 6 commits into from
Dec 24, 2021
Merged

placement: give default 2 followers for non-sugar syntax #31000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
664a971
placement: give a default 2 followers for non-sugar syntax
xhebox Dec 24, 2021
53dfa7a
Merge branch 'master' into placement_13
hawkingrei Dec 24, 2021
629d54d
parser: forbid setting followers to zero
xhebox Dec 24, 2021
e2de356
Merge branch 'master' into placement_13
ti-chi-bot Dec 24, 2021
b4d8422
Merge branch 'master' into placement_13
ti-chi-bot Dec 24, 2021
99825b0
ddl: fix tests
xhebox Dec 24, 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
36 changes: 13 additions & 23 deletions ddl/placement/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,33 +85,23 @@ func NewBundleFromConstraintsOptions(options *model.PlacementSettings) (*Bundle,
return nil, fmt.Errorf("%w: LeaderConstraints conflicts with Constraints", err)
}
}
if len(LeaderConstraints) > 0 {
Rules = append(Rules, NewRule(Leader, 1, LeaderConstraints))
} else if followerCount == 0 {
return nil, fmt.Errorf("%w: you must at least provide common/leader constraints, or set some followers", ErrInvalidPlacementOptions)
}

if followerCount > 0 {
// if user did not specify leader, add one
if len(LeaderConstraints) == 0 {
Rules = append(Rules, NewRule(Leader, 1, NewConstraintsDirect()))
}
Rules = append(Rules, NewRule(Leader, 1, LeaderConstraints))

FollowerRules, err := NewRules(Voter, followerCount, followerConstraints)
if err != nil {
return nil, fmt.Errorf("%w: invalid FollowerConstraints", err)
}
for _, rule := range FollowerRules {
for _, cnst := range CommonConstraints {
if err := rule.Constraints.Add(cnst); err != nil {
return nil, fmt.Errorf("%w: FollowerConstraints conflicts with Constraints", err)
}
if followerCount == 0 {
followerCount = 2
}
FollowerRules, err := NewRules(Voter, followerCount, followerConstraints)
if err != nil {
return nil, fmt.Errorf("%w: invalid FollowerConstraints", err)
}
for _, rule := range FollowerRules {
for _, cnst := range CommonConstraints {
if err := rule.Constraints.Add(cnst); err != nil {
return nil, fmt.Errorf("%w: FollowerConstraints conflicts with Constraints", err)
}
}
Rules = append(Rules, FollowerRules...)
} else if followerConstraints != "" {
return nil, fmt.Errorf("%w: specify follower constraints without specify how many followers to be placed", ErrInvalidPlacementOptions)
}
Rules = append(Rules, FollowerRules...)

if learnerCount > 0 {
LearnerRules, err := NewRules(Learner, learnerCount, learnerConstraints)
Expand Down
5 changes: 4 additions & 1 deletion ddl/placement/bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,10 @@ func (s *testBundleSuite) TestNewBundleFromOptions(c *C) {
LeaderConstraints: "[+region=as]",
FollowerConstraints: "[-region=us]",
},
err: ErrInvalidPlacementOptions,
output: []*Rule{
NewRule(Leader, 1, NewConstraintsDirect(NewConstraintDirect("region", In, "as"))),
NewRule(Voter, 2, NewConstraintsDirect(NewConstraintDirect("region", NotIn, "us"))),
},
})

tests = append(tests, TestCase{
Expand Down
7 changes: 6 additions & 1 deletion parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11289,7 +11289,12 @@ yynewstate:
}
case 10:
{
parser.yyVAL.item = &ast.PlacementOption{Tp: ast.PlacementOptionFollowerCount, UintValue: yyS[yypt-0].item.(uint64)}
cnt := yyS[yypt-0].item.(uint64)
if cnt == 0 {
yylex.AppendError(yylex.Errorf("FOLLOWERS must be positive"))
return 1
}
parser.yyVAL.item = &ast.PlacementOption{Tp: ast.PlacementOptionFollowerCount, UintValue: cnt}
}
case 11:
{
Expand Down
7 changes: 6 additions & 1 deletion parser/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,7 +1526,12 @@ DirectPlacementOption:
}
| "FOLLOWERS" EqOpt LengthNum
{
$$ = &ast.PlacementOption{Tp: ast.PlacementOptionFollowerCount, UintValue: $3.(uint64)}
cnt := $3.(uint64)
if cnt == 0 {
yylex.AppendError(yylex.Errorf("FOLLOWERS must be positive"))
return 1
}
$$ = &ast.PlacementOption{Tp: ast.PlacementOptionFollowerCount, UintValue: cnt}
}
| "VOTERS" EqOpt LengthNum
{
Expand Down
6 changes: 6 additions & 0 deletions parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,6 +2338,7 @@ func TestDDL(t *testing.T) {
{`create table t (c int) regions="us,3";`, true, "CREATE TABLE `t` (`c` INT) REGIONS = 'us,3'"},
{`create table t (c int) followers="us,3";`, false, ""},
{`create table t (c int) followers=3;`, true, "CREATE TABLE `t` (`c` INT) FOLLOWERS = 3"},
{`create table t (c int) followers=0;`, false, ""},
{`create table t (c int) voters="us,3";`, false, ""},
{`create table t (c int) voters=3;`, true, "CREATE TABLE `t` (`c` INT) VOTERS = 3"},
{`create table t (c int) learners="us,3";`, false, ""},
Expand All @@ -2353,6 +2354,7 @@ func TestDDL(t *testing.T) {
{`create table t (c int) /*T![placement] regions="us,3" */;`, true, "CREATE TABLE `t` (`c` INT) REGIONS = 'us,3'"},
{`create table t (c int) /*T![placement] followers="us,3 */";`, false, ""},
{`create table t (c int) /*T![placement] followers=3 */;`, true, "CREATE TABLE `t` (`c` INT) FOLLOWERS = 3"},
{`create table t (c int) /*T![placement] followers=0 */;`, false, ""},
{`create table t (c int) /*T![placement] voters="us,3" */;`, false, ""},
{`create table t (c int) /*T![placement] primary_region="us" regions="us,3" */;`, true, "CREATE TABLE `t` (`c` INT) PRIMARY_REGION = 'us' REGIONS = 'us,3'"},
{"create table t (c int) /*T![placement] placement policy=`x` */;", true, "CREATE TABLE `t` (`c` INT) PLACEMENT POLICY = `x`"},
Expand All @@ -2361,6 +2363,7 @@ func TestDDL(t *testing.T) {
{`alter table t primary_region="us";`, true, "ALTER TABLE `t` PRIMARY_REGION = 'us'"},
{`alter table t regions="us,3";`, true, "ALTER TABLE `t` REGIONS = 'us,3'"},
{`alter table t followers=3;`, true, "ALTER TABLE `t` FOLLOWERS = 3"},
{`alter table t followers=0;`, false, ""},
{`alter table t voters=3;`, true, "ALTER TABLE `t` VOTERS = 3"},
{`alter table t learners=3;`, true, "ALTER TABLE `t` LEARNERS = 3"},
{`alter table t schedule="even";`, true, "ALTER TABLE `t` SCHEDULE = 'even'"},
Expand All @@ -2375,6 +2378,7 @@ func TestDDL(t *testing.T) {
{`create database t primary_region="us";`, true, "CREATE DATABASE `t` PRIMARY_REGION = 'us'"},
{`create database t regions="us,3";`, true, "CREATE DATABASE `t` REGIONS = 'us,3'"},
{`create database t followers=3;`, true, "CREATE DATABASE `t` FOLLOWERS = 3"},
{`create database t followers=0;`, false, ""},
{`create database t voters=3;`, true, "CREATE DATABASE `t` VOTERS = 3"},
{`create database t learners=3;`, true, "CREATE DATABASE `t` LEARNERS = 3"},
{`create database t schedule="even";`, true, "CREATE DATABASE `t` SCHEDULE = 'even'"},
Expand All @@ -2390,6 +2394,7 @@ func TestDDL(t *testing.T) {
{`alter database t primary_region="us";`, true, "ALTER DATABASE `t` PRIMARY_REGION = 'us'"},
{`alter database t regions="us,3";`, true, "ALTER DATABASE `t` REGIONS = 'us,3'"},
{`alter database t followers=3;`, true, "ALTER DATABASE `t` FOLLOWERS = 3"},
{`alter database t followers=0;`, false, ""},
{`alter database t voters=3;`, true, "ALTER DATABASE `t` VOTERS = 3"},
{`alter database t learners=3;`, true, "ALTER DATABASE `t` LEARNERS = 3"},
{`alter database t schedule="even";`, true, "ALTER DATABASE `t` SCHEDULE = 'even'"},
Expand Down Expand Up @@ -3382,6 +3387,7 @@ func TestDDL(t *testing.T) {
{"create placement policy x primary_region='us'", true, "CREATE PLACEMENT POLICY `x` PRIMARY_REGION = 'us'"},
{"create placement policy x region='us, 3'", false, ""},
{"create placement policy x followers=3", true, "CREATE PLACEMENT POLICY `x` FOLLOWERS = 3"},
{"create placement policy x followers=0", false, ""},
{"create placement policy x voters=3", true, "CREATE PLACEMENT POLICY `x` VOTERS = 3"},
{"create placement policy x learners=3", true, "CREATE PLACEMENT POLICY `x` LEARNERS = 3"},
{"create placement policy x schedule='even'", true, "CREATE PLACEMENT POLICY `x` SCHEDULE = 'even'"},
Expand Down