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 2020/08/18 02:54:33 UTC

[dubbo-go] branch master updated (aaa8be3 -> 101e696)

This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.


    from aaa8be3  Merge pull request #704 from Howie66/master
     add f85a42a  go mod tidy
     add b587f64  update consul version
     add 7970243  remove replace
     add 9632fd7  update consul test
     add ea57c44  code format
     add 1a16b04  code_format
     add 655d1df  code format
     add d92f931  Merge branch 'code_format' into consul
     add 776f40c  Merge branch 'master' into consul
     add 03fc552  support distributed transaction, by experimentally [seata-golang](https://github.com/dk-lockdown/seata-golang)
     add 6ffa278  add comments
     add 2a46f84  formant adjustment
     add 09c5caf  update `GetSeataFilter` to `getSeataFilter`
     add 697fa50  optimization
     add 1d2278d  bugfix
     add dc49015  Merge pull request #647 from dk-lockdown/develop
     add 667540a  Imp: add some comments
     add d3db7da  Imp: some improvements including add comments
     add 892d859  Imp: three improvements
     add 5868ed1  Imp: three improvements
     add 53f2b37  Imp: replace 'would return' to returns xxx
     add 038c0aa  Merge pull request #664 from Howie66/develop
     add f1b3487  Merge pull request #17 from apache/develop
     add e59c00b  solve nacos unit test failed
     add 280a606  Merge pull request #669 from lzp0412/develop
     add 3b51b99  add lock
     add 2131a68  Merge branch 'develop' of github.com:apache/dubbo-go into develop
     add 6920c15  Merge branch 'develop' of github.com:apache/dubbo-go into develop
     add 00f9946  modify return error and log
     add 9c857ed  change log level
     add 053aab5  Merge pull request #652 from cvictory/develop
     add 35fb946  Merge branch 'develop' into consul
     add d795e2a  decrease stack level in log
     add 7d9abd2  add consul metadata in readme
     add cb15ad0  code format
     add 66e0f4d  wait nacos client cache flush
     add e60bb08  fix
     add 2083dba  revert
     add 272ddd5  Merge pull request #672 from dubbo-x/consul
     add fdcd408  let go_restful_server support same url and different methodType
     add f2261ce  format code
     add db1e5da  Merge pull request #676 from Patrick0308/rest_methodtype
     add bc46c9a  Modify README_CN
     add 12680fd  Modify README_CN.md
     add 65b215a  Merge pull request #18 from apache/develop
     add 0ef7765  unregister instance when registry destroy
     add 2d8224e  fix review comment
     add af3176f  fix nacos unit test failed
     add da4225e  Fix kubernetes ut
     add 79ade24  FMT k8s pkg
     add 269714a  Merge pull request #693 from sxllwx/fix_k8s_ut
     add 7ad26fd  try to fix zk problem
     add 53587ec  try to fix ut failed
     add 7a88bab  change the default value to 15m
     add c33f4ea  change the default value to 15min
     add 9b4745f  fix comments
     add c4fbd60  Merge pull request #692 from wenxuwan/master
     add 0b5e2f4  Merge pull request #689 from lzp0412/develop
     add 2e01ed5  Ftr: add dynamic tag router
     add 71095a3  Add: add unit tests for tag router
     add 4ef21cb  Add: add ip address match function
     add 891ec6c  Add: add listener for tag router
     add 0d56ab0  Merge branch 'develop' into featrue/tagRouter
     add 8580ad0  Mod: update tag router unit test
     add 70c01a5  Add: add unit test for dynamic tag
     add a31a4e2  Add: add zk jar for tag test
     add 5e377f4  Merge pull request #665 from watermelo/featrue/tagRouter
     add 2e96585  refactor config center
     add 73e7bdd  refactor config center
     add d5a491e  add case for this feature
     add 3e9f57a  refactor config center
     add d32cbdb  fix review comment
     add e0dd74e  fix review comment
     add 8e6d2ac  fix review comment
     add 3bc2938  fix review comment
     add eb919e1  fix review comment
     add bcffde9  fix travis
     add 6300a24  fix travis
     add 0a98a20  Merge pull request #687 from zouyx/feature/optimizeRemotesConfiguration
     add 603ffc1  Revert "Ftr: dynamic tag router"
     add 613cc6e  Merge pull request #696 from apache/revert-665-featrue/tagRouter
     add 4681874  add scope and key support for condition router
     add 08a0877  enable digesting multiple router rule in router_config.yml
     add a41c36e  format the change
     add b501734  fix the test error
     add b33167b  enable service level router configuration
     add 740be76  resolve comment from zouyx
     add 95e863e  add default priority 0 for condition url which neither application nor service level router
     add 01910a0  reduce cognitive in base_directory.go
     add 96a3688  fix empty application configure always return true in base_directory setup
     add 5f02d53  added comment to file.go
     add 2aafdeb  Merge pull request #662 from williamfeng323/feature/application-level-router
     add 380ad21  Nearest first for multiple registry #597
     add 8f8a028  make zone_aware_cluster_invoker_test for weight better
     add 41a0fd1  import split
     add 313fc65  Merge pull request #1 from apache/develop
     add 4a1625a   Ftr:Nearest first for multiple registry, Merge develop.
     add 08c3674  add comment for public method
     add 6f77a0c  add code format and comment
     add ddf63de  ugly code to elegant
     add debd07c  Merge pull request #3 from apache/develop
     add b8ec301  Merge branch 'develop' into zoneware
     add 4c250c2  add cluster interceptor
     add 03bde75  import split
     add 4dfc8aa  change format
     add f0017a8  Merge pull request #659 from DogBaoBao/zoneware
     add 4ef45c6  Merge remote-tracking branch 'remotes/dubbogo/develop' into develop
     add 6dc42eb  Merge pull request #705 from lzp0412/develop
     add bd7c5ca  stack level
     add cf75539  replace bzr to git
     add 967faf8  Merge pull request #702 from dubbo-x/fix
     add 58dc145  Correct words and Format codes
     add 2791895  Format codes
     add 25281bf  add nolint
     add 30c587e  get application from both dir.url and dir.url.suburl
     add 25ddfa5  Merge pull request #707 from williamfeng323/bugfix-application-router
     add 457dc0c  add tls support
     add 01c14c3  change module version
     add 3b2dc85  upgrade getty version
     add c7cb13b  fix getty const
     add addc4b4  fix getty const
     add 49d1c94  rm go version
     add 9603daa  fix
     add 49ebaba  add tls support
     add 443c1b8  change module version
     add bef03b4  upgrade getty version
     add c62ec2e  fix getty const
     add b75fcea  fix getty const
     add 5a51b7f  Merge remote-tracking branch 'origin/AddTslSupport' into AddTslSupport
     add cb30a98  rm go version
     add b8e15bf  fix
     add 07bf1c4  fix
     add bdf48c7  Merge remote-tracking branch 'remotes/upstream/develop' into AddTslSupport
     add 67abe6b  fix
     add ee46d46  split pkg
     add 6c606c1  split pkg
     add f2d2ba6  make a comment variable
     add 88e097f  fix
     add d0345ec  fix
     add 622e6c5  fix
     add c7e0522  fix
     add aa0ee1c  Merge pull request #685 from aliiohs/AddTslSupport
     add ddb2504  Add: add setInvoker function for router chain
     add f4481b0  Mod: merge branch to resolve conflict
     add a3dcb22  Add: add notify router for tag router
     add 316e276  Mod: modify tag router strings compare
     add 6cf2dc8  Mod: move match codes to gost net
     add 6708d24  Mod: modify comments
     add 0a475bf  Mod: add router tag unit tests scripts
     add 9d8afcd  Merge pull request #703 from watermelo/featrue/tagRouter
     add 2756d13  upgrade arch png
     add e3dd46f  Merge pull request #714 from Isaac-Zhang/develop
     add 3cf7f6b  Merge pull request #7 from apache/1.4
     add a1fbb39  1、update nacos sdk version 2、fix some nacos config bug
     add bc184e6  update uuid to v1.2.0
     add 4de80e5  fix review comments
     add 77e0765  fix review comments
     add 428fe1a  Merge pull request #548 from lzp0412/1.4
     add 2917fd1  Merge pull request #16 from apache/1.4
     add 6808199  deregistry url when destroy
     add 340efda  fix not invoke nacos destroy when graceful shutdown
     add 1e7e05a  add term signal
     add b8893fc  fix review comment
     add a04db94  Merge pull request #668 from lzp0412/1.4
     add 227441c  update apollo client
     add d452e5c  fix  review comment
     add 8dbe485  fix  review comment
     add 491edb6  fix  review comment
     add 0686ca9  Merge pull request #670 from zouyx/hotfix/fix1.4
     add 8e85afd  optimized code
     add 13369bf  use adapter model to modify restServer
     add 9a9b3a7  remove adapter
     add bcb0100  optimize header transmit in RestClient and RestServer
     add f2949db  add some comments
     add 79bd56c  modify some comments and when parsing parameters occurred error, return error immediately
     add 6540c89  modify comments
     add 4736cdc  remove new function
     add f580ed0  modify some comments
     add d469144  modify some comments and modify some logger's message
     add ca2538a  optimized code
     add a7174c3  let go_restful_server support same url and different methodType
     add ea86567  format code
     add 9652ae6  update getty pkg
     add bc5ad76  update hessian2 pkg
     add d7014ee  update getty pkg
     add 350185e  fix travis
     add 9aa2bc8  fix  review comment
     add 5faedba  fix  review comment
     add e80c2e4  Merge pull request #709 from zouyx/updatePkg
     add 69e384e  Merge branch '1.4' into feature/merge1.4
     add a007d32  merge 1.4
     add 5a135e6  Merge pull request #716 from zouyx/feature/merge1.4
     add 5e35cd6  Update: dubbogo/getty -> apache/dubbo-getty
     new 31194a8  Correct words and Format codes
     new 101e696  fix comment error

The 2 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:
 NOTICE                                             |   2 +-
 before_ut.bat                                      |   3 +
 before_ut.sh                                       |   3 +
 cluster/cluster_impl/available_cluster.go          |   1 +
 cluster/cluster_impl/base_cluster_invoker.go       |  19 +
 cluster/cluster_impl/broadcast_cluster.go          |   1 +
 cluster/cluster_impl/broadcast_cluster_invoker.go  |   1 +
 cluster/cluster_impl/failback_cluster.go           |   1 +
 cluster/cluster_impl/failback_cluster_invoker.go   |   1 +
 cluster/cluster_impl/failfast_cluster.go           |   1 +
 cluster/cluster_impl/failfast_cluster_invoker.go   |   1 +
 cluster/cluster_impl/failover_cluster.go           |   6 +-
 cluster/cluster_impl/failover_cluster_invoker.go   |   8 +-
 cluster/cluster_impl/failover_cluster_test.go      |  15 +
 cluster/cluster_impl/failsafe_cluster.go           |   1 +
 cluster/cluster_impl/failsafe_cluster_invoker.go   |   1 +
 cluster/cluster_impl/forking_cluster.go            |   1 +
 cluster/cluster_impl/forking_cluster_invoker.go    |   2 +-
 cluster/cluster_impl/mock_cluster.go               |   1 +
 cluster/cluster_impl/registry_aware_cluster.go     |  39 --
 .../cluster_impl/registry_aware_cluster_invoker.go |  55 --
 .../cluster_impl/registry_aware_cluster_test.go    |  71 ---
 ...{broadcast_cluster.go => zone_aware_cluster.go} |  22 +-
 cluster/cluster_impl/zone_aware_cluster_invoker.go | 133 +++++
 .../zone_aware_cluster_invoker_test.go             | 206 +++++++
 .../reporter.go => cluster/cluster_interceptor.go  |  22 +-
 cluster/directory/base_directory.go                |  39 +-
 cluster/directory/base_directory_test.go           |  64 +-
 cluster/loadbalance/consistent_hash.go             |   5 +-
 cluster/loadbalance/least_active.go                |   1 +
 cluster/loadbalance/round_robin.go                 |   7 +-
 cluster/loadbalance/util.go                        |  36 +-
 cluster/router/chain/chain.go                      |  13 +-
 cluster/router/chain/chain_test.go                 |  19 +-
 cluster/router/condition/app_router_test.go        |  21 +-
 cluster/router/condition/file.go                   |  45 +-
 cluster/router/condition/file_test.go              |  74 ++-
 cluster/router/condition/listenable_router.go      |   2 +-
 cluster/router/condition/router.go                 |   8 +-
 cluster/router/condition/router_rule.go            |   5 +-
 cluster/router/condition/router_rule_test.go       |  26 +-
 cluster/router/condition/router_test.go            |  88 +++
 cluster/router/healthcheck/factory_test.go         |   9 +
 cluster/router/router.go                           |   8 +
 cluster/router/tag/file.go                         |   2 +-
 cluster/router/tag/router_rule.go                  |  69 ++-
 .../version.go => cluster/router/tag/tag.go        |   9 +-
 cluster/router/tag/tag_router.go                   | 200 ++++++-
 cluster/router/tag/tag_router_test.go              | 221 ++++++-
 .../version.go => common/constant/cluster.go       |   8 +-
 common/constant/default.go                         |   1 +
 common/constant/env.go                             |   1 +
 common/constant/key.go                             |  18 +-
 common/logger/log.yml                              |   3 +-
 common/logger/logger.go                            |  13 +-
 common/proxy/proxy.go                              |  18 +-
 common/url.go                                      |   2 +-
 common/yaml/yaml.go                                |  10 +-
 config/base_config.go                              |  72 ---
 config/base_config_test.go                         |  27 +-
 config/config_center_config.go                     |  99 ++++
 config/config_center_config_test.go                |  93 +++
 config/config_loader.go                            |   7 +
 config/config_loader_test.go                       |  10 +-
 config/consumer_config.go                          |  26 +-
 config/method_config.go                            |   4 +-
 config/provider_config.go                          |   5 +-
 config/reference_config.go                         |  23 +-
 config/reference_config_test.go                    |  18 +-
 config/registry_config.go                          |  27 +-
 config/remote_config.go                            |  18 +
 config/router_config.go                            |  31 +-
 config/router_config_test.go                       |   8 +
 config/service_config.go                           |   3 +-
 config/service_config_test.go                      |  10 +-
 ...eful_shutdown_signal_linux.go => ssl_config.go} |  29 +-
 config/testdata/router_config.yml                  |  13 +-
 config/testdata/router_config_error.yml            |  11 +-
 config/testdata/router_multi_config.yml            |  16 +
 config_center/apollo/factory.go                    |   1 +
 config_center/apollo/impl.go                       |  36 +-
 config_center/apollo/impl_test.go                  |  25 +-
 config_center/apollo/listener.go                   |  40 +-
 config_center/mock_dynamic_config.go               |   8 +-
 config_center/nacos/client.go                      |   4 +-
 config_center/nacos/facade.go                      |   2 +-
 config_center/nacos/listener.go                    |   1 +
 config_center/parser/configuration_parser.go       |  17 +-
 config_center/zookeeper/listener.go                |   2 +-
 doc/pic/arch/dubbo-go-arch.png                     | Bin 131372 -> 190013 bytes
 doc/pic/arch/dubbo-go-ext.png                      | Bin 76469 -> 194550 bytes
 filter/filter_impl/access_log_filter.go            |  12 +-
 filter/filter_impl/echo_filter.go                  |   2 +-
 filter/filter_impl/execute_limit_filter.go         |   2 +-
 filter/filter_impl/generic_filter.go               |   2 +-
 filter/filter_impl/generic_service_filter.go       |  12 +-
 filter/filter_impl/generic_service_filter_test.go  |   4 +-
 filter/filter_impl/hystrix_filter.go               |  16 +-
 .../{token_filter.go => seata_filter.go}           |  44 +-
 .../{echo_filter_test.go => seata_filter_test.go}  |  28 +-
 filter/filter_impl/token_filter.go                 |   4 +-
 .../tps/tps_limit_fix_window_strategy.go           |   2 +-
 filter/filter_impl/tps/tps_limit_strategy_mock.go  |   3 +
 filter/filter_impl/tracing_filter_test.go          |   5 +-
 go.mod                                             |  59 +-
 go.sum                                             | 651 ++++++++++++++-------
 metadata/report/consul/report_test.go              |   2 +-
 .../service/exporter/configurable/exporter_test.go |   4 +-
 protocol/dubbo/client.go                           |   7 +-
 protocol/dubbo/codec.go                            |   4 +-
 protocol/dubbo/config.go                           |  13 +-
 protocol/dubbo/listener.go                         |   2 +-
 protocol/dubbo/pool.go                             |  65 +-
 protocol/dubbo/readwriter.go                       |   2 +-
 protocol/dubbo/server.go                           |  34 +-
 protocol/grpc/grpc_exporter.go                     |   2 +-
 protocol/grpc/grpc_invoker.go                      |  12 +-
 protocol/invocation.go                             |   2 +
 protocol/invocation/rpcinvocation.go               |   2 +
 protocol/jsonrpc/http.go                           |   2 +-
 protocol/jsonrpc/json.go                           |   2 +-
 .../protocolwrapper/protocol_filter_wrapper.go     |  12 +-
 protocol/rest/config/rest_config.go                |  28 +-
 protocol/rest/rest_exporter.go                     |   3 +
 protocol/rest/rest_invoker.go                      |   5 +
 protocol/rest/rest_protocol.go                     |   9 +
 .../rest/server/server_impl/go_restful_server.go   |  24 +-
 .../server/server_impl/go_restful_server_test.go   |  37 +-
 registry/consul/listener.go                        |   2 +-
 registry/consul/utils_test.go                      |   8 +-
 registry/etcdv3/listener_test.go                   |   2 +-
 registry/etcdv3/service_discovery.go               |   2 +-
 registry/kubernetes/registry.go                    |   2 +-
 registry/nacos/listener.go                         |   4 +-
 registry/nacos/registry.go                         |  39 ++
 registry/nacos/service_discovery.go                |  21 +-
 registry/nacos/service_discovery_test.go           |  33 +-
 registry/protocol/protocol.go                      |   3 +-
 .../synthesizer/subscribed_urls_synthesizer.go     |   1 +
 registry/zookeeper/registry.go                     |   2 +
 remoting/consul/test_agent.go                      |  30 +-
 remoting/consul/test_agent_test.go                 |   2 +-
 remoting/etcdv3/client.go                          | 124 +---
 remoting/etcdv3/facade.go                          |   2 +-
 remoting/kubernetes/listener_test.go               |   2 +
 remoting/listener.go                               |   2 +
 remoting/zookeeper/client.go                       |   9 +-
 remoting/zookeeper/facade.go                       |   2 +-
 remoting/zookeeper/listener.go                     |  47 +-
 test/integrate/dubbo/go-client/log.yml             |   3 +-
 test/integrate/dubbo/go-server/log.yml             |   3 +-
 151 files changed, 2723 insertions(+), 1089 deletions(-)
 delete mode 100644 cluster/cluster_impl/registry_aware_cluster.go
 delete mode 100644 cluster/cluster_impl/registry_aware_cluster_invoker.go
 delete mode 100644 cluster/cluster_impl/registry_aware_cluster_test.go
 copy cluster/cluster_impl/{broadcast_cluster.go => zone_aware_cluster.go} (64%)
 create mode 100644 cluster/cluster_impl/zone_aware_cluster_invoker.go
 create mode 100644 cluster/cluster_impl/zone_aware_cluster_invoker_test.go
 copy metrics/reporter.go => cluster/cluster_interceptor.go (68%)
 create mode 100644 cluster/router/condition/router_test.go
 copy test/integrate/dubbo/go-server/version.go => cluster/router/tag/tag.go (91%)
 copy test/integrate/dubbo/go-client/version.go => common/constant/cluster.go (87%)
 create mode 100644 config/config_center_config_test.go
 copy config/{graceful_shutdown_signal_linux.go => ssl_config.go} (61%)
 create mode 100644 config/testdata/router_multi_config.yml
 copy filter/filter_impl/{token_filter.go => seata_filter.go} (57%)
 copy filter/filter_impl/{echo_filter_test.go => seata_filter_test.go} (60%)
 copy config_center/dynamic_configuration_test.go => protocol/rest/server/server_impl/go_restful_server_test.go (57%)


