Mod: merge conflict resolve

.gitignore

@@ -4,6 +4,7 @@
 *.dll
 *.so
 *.dylib
+*.jar
 
 # Test binary, build with `go test -c`
 *.test
@@ -17,10 +18,15 @@ coverage.txt
 target/
 classes
 
-
-# Gopkg.lock
+# go mod, go test
 vendor/
+coverage.txt
 
 logs/
 .vscode/
 coverage.txt
+
+# unit test
+remoting/zookeeper/zookeeper-4unittest/
+config_center/zookeeper/zookeeper-4unittest/
+registry/zookeeper/zookeeper-4unittest/

CHANGE.md

@@ -0,0 +1,26 @@
+# Release Notes
+
+## 1.1.0
+
+### New Features
+
+- Support Java bigdecimal<https://github.com/apache/dubbo-go/pull/126>；
+- Support all JDK exceptions<https://github.com/apache/dubbo-go/pull/120>；
+- Support multi-version of service<https://github.com/apache/dubbo-go/pull/119>；
+- Allow user set custom params for registry<https://github.com/apache/dubbo-go/pull/117>；
+- Support zookeeper config center<https://github.com/apache/dubbo-go/pull/99>；
+- Failsafe/Failback  Cluster Strategy<https://github.com/apache/dubbo-go/pull/136>;
+
+### Enhancement
+
+- Use time wheel instead of time.After to defeat timer object memory leakage<https://github.com/apache/dubbo-go/pull/130> ；
+
+### Bugfixes
+
+- Preventing dead loop when got zookeeper unregister event<https://github.com/apache/dubbo-go/pull/129>；
+- Delete ineffassign<https://github.com/apache/dubbo-go/pull/127>；
+- Add wg.Done() for mockDataListener<https://github.com/apache/dubbo-go/pull/118>；
+- Delete wrong spelling words<https://github.com/apache/dubbo-go/pull/107>；
+- Use sync.Map to defeat from gettyClientPool deadlock<https://github.com/apache/dubbo-go/pull/106>；
+- Handle panic when function args list is empty<https://github.com/apache/dubbo-go/pull/98>；
+- url.Values is not safe map<https://github.com/apache/dubbo-go/pull/172>;

LICENSE

@@ -176,7 +176,6 @@
 
    END OF TERMS AND CONDITIONS
 
-
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

cluster/cluster_impl/failback_cluster_invoker.go

@@ -18,6 +18,7 @@
 package cluster_impl
 
 import (
+	"strconv"
 	"sync"
 	"time"
 )
@@ -54,15 +55,18 @@ func newFailbackClusterInvoker(directory cluster.Directory) protocol.Invoker {
 	invoker := &failbackClusterInvoker{
 		baseClusterInvoker: newBaseClusterInvoker(directory),
 	}
-	retriesConfig := invoker.GetUrl().GetParamInt(constant.RETRIES_KEY, constant.DEFAULT_FAILBACK_TIMES)
-	if retriesConfig <= 0 {
-		retriesConfig = constant.DEFAULT_FAILBACK_TIMES
+	retriesConfig := invoker.GetUrl().GetParam(constant.RETRIES_KEY, constant.DEFAULT_FAILBACK_TIMES)
+	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
 	}
+
 	failbackTasksConfig := invoker.GetUrl().GetParamInt(constant.FAIL_BACK_TASKS_KEY, constant.DEFAULT_FAILBACK_TASKS)
 	if failbackTasksConfig <= 0 {
 		failbackTasksConfig = constant.DEFAULT_FAILBACK_TASKS
 	}
-	invoker.maxRetries = retriesConfig
+	invoker.maxRetries = int64(retries)
 	invoker.failbackTasks = failbackTasksConfig
 	return invoker
 }

cluster/cluster_impl/failover_cluster_invoker.go

@@ -17,13 +17,18 @@
 
 package cluster_impl
 
+import (
+	"strconv"
+)
+
 import (
 	perrors "github.com/pkg/errors"
 )
 
 import (
 	"github.com/apache/dubbo-go/cluster"
 	"github.com/apache/dubbo-go/common/constant"
+	"github.com/apache/dubbo-go/common/logger"
 	"github.com/apache/dubbo-go/common/utils"
 	"github.com/apache/dubbo-go/protocol"
 )
