refactor

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
pingcap · Feb 8, 2023 · ed33da0 · ed33da0
1 parent 8c3f5ff
commit ed33da0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/ddl/ddl_api.go b/ddl/ddl_api.go
@@ -7615,14 +7615,11 @@ func checkIgnorePlacementDDL(ctx sessionctx.Context) bool {
 
 // AddResourceGroup implements the DDL interface, creates a resource group.
 func (d *ddl) AddResourceGroup(ctx sessionctx.Context, stmt *ast.CreateResourceGroupStmt) (err error) {
-	groupInfo := &model.ResourceGroupInfo{ResourceGroupSettings: &model.ResourceGroupSettings{}}
 	groupName := stmt.ResourceGroupName
-	groupInfo.Name = groupName
-	for _, opt := range stmt.ResourceGroupOptionList {
-		err := SetDirectResourceGroupUnit(groupInfo.ResourceGroupSettings, opt.Tp, opt.StrValue, opt.UintValue, opt.BoolValue)
-		if err != nil {
-			return err
-		}
+	groupInfo := &model.ResourceGroupInfo{Name: groupName, ResourceGroupSettings: &model.ResourceGroupSettings{}}
+	groupInfo, err = buildResourceGroup(groupInfo, stmt.ResourceGroupOptionList)
+	if err != nil {
+		return err
 	}
 
 	if _, ok := d.GetInfoSchemaWithInterceptor(ctx).ResourceGroupByName(groupName); ok {
@@ -7711,6 +7708,7 @@ func buildResourceGroup(oldGroup *model.ResourceGroupInfo, options []*ast.Resour
 			return nil, err
 		}
 	}
+	groupInfo.ResourceGroupSettings.Adjust()
 	return groupInfo, nil
 }
 

diff --git a/ddl/resourcegroup/group.go b/ddl/resourcegroup/group.go
@@ -35,15 +35,11 @@ func NewGroupFromOptions(groupName string, options *model.ResourceGroupSettings)
 	}
 	if options.RURate > 0 {
 		group.Mode = rmpb.GroupMode_RUMode
-		burstLimit := options.BurstLimit
-		if burstLimit >= 0 {
-			burstLimit = int64(options.RURate)
-		}
 		group.RUSettings = &rmpb.GroupRequestUnitSettings{
 			RU: &rmpb.TokenBucket{
 				Settings: &rmpb.TokenLimitSettings{
 					FillRate:   options.RURate,
-					BurstLimit: burstLimit,
+					BurstLimit: options.BurstLimit,
 				},
 			},
 		}

diff --git a/parser/model/model.go b/parser/model/model.go
@@ -1874,6 +1874,14 @@ func (p *ResourceGroupSettings) String() string {
 	return sb.String()
 }
 
+// Adjust adjusts the resource group settings.
+func (p *ResourceGroupSettings) Adjust() {
+	// Curretly we only support ru_per_sec sytanx, so BurstLimit(capicity) is always same as ru_per_sec.
+	if p.BurstLimit == 0 {
+		p.BurstLimit = int64(p.RURate)
+	}
+}
+
 // Clone clones the resource group settings.
 func (p *ResourceGroupSettings) Clone() *ResourceGroupSettings {
 	cloned := *p