Skip to content

Commit

Permalink
style(common): rename constants in camel-case style (apache#1563)
Browse files Browse the repository at this point in the history
* style(common): rename constants in camel-case style

* style(common): rename Ttl to TTL
  • Loading branch information
justxuewei authored and binbin0325 committed Nov 6, 2021
1 parent e7d4e6b commit 1335bd0
Show file tree
Hide file tree
Showing 177 changed files with 1,224 additions and 1,227 deletions.
2 changes: 1 addition & 1 deletion cluster/cluster/available/cluster_invoker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
)

var availableUrl, _ = common.NewURL(fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider",
constant.LOCAL_HOST_VALUE, constant.DEFAULT_PORT))
constant.LocalHostValue, constant.DefaultPort))

func registerAvailable(invoker *mock.MockInvoker) protocol.Invoker {
extension.SetLoadbalance("random", random.NewLoadBalance)
Expand Down
8 changes: 4 additions & 4 deletions cluster/cluster/base/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ func (invoker *ClusterInvoker) DoSelect(lb loadbalance.LoadBalance, invocation p
}

url := invokers[0].GetURL()
sticky := url.GetParamBool(constant.STICKY_KEY, false)
sticky := url.GetParamBool(constant.StickyKey, false)
// Get the service method sticky config if have
sticky = url.GetMethodParamBool(invocation.MethodName(), constant.STICKY_KEY, sticky)
sticky = url.GetMethodParamBool(invocation.MethodName(), constant.StickyKey, sticky)

if invoker.StickyInvoker != nil && !isInvoked(invoker.StickyInvoker, invokers) {
invoker.StickyInvoker = nil
Expand Down Expand Up @@ -174,10 +174,10 @@ func GetLoadBalance(invoker protocol.Invoker, invocation protocol.Invocation) lo

methodName := invocation.MethodName()
// Get the service loadbalance config
lb := url.GetParam(constant.LOADBALANCE_KEY, constant.DEFAULT_LOADBALANCE)
lb := url.GetParam(constant.LoadbalanceKey, constant.DefaultLoadbalance)

// Get the service method loadbalance config if have
if v := url.GetMethodParam(methodName, constant.LOADBALANCE_KEY, ""); len(v) > 0 {
if v := url.GetMethodParam(methodName, constant.LoadbalanceKey, ""); len(v) > 0 {
lb = v
}
return extension.GetLoadbalance(lb)
Expand Down
2 changes: 1 addition & 1 deletion cluster/cluster/broadcast/cluster_invoker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
)

var broadcastUrl, _ = common.NewURL(
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LOCAL_HOST_VALUE, constant.DEFAULT_PORT))
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LocalHostValue, constant.DefaultPort))

func registerBroadcast(mockInvokers ...*mock.MockInvoker) protocol.Invoker {
extension.SetLoadbalance("random", random.NewLoadBalance)
Expand Down
12 changes: 6 additions & 6 deletions cluster/cluster/failback/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ func newClusterInvoker(directory directory.Directory) protocol.Invoker {
invoker := &clusterInvoker{
ClusterInvoker: base.NewClusterInvoker(directory),
}
retriesConfig := invoker.GetURL().GetParam(constant.RETRIES_KEY, constant.DEFAULT_FAILBACK_TIMES)
retriesConfig := invoker.GetURL().GetParam(constant.RetriesKey, constant.DefaultFailbackTimes)
retries, err := strconv.Atoi(retriesConfig)
if err != nil || retries < 0 {
logger.Error("Your retries config is invalid,pls do a check. And will use the default fail back times configuration instead.")
retries = constant.DEFAULT_FAILBACK_TIMES_INT
retries = constant.DefaultFailbackTimesInt
}

failbackTasksConfig := invoker.GetURL().GetParamInt(constant.FAIL_BACK_TASKS_KEY, constant.DEFAULT_FAILBACK_TASKS)
failbackTasksConfig := invoker.GetURL().GetParamInt(constant.FailBackTasksKey, constant.DefaultFailbackTasks)
if failbackTasksConfig <= 0 {
failbackTasksConfig = constant.DEFAULT_FAILBACK_TASKS
failbackTasksConfig = constant.DefaultFailbackTasks
}
invoker.maxRetries = int64(retries)
invoker.failbackTasks = failbackTasksConfig
Expand Down Expand Up @@ -141,10 +141,10 @@ func (invoker *clusterInvoker) Invoke(ctx context.Context, invocation protocol.I

// Get the service loadbalance config
url := invokers[0].GetURL()
lb := url.GetParam(constant.LOADBALANCE_KEY, constant.DEFAULT_LOADBALANCE)
lb := url.GetParam(constant.LoadbalanceKey, constant.DefaultLoadbalance)
// Get the service method loadbalance config if have
methodName := invocation.MethodName()
if v := url.GetMethodParam(methodName, constant.LOADBALANCE_KEY, ""); v != "" {
if v := url.GetMethodParam(methodName, constant.LoadbalanceKey, ""); v != "" {
lb = v
}

Expand Down
2 changes: 1 addition & 1 deletion cluster/cluster/failback/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import (
)

var failbackUrl, _ = common.NewURL(
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LOCAL_HOST_VALUE, constant.DEFAULT_PORT))
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LocalHostValue, constant.DefaultPort))

// registerFailback register failbackCluster to cluster extension.
func registerFailback(invoker *mock.MockInvoker) protocol.Invoker {
Expand Down
2 changes: 1 addition & 1 deletion cluster/cluster/failfast/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import (
)

var failfastUrl, _ = common.NewURL(
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LOCAL_HOST_VALUE, constant.DEFAULT_PORT))
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LocalHostValue, constant.DefaultPort))