[dubbo-go] 01/02: Correct words and Format codes

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git

commit 31194a853d4e6e5dc715269a58fe1f214c84276e
Author: lihaowei <ha...@gmail.com>
AuthorDate: Sun Aug 9 10:58:05 2020 +0800

    Correct words and Format codes
---
 protocol/dubbo/client.go   | 2 +-
 registry/nacos/listener.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/protocol/dubbo/client.go b/protocol/dubbo/client.go
index 9f70d93..f020ec9 100644
--- a/protocol/dubbo/client.go
+++ b/protocol/dubbo/client.go
@@ -193,7 +193,7 @@ type Response struct {
 	atta  map[string]string
 }
 
-// nolint
+// NewResponse create a new Response.
 func NewResponse(reply interface{}, atta map[string]string) *Response {
 	return &Response{
 		reply: reply,
diff --git a/registry/nacos/listener.go b/registry/nacos/listener.go
index 6699007..67c35d1 100644
--- a/registry/nacos/listener.go
+++ b/registry/nacos/listener.go
@@ -132,7 +132,7 @@ func (nl *nacosListener) Callback(services []model.SubscribeService, err error)
 		instance := generateInstance(services[i])
 		newInstanceMap[host] = instance
 		if old, ok := nl.instanceMap[host]; !ok {
-			// instance is not exist in cache, add it to cache
+			// instance does not exist in cache, add it to cache
 			addInstances = append(addInstances, instance)
 		} else {
 			// instance is not different from cache, update it to cache
@@ -144,7 +144,7 @@ func (nl *nacosListener) Callback(services []model.SubscribeService, err error)
 
 	for host, inst := range nl.instanceMap {
 		if _, ok := newInstanceMap[host]; !ok {
-			// cache instance is not exist in new instance list, remove it from cache
+			// cache instance does not exist in new instance list, remove it from cache
 			delInstances = append(delInstances, inst)
 		}
 	}


[dubbo-go] 02/02: fix comment error

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git

commit 101e6967116aa1e89a09706af6d1dc569ad78373
Merge: 31194a8 aaa8be3
Author: AlexStocks <al...@foxmail.com>
AuthorDate: Tue Aug 18 10:54:23 2020 +0800

    fix comment error

 protocol/dubbo/client.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc protocol/dubbo/client.go
index f020ec9,253427f..cd25e0a
--- a/protocol/dubbo/client.go
+++ b/protocol/dubbo/client.go
@@@ -193,7 -193,7 +193,11 @@@ type Response struct 
  	atta  map[string]string
  }
  
++<<<<<<< HEAD
 +// NewResponse create a new Response.
++=======
+ // nolint
++>>>>>>> aaa8be31fea3c0fe7ebbc1247cb273e74eaeb83b
  func NewResponse(reply interface{}, atta map[string]string) *Response {
  	return &Response{
  		reply: reply,