Skip to content

Commit 456b395

Browse files
committed
use predefined endpoint separator
1 parent f3c367a commit 456b395

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

rpcx/internal/resolver/directbuilder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func (d *directBuilder) Build(target resolver.Target, cc resolver.ClientConn, op
1212
resolver.Resolver, error) {
1313
var addrs []resolver.Address
1414
endpoints := strings.FieldsFunc(target.Endpoint, func(r rune) bool {
15-
return r == EndpointSep
15+
return r == EndpointSepChar
1616
})
1717

1818
for _, val := range subset(endpoints, subsetSize) {

rpcx/internal/resolver/discovbuilder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type discovBuilder struct{}
1212
func (d *discovBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (
1313
resolver.Resolver, error) {
1414
hosts := strings.FieldsFunc(target.Authority, func(r rune) bool {
15-
return r == EndpointSep
15+
return r == EndpointSepChar
1616
})
1717
sub, err := discov.NewSubscriber(hosts, target.Endpoint)
1818
if err != nil {

rpcx/internal/resolver/resolver.go

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
package resolver
22

3-
import "google.golang.org/grpc/resolver"
3+
import (
4+
"fmt"
5+
6+
"google.golang.org/grpc/resolver"
7+
)
48

59
const (
6-
DirectScheme = "direct"
7-
DiscovScheme = "discov"
8-
EndpointSep = ','
9-
subsetSize = 32
10+
DirectScheme = "direct"
11+
DiscovScheme = "discov"
12+
EndpointSepChar = ','
13+
subsetSize = 32
1014
)
1115

1216
var (
13-
dirBuilder directBuilder
14-
disBuilder discovBuilder
17+
EndpointSep = fmt.Sprintf("%c", EndpointSepChar)
18+
dirBuilder directBuilder
19+
disBuilder discovBuilder
1520
)
1621

1722
func RegisterResolver() {

rpcx/internal/target.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
)
99

1010
func BuildDirectTarget(endpoints []string) string {
11-
return fmt.Sprintf("%s:///%s", resolver.DirectScheme, strings.Join(
12-
endpoints, fmt.Sprintf("%c", resolver.EndpointSep)))
11+
return fmt.Sprintf("%s:///%s", resolver.DirectScheme,
12+
strings.Join(endpoints, resolver.EndpointSep))
1313
}
1414

1515
func BuildDiscovTarget(endpoints []string, key string) string {
16-
return fmt.Sprintf("%s://%s/%s", resolver.DiscovScheme, strings.Join(
17-
endpoints, fmt.Sprintf("%c", resolver.EndpointSep)), key)
16+
return fmt.Sprintf("%s://%s/%s", resolver.DiscovScheme,
17+
strings.Join(endpoints, resolver.EndpointSep), key)
1818
}

0 commit comments

Comments
 (0)