// registerFailfast register failfastCluster to cluster extension.
func registerFailfast(invoker *mock.MockInvoker) protocol.Invoker {
Expand Down
8 changes: 4 additions & 4 deletions cluster/cluster/failover/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,21 @@ func (invoker *clusterInvoker) Invoke(ctx context.Context, invocation protocol.I

func getRetries(invokers []protocol.Invoker, methodName string) int {
if len(invokers) <= 0 {
return constant.DEFAULT_RETRIES_INT
return constant.DefaultRetriesInt
}

url := invokers[0].GetURL()
// get reties
retriesConfig := url.GetParam(constant.RETRIES_KEY, constant.DEFAULT_RETRIES)
retriesConfig := url.GetParam(constant.RetriesKey, constant.DefaultRetries)
// Get the service method loadbalance config if have
if v := url.GetMethodParam(methodName, constant.RETRIES_KEY, ""); len(v) != 0 {
if v := url.GetMethodParam(methodName, constant.RetriesKey, ""); len(v) != 0 {
retriesConfig = v
}

retries, err := strconv.Atoi(retriesConfig)
if err != nil || retries < 0 {
logger.Error("Your retries config is invalid,pls do a check. And will use the default retries configuration instead.")
retries = constant.DEFAULT_RETRIES_INT
retries = constant.DefaultRetriesInt
}

if retries > len(invokers) {
Expand Down
6 changes: 3 additions & 3 deletions cluster/cluster/failover/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func TestFailoverInvokeFail(t *testing.T) {
// nolint
func TestFailoverInvoke1(t *testing.T) {
urlParams := url.Values{}
urlParams.Set(constant.RETRIES_KEY, "3")
urlParams.Set(constant.RetriesKey, "3")
result := normalInvoke(4, urlParams)
assert.NoError(t, result.Error())
clusterpkg.Count = 0
Expand All @@ -86,8 +86,8 @@ func TestFailoverInvoke1(t *testing.T) {
// nolint
func TestFailoverInvoke2(t *testing.T) {
urlParams := url.Values{}
urlParams.Set(constant.RETRIES_KEY, "2")
urlParams.Set("methods.test."+constant.RETRIES_KEY, "3")
urlParams.Set(constant.RetriesKey, "2")
urlParams.Set("methods.test."+constant.RetriesKey, "3")

ivc := invocation.NewRPCInvocationWithOptions(invocation.WithMethodName("test"))
result := normalInvoke(4, urlParams, ivc)
Expand Down
4 changes: 2 additions & 2 deletions cluster/cluster/failsafe/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ func (invoker *clusterInvoker) Invoke(ctx context.Context, invocation protocol.I
url := invokers[0].GetURL()
methodName := invocation.MethodName()
// Get the service loadbalance config
lb := url.GetParam(constant.LOADBALANCE_KEY, constant.DEFAULT_LOADBALANCE)
lb := url.GetParam(constant.LoadbalanceKey, constant.DefaultLoadbalance)
// Get the service method loadbalance config if have
if v := url.GetMethodParam(methodName, constant.LOADBALANCE_KEY, ""); v != "" {
if v := url.GetMethodParam(methodName, constant.LoadbalanceKey, ""); v != "" {
lb = v
}
loadbalance := extension.GetLoadbalance(lb)
Expand Down
2 changes: 1 addition & 1 deletion cluster/cluster/failsafe/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import (
)

var failsafeUrl, _ = common.NewURL(
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LOCAL_HOST_VALUE, constant.DEFAULT_PORT))
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LocalHostValue, constant.DefaultPort))

// registerFailsafe register failsafeCluster to cluster extension.
func registerFailsafe(invoker *mock.MockInvoker) protocol.Invoker {
Expand Down
4 changes: 2 additions & 2 deletions cluster/cluster/forking/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ func (invoker *clusterInvoker) Invoke(ctx context.Context, invocation protocol.I
}

var selected []protocol.Invoker
forks := invoker.GetURL().GetParamByIntValue(constant.FORKS_KEY, constant.DEFAULT_FORKS)
timeouts := invoker.GetURL().GetParamInt(constant.TIMEOUT_KEY, constant.DEFAULT_TIMEOUT)
forks := invoker.GetURL().GetParamByIntValue(constant.ForksKey, constant.DefaultForks)
timeouts := invoker.GetURL().GetParamInt(constant.TimeoutKey, constant.DefaultTimeout)
if forks < 0 || forks > len(invokers) {
selected = invokers
} else {
Expand Down
10 changes: 5 additions & 5 deletions cluster/cluster/forking/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import (
)

var forkingUrl, _ = common.NewURL(
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LOCAL_HOST_VALUE, constant.DEFAULT_PORT))
fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider", constant.LocalHostValue, constant.DefaultPort))

func registerForking(mockInvokers ...*mock.MockInvoker) protocol.Invoker {
extension.SetLoadbalance(constant.LoadBalanceKeyRoundRobin, roundrobin.NewLoadBalance)
Expand All @@ -71,8 +71,8 @@ func TestForkingInvokeSuccess(t *testing.T) {
invokers := make([]*mock.MockInvoker, 0)

mockResult := &protocol.RPCResult{Rest: clusterpkg.Rest{Tried: 0, Success: true}}
forkingUrl.AddParam(constant.FORKS_KEY, strconv.Itoa(3))
// forkingUrl.AddParam(constant.TIMEOUT_KEY, strconv.Itoa(constant.DEFAULT_TIMEOUT))
forkingUrl.AddParam(constant.ForksKey, strconv.Itoa(3))
// forkingUrl.AddParam(constant.TimeoutKey, strconv.Itoa(constant.DefaultTimeout))

var wg sync.WaitGroup
wg.Add(2)
Expand Down Expand Up @@ -101,7 +101,7 @@ func TestForkingInvokeTimeout(t *testing.T) {
invokers := make([]*mock.MockInvoker, 0)

mockResult := &protocol.RPCResult{Rest: clusterpkg.Rest{Tried: 0, Success: true}}
forkingUrl.AddParam(constant.FORKS_KEY, strconv.Itoa(3))
forkingUrl.AddParam(constant.ForksKey, strconv.Itoa(3))

var wg sync.WaitGroup
wg.Add(2)
Expand Down Expand Up @@ -132,7 +132,7 @@ func TestForkingInvokeHalfTimeout(t *testing.T) {
invokers := make([]*mock.MockInvoker, 0)

mockResult := &protocol.RPCResult{Rest: clusterpkg.Rest{Tried: 0, Success: true}}
forkingUrl.AddParam(constant.FORKS_KEY, strconv.Itoa(3))
forkingUrl.AddParam(constant.ForksKey, strconv.Itoa(3))

var wg sync.WaitGroup
wg.Add(2)
Expand Down
2 changes: 1 addition & 1 deletion cluster/cluster/zoneaware/cluster_interceptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type interceptor struct {
}

func (z *interceptor) Invoke(ctx context.Context, invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
key := constant.REGISTRY_KEY + "." + constant.ZONE_FORCE_KEY
key := constant.RegistryKey + "." + constant.ZoneForceKey
force := ctx.Value(key)

if force != nil {
Expand Down
6 changes: 3 additions & 3 deletions cluster/cluster/zoneaware/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ func (invoker *clusterInvoker) Invoke(ctx context.Context, invocation protocol.I

// First, pick the invoker (XXXClusterInvoker) that comes from the local registry, distinguish by a 'preferred' key.
for _, invoker := range invokers {
key := constant.REGISTRY_KEY + "." + constant.PREFERRED_KEY
key := constant.RegistryKey + "." + constant.PreferredKey
if invoker.IsAvailable() && matchParam("true", key, "false", invoker) {
return invoker.Invoke(ctx, invocation)
}
}

// providers in the registry with the same zone
key := constant.REGISTRY_KEY + "." + constant.ZONE_KEY
key := constant.RegistryKey + "." + constant.ZoneKey
zone := invocation.AttachmentsByKey(key, "")
if "" != zone {
for _, invoker := range invokers {
Expand All @@ -73,7 +73,7 @@ func (invoker *clusterInvoker) Invoke(ctx context.Context, invocation protocol.I
}
}

force := invocation.AttachmentsByKey(constant.REGISTRY_KEY+"."+constant.ZONE_FORCE_KEY, "")
force := invocation.AttachmentsByKey(constant.RegistryKey+"."+constant.ZoneForceKey, "")
if "true" == force {
return &protocol.RPCResult{
Err: fmt.Errorf("no registry instance in zone or "+
Expand Down
30 changes: 15 additions & 15 deletions cluster/cluster/zoneaware/cluster_invoker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestZoneWareInvokerWithPreferredSuccess(t *testing.T) {
// defer ctrl.Finish()

mockResult := &protocol.RPCResult{
Attrs: map[string]interface{}{constant.PREFERRED_KEY: "true"},
Attrs: map[string]interface{}{constant.PreferredKey: "true"},
Rest: clusterpkg.Rest{Tried: 0, Success: true},
}

Expand All @@ -59,7 +59,7 @@ func TestZoneWareInvokerWithPreferredSuccess(t *testing.T) {
invoker.EXPECT().IsAvailable().Return(true).AnyTimes()
invoker.EXPECT().GetUrl().Return(url).AnyTimes()
if 0 == i {
url.SetParam(constant.REGISTRY_KEY+"."+constant.PREFERRED_KEY, "true")
url.SetParam(constant.RegistryKey+"."+constant.PreferredKey, "true")
invoker.EXPECT().Invoke(gomock.Any()).DoAndReturn(
func(invocation protocol.Invocation) protocol.Result {
return mockResult
Expand Down Expand Up @@ -100,22 +100,22 @@ func TestZoneWareInvokerWithWeightSuccess(t *testing.T) {
invoker := mock.NewMockInvoker(ctrl)
invoker.EXPECT().IsAvailable().Return(true).AnyTimes()
invoker.EXPECT().GetUrl().Return(url).AnyTimes()
url.SetParam(constant.REGISTRY_KEY+"."+constant.REGISTRY_LABEL_KEY, "true")
url.SetParam(constant.RegistryKey+"."+constant.RegistryLabelKey, "true")
if 1 == i {
url.SetParam(constant.REGISTRY_KEY+"."+constant.WEIGHT_KEY, w1)
url.SetParam(constant.RegistryKey+"."+constant.WeightKey, w1)
invoker.EXPECT().Invoke(gomock.Any()).DoAndReturn(
func(invocation protocol.Invocation) protocol.Result {
return &protocol.RPCResult{
Attrs: map[string]interface{}{constant.WEIGHT_KEY: w1},
Attrs: map[string]interface{}{constant.WeightKey: w1},
Rest: clusterpkg.Rest{Tried: 0, Success: true},
}
}).MaxTimes(100)
} else {
url.SetParam(constant.REGISTRY_KEY+"."+constant.WEIGHT_KEY, w2)
url.SetParam(constant.RegistryKey+"."+constant.WeightKey, w2)
invoker.EXPECT().Invoke(gomock.Any()).DoAndReturn(
func(invocation protocol.Invocation) protocol.Result {
return &protocol.RPCResult{
Attrs: map[string]interface{}{constant.WEIGHT_KEY: w2},
Attrs: map[string]interface{}{constant.WeightKey: w2},
Rest: clusterpkg.Rest{Tried: 0, Success: true},
}
}).MaxTimes(100)
Expand All @@ -131,10 +131,10 @@ func TestZoneWareInvokerWithWeightSuccess(t *testing.T) {
loop := 50
for i := 0; i < loop; i++ {
result := clusterInvoker.Invoke(context.Background(), &invocation.RPCInvocation{})
if w2 == result.Attachment(constant.WEIGHT_KEY, "0") {
if w2 == result.Attachment(constant.WeightKey, "0") {
w2Count++
}
if w1 == result.Attachment(constant.WEIGHT_KEY, "0") {
if w1 == result.Attachment(constant.WeightKey, "0") {
w1Count++
}
assert.NoError(t, result.Error())
Expand All @@ -155,15 +155,15 @@ func TestZoneWareInvokerWithZoneSuccess(t *testing.T) {
for i := 0; i < 2; i++ {
zoneValue := zoneArray[i]
url, _ := common.NewURL(fmt.Sprintf("dubbo://192.168.1.%v:20000/com.ikurento.user.UserProvider", i))
url.SetParam(constant.REGISTRY_KEY+"."+constant.ZONE_KEY, zoneValue)
url.SetParam(constant.RegistryKey+"."+constant.ZoneKey, zoneValue)

invoker := mock.NewMockInvoker(ctrl)
invoker.EXPECT().IsAvailable().Return(true).AnyTimes()
invoker.EXPECT().GetUrl().Return(url).AnyTimes()
invoker.EXPECT().Invoke(gomock.Any()).DoAndReturn(
func(invocation protocol.Invocation) protocol.Result {
return &protocol.RPCResult{
Attrs: map[string]interface{}{constant.ZONE_KEY: zoneValue},
Attrs: map[string]interface{}{constant.ZoneKey: zoneValue},
Rest: clusterpkg.Rest{Tried: 0, Success: true},
}
})
Expand All @@ -177,11 +177,11 @@ func TestZoneWareInvokerWithZoneSuccess(t *testing.T) {
inv := &invocation.RPCInvocation{}
// zone hangzhou
hz := zoneArray[0]
inv.SetAttachments(constant.REGISTRY_KEY+"."+constant.ZONE_KEY, hz)
inv.SetAttachments(constant.RegistryKey+"."+constant.ZoneKey, hz)

result := clusterInvoker.Invoke(context.Background(), inv)

assert.Equal(t, hz, result.Attachment(constant.ZONE_KEY, ""))
assert.Equal(t, hz, result.Attachment(constant.ZoneKey, ""))
}

func TestZoneWareInvokerWithZoneForceFail(t *testing.T) {
Expand All @@ -206,9 +206,9 @@ func TestZoneWareInvokerWithZoneForceFail(t *testing.T) {

inv := &invocation.RPCInvocation{}
// zone hangzhou
inv.SetAttachments(constant.REGISTRY_KEY+"."+constant.ZONE_KEY, "hangzhou")
inv.SetAttachments(constant.RegistryKey+"."+constant.ZoneKey, "hangzhou")
// zone force
inv.SetAttachments(constant.REGISTRY_KEY+"."+constant.ZONE_FORCE_KEY, "true")
inv.SetAttachments(constant.RegistryKey+"."+constant.ZoneForceKey, "true")

result := clusterInvoker.Invoke(context.Background(), inv)

Expand Down
6 changes: 3 additions & 3 deletions cluster/directory/base/directory.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ func (dir *Directory) GetDirectoryUrl() *common.URL {
}

func (dir *Directory) isProperRouter(url *common.URL) bool {
app := url.GetParam(constant.APPLICATION_KEY, "")
dirApp := dir.GetURL().GetParam(constant.APPLICATION_KEY, "")
app := url.GetParam(constant.ApplicationKey, "")
dirApp := dir.GetURL().GetParam(constant.ApplicationKey, "")
if len(dirApp) == 0 && dir.GetURL().SubURL != nil {
dirApp = dir.GetURL().SubURL.GetParam(constant.APPLICATION_KEY, "")
dirApp = dir.GetURL().SubURL.GetParam(constant.ApplicationKey, "")
}
serviceKey := dir.GetURL().ServiceKey()
if len(serviceKey) == 0 {
Expand Down
Loading

0 comments on commit 1335bd0

Please sign in to comment.