feat: Allow append pairs for New{Servicer,Storager}FromString (#718)

Xuanwo · web-flow · commit cd79fe723fa8 · 2021-08-24T12:56:51.000+08:00
* feat: Allow append pairs for  New{Servicer,Storager}FromString

Signed-off-by: Xuanwo &lt;github@xuanwo.io&gt;

* Add comments

Signed-off-by: Xuanwo &lt;github@xuanwo.io&gt;
diff --git a/cmd/definitions/bindata/bindata.go b/cmd/definitions/bindata/bindata.go
diff --git a/cmd/definitions/generate.go b/cmd/definitions/generate.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package main
diff --git a/cmd/definitions/main.go b/cmd/definitions/main.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package main
diff --git a/cmd/definitions/specs/build.go b/cmd/definitions/specs/build.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package specs
diff --git a/cmd/definitions/specs/build_test.go b/cmd/definitions/specs/build_test.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package specs
diff --git a/cmd/definitions/specs/parse.go b/cmd/definitions/specs/parse.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package specs
diff --git a/cmd/definitions/specs/spec.go b/cmd/definitions/specs/spec.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package specs
diff --git a/cmd/definitions/tools.go b/cmd/definitions/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package main
diff --git a/cmd/definitions/type.go b/cmd/definitions/type.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package main
diff --git a/internal/cmd/iterator/main.go b/internal/cmd/iterator/main.go
diff --git a/services/error.go b/services/error.go
@@ -13,7 +13,7 @@ type InternalError interface {
 	IsInternalError()
 }
 
-// Create a new error code.
+// NewErrorCode creates a new error code.
 //
 // Developers SHOULD use this function to define error codes (sentinel errors), instead of `NewErrorCode`
 //
@@ -30,7 +30,7 @@ func (e errorCode) Error() string {
 	return e.s
 }
 
-// implements InternalError
+// IsInternalError implements InternalError
 func (e errorCode) IsInternalError() {}
 
 var (
@@ -139,7 +139,7 @@ func (e MetadataUnrecognizedError) Unwrap() error {
 	return ErrCapabilityInsufficient
 }
 
-// implements InternalError
+// IsInternalError implements InternalError
 func (e MetadataUnrecognizedError) IsInternalError() {}
 
 // PairUnsupportedError means this operation has unsupported pair.
@@ -156,7 +156,7 @@ func (e PairUnsupportedError) Unwrap() error {
 	return ErrCapabilityInsufficient
 }
 
-// implements InternalError
+// IsInternalError implements InternalError
 func (e PairUnsupportedError) IsInternalError() {}
 
 // PairRequiredError means this operation has required pair but missing.
@@ -173,7 +173,7 @@ func (e PairRequiredError) Unwrap() error {
 	return ErrRestrictionDissatisfied
 }
 
-// implements InternalError
+// IsInternalError implements InternalError
 func (e PairRequiredError) IsInternalError() {}
 
 // ObjectModeInvalidError means the provided object mode is invalid.
@@ -190,7 +190,7 @@ func (e ObjectModeInvalidError) Unwrap() error {
 	return ErrObjectModeInvalid
 }
 
-// implements InternalError
+// IsInternalError implements InternalError
 func (e ObjectModeInvalidError) IsInternalError() {}
 
 // ListModeInvalidError means the provided list mode is invalid.
@@ -206,5 +206,5 @@ func (e ListModeInvalidError) Unwrap() error {
 	return ErrListModeInvalid
 }
 
-// implements InternalError
+// IsInternalError implements InternalError
 func (e ListModeInvalidError) IsInternalError() {}
diff --git a/services/new.go b/services/new.go
@@ -89,20 +89,26 @@ func RegisterSchema(ty string, m map[string]string) {
 	servicePairMaps[ty] = m
 }
 
-func NewServicerFromString(connStr string) (types.Servicer, error) {
-	ty, ps, err := parseConnectionString(connStr)
+// NewServicerFromString will create a new service via connection string.
+func NewServicerFromString(connStr string, ps ...types.Pair) (types.Servicer, error) {
+	ty, psc, err := parseConnectionString(connStr)
 	if err != nil {
 		return nil, InitError{Op: "new_servicer", Type: ty, Err: err, Pairs: ps}
 	}
-	return NewServicer(ty, ps...)
+	// Append ps after connection string to keep pairs order.
+	psc = append(psc, ps...)
+	return NewServicer(ty, psc...)
 }
 
-func NewStoragerFromString(connStr string) (types.Storager, error) {
-	ty, ps, err := parseConnectionString(connStr)
+// NewStoragerFromString will create a new storager via connection string.
+func NewStoragerFromString(connStr string, ps ...types.Pair) (types.Storager, error) {
+	ty, psc, err := parseConnectionString(connStr)
 	if err != nil {
 		return nil, InitError{Op: "new_storager", Type: ty, Err: err, Pairs: ps}
 	}
-	return NewStorager(ty, ps...)
+	// Append ps after connection string to keep pairs order.
+	psc = append(psc, ps...)
+	return NewStorager(ty, psc...)
 }
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build tools`
`1`	`2`	`// +build tools`
`2`	`3`
`3`	`4`	`package main`