move tidy to constructors: NewBundleFromOptions

Signed-off-by: ailinkid <314806019@qq.com>

ddl/placement/bundle.go

@@ -188,7 +188,7 @@ func NewBundleFromSugarOptions(options *model.PlacementSettings) (*Bundle, error
 }
 
 // NewBundleFromOptions will transform options into the bundle.
-func NewBundleFromOptions(options *model.PlacementSettings) (*Bundle, error) {
+func NewBundleFromOptions(options *model.PlacementSettings) (bundle *Bundle, err error) {
 	var isSyntaxSugar bool
 
 	if options == nil {
@@ -200,9 +200,24 @@ func NewBundleFromOptions(options *model.PlacementSettings) (*Bundle, error) {
 	}
 
 	if isSyntaxSugar {
-		return NewBundleFromSugarOptions(options)
+		bundle, err = NewBundleFromSugarOptions(options)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		bundle, err = NewBundleFromConstraintsOptions(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	if bundle == nil {
+		return nil, nil
+	}
+	err = bundle.Tidy()
+	if err != nil {
+		return nil, err
 	}
-	return NewBundleFromConstraintsOptions(options)
+	return bundle, err
 }
 
 // ApplyPlacementSpec will apply actions defined in PlacementSpec to the bundle.

ddl/placement_policy.go

@@ -218,10 +218,6 @@ func onAlterPlacementPolicy(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64,
 		if err != nil {
 			return ver, errors.Trace(err)
 		}
-		err = bundle.Tidy()
-		if err != nil {
-			return ver, errors.Trace(err)
-		}
 		// Do the http request only when the rules is existed.
 		bundles := make([]*placement.Bundle, 0, len(tblInfos)+len(partIDs))
 		// Reset bundle for tables (including the default rule for partition).