@@ -53,16 +58,21 @@ func (invoker *failoverClusterInvoker) Invoke(invocation protocol.Invocation) pr
 	url := invokers[0].GetUrl()
 
 	//get reties
-	retries := url.GetParamInt(constant.RETRIES_KEY, constant.DEFAULT_RETRIES)
+	retriesConfig := url.GetParam(constant.RETRIES_KEY, constant.DEFAULT_RETRIES)
 
 	//Get the service method loadbalance config if have
-	if v := url.GetMethodParamInt(methodName, constant.RETRIES_KEY, 0); v != 0 {
-		retries = v
+	if v := url.GetMethodParam(methodName, constant.RETRIES_KEY, ""); 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
 	}
 	invoked := []protocol.Invoker{}
 	providers := []string{}
 	var result protocol.Result
-	for i := int64(0); i < retries; i++ {
+	for i := 0; i <= retries; i++ {
 		//Reselect before retry to avoid a change of candidate `invokers`.
 		//NOTE: if `invokers` changed, then `invoked` also lose accuracy.
 		if i > 0 {

cluster/cluster_impl/failover_cluster_test.go

@@ -118,22 +118,22 @@ func normalInvoke(t *testing.T, successCount int, urlParam url.Values, invocatio
 }
 func Test_FailoverInvokeSuccess(t *testing.T) {
 	urlParams := url.Values{}
-	result := normalInvoke(t, 2, urlParams)
+	result := normalInvoke(t, 3, urlParams)
 	assert.NoError(t, result.Error())
 	count = 0
 }
 
 func Test_FailoverInvokeFail(t *testing.T) {
 	urlParams := url.Values{}
-	result := normalInvoke(t, 3, urlParams)
+	result := normalInvoke(t, 4, urlParams)
 	assert.Errorf(t, result.Error(), "error")
 	count = 0
 }
 
 func Test_FailoverInvoke1(t *testing.T) {
 	urlParams := url.Values{}
 	urlParams.Set(constant.RETRIES_KEY, "3")
-	result := normalInvoke(t, 3, urlParams)
+	result := normalInvoke(t, 4, urlParams)
 	assert.NoError(t, result.Error())
 	count = 0
 }
@@ -144,7 +144,7 @@ func Test_FailoverInvoke2(t *testing.T) {
 	urlParams.Set("methods.test."+constant.RETRIES_KEY, "3")
 
 	ivc := invocation.NewRPCInvocationWithOptions(invocation.WithMethodName("test"))
-	result := normalInvoke(t, 3, urlParams, ivc)
+	result := normalInvoke(t, 4, urlParams, ivc)
 	assert.NoError(t, result.Error())
 	count = 0
 }

cluster/loadbalance/least_active.go

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-// @author yiji@apache.org
 package loadbalance
 
 import (

cluster/loadbalance/round_robin_test.go

@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package loadbalance
 
 import (

common/constant/default.go

@@ -26,13 +26,15 @@ const (
 )
 
 const (
-	DEFAULT_LOADBALANCE    = "random"
-	DEFAULT_RETRIES        = 2
-	DEFAULT_PROTOCOL       = "dubbo"
-	DEFAULT_REG_TIMEOUT    = "10s"
-	DEFAULT_CLUSTER        = "failover"
-	DEFAULT_FAILBACK_TIMES = 3
-	DEFAULT_FAILBACK_TASKS = 100
+	DEFAULT_LOADBALANCE        = "random"
+	DEFAULT_RETRIES            = "2"
+	DEFAULT_RETRIES_INT        = 2
+	DEFAULT_PROTOCOL           = "dubbo"
+	DEFAULT_REG_TIMEOUT        = "10s"
+	DEFAULT_CLUSTER            = "failover"
+	DEFAULT_FAILBACK_TIMES     = "3"
+	DEFAULT_FAILBACK_TIMES_INT = 3
+	DEFAULT_FAILBACK_TASKS     = 100
 )
 
 const (

common/extension/router_factory.go

@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package extension
 
 import (

common/proxy/proxy_factory/default.go

@@ -17,10 +17,20 @@
 
 package proxy_factory
 
+import (
+	"reflect"
+	"strings"
+)
+
+import (
+	perrors "github.com/pkg/errors"
+)
+
 import (
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/common/extension"
+	"github.com/apache/dubbo-go/common/logger"
 	"github.com/apache/dubbo-go/common/proxy"
 	"github.com/apache/dubbo-go/protocol"
 )
@@ -51,6 +61,86 @@ func (factory *DefaultProxyFactory) GetProxy(invoker protocol.Invoker, url *comm
 	return proxy.NewProxy(invoker, nil, attachments)
 }
 func (factory *DefaultProxyFactory) GetInvoker(url common.URL) protocol.Invoker {
-	// todo: call service
-	return protocol.NewBaseInvoker(url)
+	return &ProxyInvoker{
+		BaseInvoker: *protocol.NewBaseInvoker(url),
+	}
+}
+
+type ProxyInvoker struct {
+	protocol.BaseInvoker
+}
+
+func (pi *ProxyInvoker) Invoke(invocation protocol.Invocation) protocol.Result {
+	result := &protocol.RPCResult{}
+	result.SetAttachments(invocation.Attachments())
+
+	url := pi.GetUrl()
+
+	methodName := invocation.MethodName()
+	proto := url.Protocol
+	path := strings.TrimPrefix(url.Path, "/")
+	args := invocation.Arguments()
+
+	// get service
+	svc := common.ServiceMap.GetService(proto, path)
+	if svc == nil {
+		logger.Errorf("cannot find service [%s] in %s", path, proto)
+		result.SetError(perrors.Errorf("cannot find service [%s] in %s", path, proto))
+		return result
+	}
+
+	// get method
+	method := svc.Method()[methodName]
+	if method == nil {
+		logger.Errorf("cannot find method [%s] of service [%s] in %s", methodName, path, proto)
+		result.SetError(perrors.Errorf("cannot find method [%s] of service [%s] in %s", methodName, path, proto))
+		return result
+	}
+
+	in := []reflect.Value{svc.Rcvr()}
+	if method.CtxType() != nil {
+		in = append(in, method.SuiteContext(nil)) // todo: ctx will be used later.
+	}
+
+	// prepare argv
+	if (len(method.ArgsType()) == 1 || len(method.ArgsType()) == 2 && method.ReplyType() == nil) && method.ArgsType()[0].String() == "[]interface {}" {
+		in = append(in, reflect.ValueOf(args))
+	} else {
+		for i := 0; i < len(args); i++ {
+			t := reflect.ValueOf(args[i])
+			if !t.IsValid() {
+				at := method.ArgsType()[i]
+				if at.Kind() == reflect.Ptr {
+					at = at.Elem()
+				}
+				t = reflect.New(at)
+			}
+			in = append(in, t)
+		}
+	}
+
+	// prepare replyv
+	var replyv reflect.Value
+	if method.ReplyType() == nil && len(method.ArgsType()) > 0 {
+		replyv = reflect.New(method.ArgsType()[len(method.ArgsType())-1].Elem())
+		in = append(in, replyv)
+	}
+
+	returnValues := method.Method().Func.Call(in)
+
+	var retErr interface{}
+	if len(returnValues) == 1 {
+		retErr = returnValues[0].Interface()
+	} else {
+		replyv = returnValues[0]
+		retErr = returnValues[1].Interface()
+	}
+	if retErr != nil {
+		result.SetError(retErr.(error))
+	} else {
+		if replyv.IsValid() && (replyv.Kind() != reflect.Ptr || replyv.Kind() == reflect.Ptr && replyv.Elem().IsValid()) {
+			result.SetResult(replyv.Interface())
+		}
+	}
+	return result
 }

common/url.go

@@ -111,16 +111,19 @@ func WithParams(params url.Values) option {
 		url.Params = params
 	}
 }
+
 func WithParamsValue(key, val string) option {
 	return func(url *URL) {
 		url.Params.Set(key, val)
 	}
 }
+
 func WithProtocol(proto string) option {
 	return func(url *URL) {
 		url.Protocol = proto
 	}
 }
+
 func WithIp(ip string) option {
 	return func(url *URL) {
 		url.Ip = ip
@@ -144,6 +147,7 @@ func WithLocation(location string) option {
 		url.Location = location
 	}
 }
+
 func NewURLWithOptions(opts ...option) *URL {
 	url := &URL{}
 	for _, opt := range opts {