Skip to content
Snippets Groups Projects
Commit 1c9a7164 authored by 邹毅贤's avatar 邹毅贤
Browse files

fix review comment

parent 4d73001c
No related branches found
No related tags found
No related merge requests found
......@@ -52,7 +52,7 @@ func (c RouterChain) Route(invoker []protocol.Invoker, url *common.URL, invocati
return finalInvokers
}
func (c RouterChain) AddRouters(routers []router.Router) {
newRouters := make([]router.Router, 0)
newRouters := make([]router.Router, 0, len(c.builtinRouters)+len(routers))
newRouters = append(newRouters, c.builtinRouters...)
newRouters = append(newRouters, routers...)
sortRouter(newRouters)
......@@ -64,7 +64,7 @@ func NewRouterChain(url *common.URL) (*RouterChain, error) {
if len(routerFactories) == 0 {
return nil, perrors.Errorf("Illegal route rule!")
}
routers := make([]router.Router, 0)
routers := make([]router.Router, 0, len(routerFactories))
for key, routerFactory := range routerFactories {
r, err := routerFactory().Router(url)
if r == nil || err != nil {
......
......@@ -29,10 +29,10 @@ func IsMatchGlobalPattern(pattern string, value string, param *common.URL) bool
if param != nil && strings.HasPrefix(pattern, "$") {
pattern = param.GetRawParam(pattern[1:])
}
return IsMatchInternalPattern(pattern, value)
return isMatchInternalPattern(pattern, value)
}
func IsMatchInternalPattern(pattern string, value string) bool {
func isMatchInternalPattern(pattern string, value string) bool {
if "*" == pattern {
return true
}
......
......@@ -31,14 +31,14 @@ import (
)
func TestIsMatchInternalPattern(t *testing.T) {
assert.Equal(t, true, IsMatchInternalPattern("*", "value"))
assert.Equal(t, true, IsMatchInternalPattern("", ""))
assert.Equal(t, false, IsMatchInternalPattern("", "value"))
assert.Equal(t, true, IsMatchInternalPattern("value", "value"))
assert.Equal(t, true, IsMatchInternalPattern("v*", "value"))
assert.Equal(t, true, IsMatchInternalPattern("*ue", "value"))
assert.Equal(t, true, IsMatchInternalPattern("*e", "value"))
assert.Equal(t, true, IsMatchInternalPattern("v*e", "value"))
assert.Equal(t, true, isMatchInternalPattern("*", "value"))
assert.Equal(t, true, isMatchInternalPattern("", ""))
assert.Equal(t, false, isMatchInternalPattern("", "value"))
assert.Equal(t, true, isMatchInternalPattern("value", "value"))
assert.Equal(t, true, isMatchInternalPattern("v*", "value"))
assert.Equal(t, true, isMatchInternalPattern("*ue", "value"))
assert.Equal(t, true, isMatchInternalPattern("*e", "value"))
assert.Equal(t, true, isMatchInternalPattern("v*e", "value"))
}
func TestIsMatchGlobPattern(t *testing.T) {
......
......@@ -138,14 +138,6 @@ func (dir *registryDirectory) refreshInvokers(res *registry.ServiceEvent) {
urls = append(urls, v.(*common.URL))
}
for _, v := range dirUrl.GetBackupUrls() {
p := v.Protocol
category := v.GetParam(constant.CATEGORY_KEY, constant.PROVIDERS_CATEGORY)
if strings.EqualFold(category, constant.ROUTERS_CATEGORY) || strings.EqualFold(constant.ROUTE_PROTOCOL, p) {
urls = append(urls, v)
}
}
if len(urls) > 0 {
routers := toRouters(urls)
logger.Infof("Init file condition router success, size: %v", len(routers))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment