You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/01/09 09:35:38 UTC
[dubbo-go] branch develop updated (d12bf6a -> e633a73)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.
omit d12bf6a Merge pull request #981 from lzp0412/develop
new e633a73 Merge pull request #981 from lzp0412/develop
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d12bf6a)
\
N -- N -- N refs/heads/develop (e633a73)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cluster/cluster_impl/available_cluster.go | 2 +-
common/constant/default.go | 2 +-
common/constant/version.go | 4 ++--
common/proxy/proxy_test.go | 8 ++++----
config_center/configurator/override_test.go | 8 ++++----
filter/filter_impl/tps/tps_limiter_method_service_test.go | 2 +-
metadata/service/remote/service_proxy.go | 2 +-
protocol/grpc/client.go | 6 +++---
registry/etcdv3/service_discovery_test.go | 4 ++--
registry/nacos/service_discovery_test.go | 4 ++--
remoting/exchange.go | 2 +-
11 files changed, 22 insertions(+), 22 deletions(-)
[dubbo-go] 01/01: Merge pull request #981 from lzp0412/develop
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit e633a73d766f574747f8c619aa1910e5ab5b4a7f
Merge: 34fa1da 85a21e8
Author: Xin.Zh <dr...@foxmail.com>
AuthorDate: Thu Jan 7 01:12:12 2021 +0800
Merge pull request #981 from lzp0412/develop
Upgrade nacos-sdk-go version to v1.0.3
NOTICE | 2 +-
README.md | 6 +++---
README_CN.md | 14 +++++++-------
cluster/cluster_impl/available_cluster.go | 2 +-
common/constant/default.go | 2 +-
common/constant/version.go | 4 ++--
common/proxy/proxy_test.go | 8 ++++----
config_center/configurator/override_test.go | 8 ++++----
filter/filter_impl/tps/tps_limiter_method_service_test.go | 2 +-
go.mod | 2 +-
go.sum | 4 ++--
metadata/service/remote/service_proxy.go | 2 +-
protocol/grpc/client.go | 6 +++---
registry/etcdv3/service_discovery_test.go | 4 ++--
registry/nacos/service_discovery_test.go | 4 ++--
remoting/exchange.go | 2 +-
16 files changed, 36 insertions(+), 36 deletions(-)
diff --cc NOTICE
index 1120c20,1120c20..e0f4af6
--- a/NOTICE
+++ b/NOTICE
@@@ -1,5 -1,5 +1,5 @@@
Apache Dubbo-go
--Copyright 2018-2020 The Apache Software Foundation
++Copyright 2018-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --cc README.md
index f950a4b,f950a4b..8af021b
--- a/README.md
+++ b/README.md
@@@ -16,14 -16,14 +16,14 @@@ Apache License, Version 2.
## Release note ##
++[v1.5.5 - Jan 5, 2021](https://github.com/apache/dubbo-go/releases/tag/v1.5.5)
++
[v1.4.5 - Nov 18, 2020](https://github.com/apache/dubbo-go/releases/tag/v1.4.5)
[v1.5.4 - Nov 1, 2020](https://github.com/apache/dubbo-go/releases/tag/v1.5.4)
[v1.5.3 - Sep 23, 2020](https://github.com/apache/dubbo-go/releases/tag/v1.5.3)
--[v1.5.2 - discard]()
--
[v1.5.1 - Aug 23, 2020](https://github.com/apache/dubbo-go/releases/tag/v1.5.1)
[v1.5.0 - July 24, 2020](https://github.com/apache/dubbo-go/releases/tag/v1.5.0)
@@@ -260,7 -260,7 +260,7 @@@ If you are using [apache/dubbo-go](gith
</a>
</td>
</tr>
-- <tr></tr>
++ <tr></tr>
</tbody>
</table>
</div>
diff --cc README_CN.md
index ff72428,ff72428..079cfa5
--- a/README_CN.md
+++ b/README_CN.md
@@@ -15,14 -15,14 +15,14 @@@ Apache License, Version 2.
## 发布日志 ##
++[v1.5.5 - 2021年1月5日](https://github.com/apache/dubbo-go/releases/tag/v1.5.5)
++
[v1.4.5 - 2020年11月18日](https://github.com/apache/dubbo-go/releases/tag/v1.4.5)
[v1.5.4 - 2020年11月1日](https://github.com/apache/dubbo-go/releases/tag/v1.5.4)
[v1.5.3 - 2020年9月23日](https://github.com/apache/dubbo-go/releases/tag/v1.5.3)
--[v1.5.2 - 舍弃]()
--
[v1.5.1 - 2020年8月23日](https://github.com/apache/dubbo-go/releases/tag/v1.5.1)
[v1.5.0 - 2020年7月24日](https://github.com/apache/dubbo-go/releases/tag/v1.5.0)
@@@ -67,11 -67,11 +67,11 @@@
* Jsonrpc2.0
* [gRPC](https://github.com/apache/dubbo-go/pull/311)
* [RESTful](https://github.com/apache/dubbo-go/pull/352)
--
++
- 路由器
* [Condition router](https://github.com/apache/dubbo-go/pull/294)
* [Health check router](https://github.com/apache/dubbo-go/pull/389)
--
++
- 注册中心
* ZooKeeper
* [etcd v3](https://github.com/apache/dubbo-go/pull/148)
@@@ -112,7 -112,7 +112,7 @@@
- 调用
* [泛化调用](https://github.com/apache/dubbo-go/pull/122)
--
++
- 监控
* Opentracing API
* [Prometheus](https://github.com/apache/dubbo-go/pull/342)
@@@ -258,7 -258,7 +258,7 @@@ make tes
</a>
</td>
</tr>
-- <tr></tr>
++ <tr></tr>
</tbody>
</table>
--</div>
++</div>
diff --cc cluster/cluster_impl/available_cluster.go
index ebd5767,ebd5767..1f41890
--- a/cluster/cluster_impl/available_cluster.go
+++ b/cluster/cluster_impl/available_cluster.go
@@@ -39,6 -39,6 +39,6 @@@ func NewAvailableCluster() cluster.Clus
}
// Join returns a baseClusterInvoker instance
--func (cluser *availableCluster) Join(directory cluster.Directory) protocol.Invoker {
++func (cluster *availableCluster) Join(directory cluster.Directory) protocol.Invoker {
return NewAvailableClusterInvoker(directory)
}
diff --cc common/constant/default.go
index 4165942,4165942..bbe022c
--- a/common/constant/default.go
+++ b/common/constant/default.go
@@@ -81,7 -81,7 +81,7 @@@ const
const (
SIMPLE_METADATA_SERVICE_NAME = "MetadataService"
-- DEFAULT_REVIESION = "N/A"
++ DEFAULT_REVISION = "N/A"
)
const (
diff --cc common/constant/version.go
index 7302243,7302243..0403e3a
--- a/common/constant/version.go
+++ b/common/constant/version.go
@@@ -19,9 -19,9 +19,9 @@@ package constan
const (
// Version apache/dubbo-go version
-- Version = "1.3.0"
++ Version = "1.5.5"
// Name module name
Name = "dubbogo"
// Date release date
-- DATE = "2020/01/12"
++ DATE = "2021/01/05"
)
diff --cc common/proxy/proxy_test.go
index cbac1f3,cbac1f3..c335bf6
--- a/common/proxy/proxy_test.go
+++ b/common/proxy/proxy_test.go
@@@ -132,10 -132,10 +132,10 @@@ func TestProxyImplementForContext(t *te
p := NewProxy(invoker, nil, map[string]string{constant.ASYNC_KEY: "false"})
s := &TestService{}
p.Implement(s)
-- attahments1 := make(map[string]interface{}, 4)
-- attahments1["k1"] = "v1"
-- attahments1["k2"] = "v2"
-- context := context.WithValue(context.Background(), constant.AttachmentKey, attahments1)
++ attachments1 := make(map[string]interface{}, 4)
++ attachments1["k1"] = "v1"
++ attachments1["k2"] = "v2"
++ context := context.WithValue(context.Background(), constant.AttachmentKey, attachments1)
r, err := p.Get().(*TestService).MethodSix(context, "xxx")
v1 := r.(map[string]interface{})
assert.NoError(t, err)
diff --cc config_center/configurator/override_test.go
index bb9c367,bb9c367..4d2552d
--- a/config_center/configurator/override_test.go
+++ b/config_center/configurator/override_test.go
@@@ -37,7 -37,7 +37,7 @@@ const
failover = "failover"
)
--func TestConfigureVerison2p6(t *testing.T) {
++func TestConfigureVersion2p6(t *testing.T) {
url, err := common.NewURL("override://0.0.0.0:0/com.xxx.mock.userProvider?group=1&version=1&cluster=failfast&application=BDTService")
assert.NoError(t, err)
configurator := extension.GetConfigurator(defaults, url)
@@@ -49,7 -49,7 +49,7 @@@
assert.Equal(t, failfast, providerUrl.GetParam(constant.CLUSTER_KEY, ""))
}
--func TestConfigureVerisonOverrideAddr(t *testing.T) {
++func TestConfigureVersionOverrideAddr(t *testing.T) {
url, err := common.NewURL("override://0.0.0.0:0/com.xxx.mock.userProvider?group=1&version=1&cluster=failfast&application=BDTService&providerAddresses=127.0.0.2:20001|127.0.0.3:20001")
assert.NoError(t, err)
configurator := extension.GetConfigurator(defaults, url)
@@@ -61,7 -61,7 +61,7 @@@
assert.Equal(t, failover, providerUrl.GetParam(constant.CLUSTER_KEY, ""))
}
--func TestConfigureVerison2p6WithIp(t *testing.T) {
++func TestConfigureVersion2p6WithIp(t *testing.T) {
url, err := common.NewURL("override://127.0.0.1:20001/com.xxx.mock.userProvider?group=1&version=1&cluster=failfast&application=BDTService")
assert.NoError(t, err)
configurator := extension.GetConfigurator(defaults, url)
@@@ -74,7 -74,7 +74,7 @@@
}
--func TestConfigureVerison2p7(t *testing.T) {
++func TestConfigureVersion2p7(t *testing.T) {
url, err := common.NewURL("jsonrpc://0.0.0.0:20001/com.xxx.mock.userProvider?group=1&version=1&cluster=failfast&application=BDTService&configVersion=1.0&side=provider")
assert.NoError(t, err)
configurator := extension.GetConfigurator(defaults, url)
diff --cc filter/filter_impl/tps/tps_limiter_method_service_test.go
index 4ff0a23,4ff0a23..5baa70a
--- a/filter/filter_impl/tps/tps_limiter_method_service_test.go
+++ b/filter/filter_impl/tps/tps_limiter_method_service_test.go
@@@ -22,7 -22,7 +22,6 @@@ import
"testing"
)
import (
-- "github.com/apache/dubbo-go/filter"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
)
@@@ -31,6 -31,6 +30,7 @@@ 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/filter"
"github.com/apache/dubbo-go/protocol/invocation"
)
diff --cc go.sum
index cd5e3b4,d69824e..bc0b1ec
--- a/go.sum
+++ b/go.sum
@@@ -568,8 -568,9 +568,8 @@@ github.com/munnerz/goautoneg v0.0.0-201
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
--github.com/nacos-group/nacos-sdk-go v1.0.1 h1:VNmXGlSS28xOmkO5Nxk5WRp6f1HMosAmG9pDtcnUFcw=
--github.com/nacos-group/nacos-sdk-go v1.0.1/go.mod h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
++github.com/nacos-group/nacos-sdk-go v1.0.3 h1:A2tCWcjuP6bSEjEfNwNnrY+9M0h13XRMDyLY+DPqHMI=
+ github.com/nacos-group/nacos-sdk-go v1.0.3/go.mod h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
diff --cc metadata/service/remote/service_proxy.go
index d0caa18,d0caa18..e0cd6e0
--- a/metadata/service/remote/service_proxy.go
+++ b/metadata/service/remote/service_proxy.go
@@@ -135,7 -135,7 +135,7 @@@ func (m metadataServiceProxy) Version(
func newMetadataServiceProxy(ins registry.ServiceInstance) service.MetadataService {
revision := ins.GetMetadata()[constant.EXPORTED_SERVICES_REVISION_PROPERTY_NAME]
if len(revision) == 0 {
-- revision = constant.DEFAULT_REVIESION
++ revision = constant.DEFAULT_REVISION
}
return &metadataServiceProxy{
diff --cc protocol/grpc/client.go
index 33f0a08,33f0a08..24ab125
--- a/protocol/grpc/client.go
+++ b/protocol/grpc/client.go
@@@ -93,15 -93,15 +93,15 @@@ type Client struct
func NewClient(url *common.URL) *Client {
// if global trace instance was set , it means trace function enabled. If not , will return Nooptracer
tracer := opentracing.GlobalTracer()
-- dailOpts := make([]grpc.DialOption, 0, 4)
++ dialOpts := make([]grpc.DialOption, 0, 4)
maxMessageSize, _ := strconv.Atoi(url.GetParam(constant.MESSAGE_SIZE_KEY, "4"))
-- dailOpts = append(dailOpts, grpc.WithInsecure(), grpc.WithBlock(), grpc.WithUnaryInterceptor(
++ dialOpts = append(dialOpts, grpc.WithInsecure(), grpc.WithBlock(), grpc.WithUnaryInterceptor(
otgrpc.OpenTracingClientInterceptor(tracer, otgrpc.LogPayloads())),
grpc.WithDefaultCallOptions(
grpc.CallContentSubtype(clientConf.ContentSubType),
grpc.MaxCallRecvMsgSize(1024*1024*maxMessageSize),
grpc.MaxCallSendMsgSize(1024*1024*maxMessageSize)))
-- conn, err := grpc.Dial(url.Location, dailOpts...)
++ conn, err := grpc.Dial(url.Location, dialOpts...)
if err != nil {
panic(err)
}
diff --cc registry/etcdv3/service_discovery_test.go
index d8e3f1a,d8e3f1a..5609cf7
--- a/registry/etcdv3/service_discovery_test.go
+++ b/registry/etcdv3/service_discovery_test.go
@@@ -75,6 -75,6 +75,6 @@@ func Test_newEtcdV3ServiceDiscovery(t *
func TestEtcdV3ServiceDiscovery_GetDefaultPageSize(t *testing.T) {
setUp()
-- serviceDiscovry := &etcdV3ServiceDiscovery{}
-- assert.Equal(t, registry.DefaultPageSize, serviceDiscovry.GetDefaultPageSize())
++ serviceDiscovery := &etcdV3ServiceDiscovery{}
++ assert.Equal(t, registry.DefaultPageSize, serviceDiscovery.GetDefaultPageSize())
}
diff --cc registry/nacos/service_discovery_test.go
index 2af1d5b,2af1d5b..aa044ad
--- a/registry/nacos/service_discovery_test.go
+++ b/registry/nacos/service_discovery_test.go
@@@ -166,8 -166,8 +166,8 @@@ func TestNacosServiceDiscovery_CRUD(t *
func TestNacosServiceDiscovery_GetDefaultPageSize(t *testing.T) {
prepareData()
-- serviceDiscovry, _ := extension.GetServiceDiscovery(constant.NACOS_KEY, testName)
-- assert.Equal(t, registry.DefaultPageSize, serviceDiscovry.GetDefaultPageSize())
++ serviceDiscovery, _ := extension.GetServiceDiscovery(constant.NACOS_KEY, testName)
++ assert.Equal(t, registry.DefaultPageSize, serviceDiscovery.GetDefaultPageSize())
}
func prepareData() {
diff --cc remoting/exchange.go
index 5fbd8ae,5fbd8ae..ad136a7
--- a/remoting/exchange.go
+++ b/remoting/exchange.go
@@@ -129,7 -129,7 +129,7 @@@ type AsyncCallbackResponse struct
Reply interface{}
}
--// the client sends requst to server, there is one pendingResponse at client side to wait the response from server
++// the client sends request to server, there is one pendingResponse at client side to wait the response from server
type PendingResponse struct {
seq int64
Err error