Merge pull request #390 from fangyincheng/devv

Mrg: merge 1.3

CHANGE.md

@@ -34,66 +34,65 @@
 - [Fix zk bug](https://github.com/apache/dubbo-go/pull/346)
 - [HessianCodec failed to check package header length](https://github.com/apache/dubbo-go/pull/381)
 
-
 ## 1.2.0
 
 ### New Features
 
-- Add etcdv3 registry support<https://github.com/apache/dubbo-go/pull/148>
-- Add nacos registry support<https://github.com/apache/dubbo-go/pull/151>
-- Add fail fast cluster support<https://github.com/apache/dubbo-go/pull/140>
-- Add available cluster support<https://github.com/apache/dubbo-go/pull/155>
-- Add broadcast cluster support<https://github.com/apache/dubbo-go/pull/158>
-- Add forking cluster support<https://github.com/apache/dubbo-go/pull/161>
-- Add service token authorization support<https://github.com/apache/dubbo-go/pull/202>
-- Add accessLog filter support<https://github.com/apache/dubbo-go/pull/214>
-- Add tps limit support<https://github.com/apache/dubbo-go/pull/237>
-- Add execute limit support<https://github.com/apache/dubbo-go/pull/246>
-- Move callService to invoker & support attachments<https://github.com/apache/dubbo-go/pull/193>
-- Move example in dubbo-go project away<https://github.com/apache/dubbo-go/pull/228>
-- Support dynamic config center which compatible with dubbo 2.6.x & 2.7.x and commit the zookeeper impl<https://github.com/apache/dubbo-go/pull/194>
+- [Add etcdv3 registry support](https://github.com/apache/dubbo-go/pull/148)
+- [Add nacos registry support](https://github.com/apache/dubbo-go/pull/151)
+- [Add fail fast cluster support](https://github.com/apache/dubbo-go/pull/140)
+- [Add available cluster support](https://github.com/apache/dubbo-go/pull/155)
+- [Add broadcast cluster support](https://github.com/apache/dubbo-go/pull/158)
+- [Add forking cluster support](https://github.com/apache/dubbo-go/pull/161)
+- [Add service token authorization support](https://github.com/apache/dubbo-go/pull/202)
+- [Add accessLog filter support](https://github.com/apache/dubbo-go/pull/214)
+- [Add tps limit support](https://github.com/apache/dubbo-go/pull/237)
+- [Add execute limit support](https://github.com/apache/dubbo-go/pull/246)
+- [Move callService to invoker & support attachments](https://github.com/apache/dubbo-go/pull/193)
+- [Move example in dubbo-go project away](https://github.com/apache/dubbo-go/pull/228)
+- [Support dynamic config center which compatible with dubbo 2.6.x & 2.7.x and commit the zookeeper impl](https://github.com/apache/dubbo-go/pull/194)
 
 ### Enhancement
 
-- Split gettyRPCClient.close and gettyRPCClientPool.remove in protocol/dubbo/pool.go<https://github.com/apache/dubbo-go/pull/186>
-- Remove client from pool before closing it<https://github.com/apache/dubbo-go/pull/190>
-- Enhance the logic for fetching the local address<https://github.com/apache/dubbo-go/pull/209>
-- Add protocol_conf default values<https://github.com/apache/dubbo-go/pull/221>
-- Add task pool for getty<https://github.com/apache/dubbo-go/pull/141>
-- Update getty: remove read queue<https://github.com/apache/dubbo-go/pull/137>
-- Clean heartbeat from PendingResponse<https://github.com/apache/dubbo-go/pull/166>
+- [Split gettyRPCClient.close and gettyRPCClientPool.remove in protocol/dubbo/pool.go](https://github.com/apache/dubbo-go/pull/186)
+- [Remove client from pool before closing it](https://github.com/apache/dubbo-go/pull/190)
+- [Enhance the logic for fetching the local address](https://github.com/apache/dubbo-go/pull/209)
+- [Add protocol_conf default values](https://github.com/apache/dubbo-go/pull/221)
+- [Add task pool for getty](https://github.com/apache/dubbo-go/pull/141)
+- [Update getty: remove read queue](https://github.com/apache/dubbo-go/pull/137)
+- [Clean heartbeat from PendingResponse](https://github.com/apache/dubbo-go/pull/166)
 
 ### Bugfixes
 
-- GettyRPCClientPool remove deadlock<https://github.com/apache/dubbo-go/pull/183/files>
-- Fix failover cluster bug and url parameter retries change int to string type<https://github.com/apache/dubbo-go/pull/195>
-- Fix url params unsafe map<https://github.com/apache/dubbo-go/pull/201>
-- Read protocol config by map key in config yaml instead of protocol name<https://github.com/apache/dubbo-go/pull/218>
-- Fix dubbo group issues #238<https://github.com/apache/dubbo-go/pull/243>/<https://github.com/apache/dubbo-go/pull/244>
-- Fix bug in reference_config<https://github.com/apache/dubbo-go/pull/157>
-- Fix high memory bug in zookeeper listener<https://github.com/apache/dubbo-go/pull/168>
+- [GettyRPCClientPool remove deadlock](https://github.com/apache/dubbo-go/pull/183/files)
+- [Fix failover cluster bug and url parameter retries change int to string type](https://github.com/apache/dubbo-go/pull/195)
+- [Fix url params unsafe map](https://github.com/apache/dubbo-go/pull/201)
+- [Read protocol config by map key in config yaml instead of protocol name](https://github.com/apache/dubbo-go/pull/218)
+- *Fix dubbo group issues #238* [pr #243](https://github.com/apache/dubbo-go/pull/243) and [pr #244](https://github.com/apache/dubbo-go/pull/244)
+- [Fix bug in reference_config](https://github.com/apache/dubbo-go/pull/157)
+- [Fix high memory bug in zookeeper listener](https://github.com/apache/dubbo-go/pull/168)
 
 ## 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>;
+- [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> ；
+- [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>;
+- [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)

README.md

@@ -127,14 +127,18 @@ Windows
 before_ut.bat
 ```
 
-# Run
+### Run
 ```bash
 go test ./...
 
 # coverage
 go test ./... -coverprofile=coverage.txt -covermode=atomic
 ```
 
+## Build
+
+Please move to [dubbo-samples/golang](https://github.com/dubbogo/dubbo-samples)
+
 ## Contributing
 
 If you are willing to do some code contributions and document contributions to [Apache/dubbo-go](https://github.com/apache/dubbo-go), please visit [contribution intro](https://github.com/apache/dubbo-go/blob/master/contributing.md).
@@ -149,7 +153,6 @@ About dubbo-go benchmarking report, please refer to [dubbo benchmarking report](
 
 If you are using [apache/dubbo-go](github.com/apache/dubbo-go) and think that it helps you or want do some contributions to it, please add your company to to [the user list](https://github.com/apache/dubbo-go/issues/2) to let us know your needs.
 
-
 ![ctrip](https://pic.c-ctrip.com/common/c_logo2013.png)
 ![Excellent Health Technology Group](https://raw.githubusercontent.com/dajiiu/photo/static/mirror/haozhuo_logo.png)
-![ctrip](https://raw.githubusercontent.com/pantianying/go-tool/master/picture/logo_2-removebg-preview.png)
+![tuya](https://raw.githubusercontent.com/pantianying/go-tool/master/picture/logo_2-removebg-preview.png)

README_CN.md

@@ -125,14 +125,18 @@ Windows
 before_ut.bat
 ```
 
-# 执行
+### 执行
 ```bash
 go test ./...
 
 # coverage
 go test ./... -coverprofile=coverage.txt -covermode=atomic
 ```
 
+## 编译
+
+请移步 [dubbo-samples/golang](https://github.com/dubbogo/dubbo-samples)
+
 ## 如何贡献
 
 如果您愿意给 [Apache/dubbo-go](https://github.com/apache/dubbo-go) 贡献代码或者文档，我们都热烈欢迎。具体请参考 [contribution intro](https://github.com/apache/dubbo-go/blob/master/contributing.md)。
@@ -149,4 +153,4 @@ go test ./... -coverprofile=coverage.txt -covermode=atomic
 
 ![ctrip](https://pic.c-ctrip.com/common/c_logo2013.png)
 ![Excellent Health Technology Group](https://raw.githubusercontent.com/dajiiu/photo/static/mirror/haozhuo_logo.png)
-![ctrip](https://raw.githubusercontent.com/pantianying/go-tool/master/picture/logo_2-removebg-preview.png)
+![tuya](https://raw.githubusercontent.com/pantianying/go-tool/master/picture/logo_2-removebg-preview.png)

protocol/grpc/protoc-gen-dubbo/examples/helloworld.proto

@@ -1,16 +1,19 @@
-// Copyright 2015 The gRPC Authors
-//
-// 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
-//
-//     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.
+/*
+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.
+*/
 syntax = "proto3";
 
 option java_multiple_files = true;

registry/directory/directory.go

@@ -142,7 +142,7 @@ func (dir *registryDirectory) refreshInvokers(res *registry.ServiceEvent) {
 			}
 
 			//dir.cacheService.EventTypeAdd(res.Path, dir.serviceTTL)
-			dir.cacheInvoker(url)
+			oldInvoker = dir.cacheInvoker(url)
 		case remoting.EventTypeDel:
 			oldInvoker = dir.uncacheInvoker(url)
 			logger.Infof("selector delete service url{%s}", res.Service)