[dubbo-go] branch develop updated (d0bfafb -> e6205de)

2020-08-27 Thread alexstocks
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.


from d0bfafb  Merge branch '1.5' into develop
 new 2b19ca5  a quick prototype for bitmap router chain
 new 87a52c3  make condition router no-poolable and introduce consumer url 
in RegistryDirectory
 new ef95dd9  refactor the code style
 new 83ff9e7  honor HealthCheckRouter's enabled flag
 new 367c42b  use mutex to copy invokers
 new a84e17b  Merge branch 'develop' into bitmap-router
 new ef1ddcf  set invokers for router chain in static directory to pass 
unit test
 new fedaae5  fix unit test
 new 48d713a  correct go fmt
 new 0121001  use mutex for invokers set and get
 new 8458c88  use defer to unlock
 new e46939b  code polish for else branch
 new 9c12919  make sure lock for invokers correctly
 new 37ebc63  code polish for else branch
 new b88d28f  make router.AddrPool with initial size
 new 7425cd7  correct unlock
 new 21e572c  rename ch to notify
 new 0da3151  make map with init size
 new fc8d7b0  use NewTicker instead of builtin to avoid of GC pressure.
 new 70bd933  avoid reflection api
 new 7f47894  fix typo in comment
 new f9fdbeb  Merge branch 'develop', and reimplement dynamic tag rule
 new 8c4d42e  group var
 new f606124  use len(tag) > 0
 new 0cb2789  switch to use sync.Mutex instead of atomic.Value.
 new 066629b  new impl for address cache lifecycle
 new fd183d8  switch back to atomic value, I believe this is the best 
solution come up so far
 new c167842  avoid of copying and comparing invokers as much as possible
 new ace8f6b  use defer for wg.Done()
 new 62a7e88  Merge branch 'develop' into bitmap-router
 new e6205de  Merge pull request #708 from beiwei30/bitmap-router

The 2781 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/directory/static_directory.go  |   8 +-
 cluster/router/{chan.go => chain.go}   |   9 +-
 cluster/router/chain/chain.go  | 210 +++--
 cluster/router/chain/chain_test.go |  13 +-
 cluster/router/chain/invoker_cache.go  |  80 +
 cluster/router/condition/factory_test.go   | 107 +++
 cluster/router/condition/listenable_router.go  |  14 +-
 cluster/router/condition/router.go |  31 +-
 cluster/router/healthcheck/health_check_route.go   |  48 ++-
 .../router/healthcheck/health_check_route_test.go  |  48 +--
 cluster/router/router.go   |  47 ++-
 cluster/router/tag/file.go |   9 +-
 cluster/router/tag/tag_router.go   | 325 +
 cluster/router/tag/tag_router_test.go  | 121 
 .../router/utils/bitmap_util.go|  40 +--
 common/url.go  |  28 ++
 go.mod |   2 +
 go.sum |  16 +
 registry/directory/directory.go|  38 ++-
 19 files changed, 872 insertions(+), 322 deletions(-)
 rename cluster/router/{chan.go => chain.go} (81%)
 create mode 100644 cluster/router/chain/invoker_cache.go
 copy common/extension/metrics_test.go => cluster/router/utils/bitmap_util.go 
(59%)



[dubbo-spi-extensions] branch master updated (1fa6ce0 -> 7f404f6)

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

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


from 1fa6ce0  unify parent pom version to {revision}
 new c1b0fd9  update version to 3.0.0-SNAPSHOT
 new 408c748  add travis job
 new 7f404f6  fix service discovery impls

The 3 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:
 .travis.yml| 22 ++
 README.md  |  1 +
 dubbo-all/pom.xml  |  2 +-
 .../dubbo-configcenter-consul/pom.xml  |  2 +-
 .../dubbo-configcenter-etcd/pom.xml|  2 +-
 dubbo-spi-container/dubbo-container-log4j/pom.xml  |  2 +-
 .../dubbo-container-logback/pom.xml|  2 +-
 .../dubbo-metadata-report-consul/pom.xml   |  2 +-
 .../dubbo-metadata-report-etcd/pom.xml |  2 +-
 dubbo-spi-registry/dubbo-registry-consul/pom.xml   |  2 +-
 .../registry/consul/ConsulServiceDiscovery.java| 19 +++
 dubbo-spi-registry/dubbo-registry-default/pom.xml  |  2 +-
 dubbo-spi-registry/dubbo-registry-etcd3/pom.xml|  2 +-
 .../dubbo/registry/etcd/EtcdServiceDiscovery.java  |  7 +--
 dubbo-spi-registry/dubbo-registry-eureka/pom.xml   |  2 +-
 .../registry/eureka/EurekaServiceDiscovery.java|  5 -
 dubbo-spi-registry/dubbo-registry-redis/pom.xml|  2 +-
 dubbo-spi-registry/dubbo-registry-sofa/pom.xml |  2 +-
 dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml|  2 +-
 dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml  |  2 +-
 dubbo-spi-remoting/dubbo-remoting-http/pom.xml |  2 +-
 dubbo-spi-remoting/dubbo-remoting-mina/pom.xml |  2 +-
 dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml  |  2 +-
 dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml|  2 +-
 dubbo-spi-rpc/dubbo-rpc-http/pom.xml   |  2 +-
 dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml  |  2 +-
 dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml  |  4 ++--
 dubbo-spi-rpc/dubbo-rpc-redis/pom.xml  |  2 +-
 dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml|  2 +-
 dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml |  2 +-
 dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml |  2 +-
 dubbo-spi-rpc/dubbo-rpc-xml/pom.xml|  2 +-
 .../dubbo-serialization-avro/pom.xml   |  2 +-
 .../dubbo-serialization-fastjson/pom.xml   |  2 +-
 .../dubbo-serialization-fst/pom.xml|  2 +-
 .../dubbo-serialization-gson/pom.xml   |  2 +-
 .../dubbo-serialization-kryo/pom.xml   |  2 +-
 .../dubbo-serialization-native-hession/pom.xml |  2 +-
 .../dubbo-serialization-protobuf/pom.xml   |  2 +-
 .../dubbo-serialization-protostuff/pom.xml |  2 +-
 .../dubbo-serialization-test/pom.xml   |  2 +-
 41 files changed, 80 insertions(+), 48 deletions(-)
 create mode 100644 .travis.yml



[dubbo-spi-extensions] 01/03: update version to 3.0.0-SNAPSHOT

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

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

commit c1b0fd9c5350005e52c98d5405166237223a041a
Author: ken.lj 
AuthorDate: Thu Aug 27 15:11:55 2020 +0800

update version to 3.0.0-SNAPSHOT
---
 dubbo-all/pom.xml  | 2 +-
 dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml   | 2 +-
 dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml | 2 +-
 dubbo-spi-container/dubbo-container-log4j/pom.xml  | 2 +-
 dubbo-spi-container/dubbo-container-logback/pom.xml| 2 +-
 dubbo-spi-metadata/dubbo-metadata-report-consul/pom.xml| 2 +-
 dubbo-spi-metadata/dubbo-metadata-report-etcd/pom.xml  | 2 +-
 dubbo-spi-registry/dubbo-registry-consul/pom.xml   | 2 +-
 dubbo-spi-registry/dubbo-registry-default/pom.xml  | 2 +-
 dubbo-spi-registry/dubbo-registry-etcd3/pom.xml| 2 +-
 dubbo-spi-registry/dubbo-registry-eureka/pom.xml   | 2 +-
 dubbo-spi-registry/dubbo-registry-redis/pom.xml| 2 +-
 dubbo-spi-registry/dubbo-registry-sofa/pom.xml | 2 +-
 dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml| 2 +-
 dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml  | 2 +-
 dubbo-spi-remoting/dubbo-remoting-http/pom.xml | 2 +-
 dubbo-spi-remoting/dubbo-remoting-mina/pom.xml | 2 +-
 dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml  | 2 +-
 dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml| 2 +-
 dubbo-spi-rpc/dubbo-rpc-http/pom.xml   | 2 +-
 dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml  | 2 +-
 dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml  | 4 ++--
 dubbo-spi-rpc/dubbo-rpc-redis/pom.xml  | 2 +-
 dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml| 2 +-
 dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
 dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
 dubbo-spi-rpc/dubbo-rpc-xml/pom.xml| 2 +-
 dubbo-spi-serialization/dubbo-serialization-avro/pom.xml   | 2 +-
 dubbo-spi-serialization/dubbo-serialization-fastjson/pom.xml   | 2 +-
 dubbo-spi-serialization/dubbo-serialization-fst/pom.xml| 2 +-
 dubbo-spi-serialization/dubbo-serialization-gson/pom.xml   | 2 +-
 dubbo-spi-serialization/dubbo-serialization-kryo/pom.xml   | 2 +-
 dubbo-spi-serialization/dubbo-serialization-native-hession/pom.xml | 2 +-
 dubbo-spi-serialization/dubbo-serialization-protobuf/pom.xml   | 2 +-
 dubbo-spi-serialization/dubbo-serialization-protostuff/pom.xml | 2 +-
 dubbo-spi-serialization/dubbo-serialization-test/pom.xml   | 2 +-
 36 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index 495ef55..93898ca 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.dubbo
 dubbo-parent
-${revision}
+3.0.0-SNAPSHOT
 
 dubbo-all
 jar
diff --git a/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml 
b/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
index 674728c..3349bff 100644
--- a/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
+++ b/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.dubbo
 dubbo-configcenter
-${revision}
+3.0.0-SNAPSHOT
 
 
 dubbo-configcenter-consul
diff --git a/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml 
b/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
index 22d5f6d..9fcc2fe 100644
--- a/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
+++ b/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.dubbo
 dubbo-configcenter
-${revision}
+3.0.0-SNAPSHOT
 
 
 dubbo-configcenter-etcd
diff --git a/dubbo-spi-container/dubbo-container-log4j/pom.xml 
b/dubbo-spi-container/dubbo-container-log4j/pom.xml
index d4503df..1b5b3d2 100644
--- a/dubbo-spi-container/dubbo-container-log4j/pom.xml
+++ b/dubbo-spi-container/dubbo-container-log4j/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.dubbo
 dubbo-container
-${revision}
+3.0.0-SNAPSHOT
 
 dubbo-container-log4j
 jar
diff --git a/dubbo-spi-container/dubbo-container-logback/pom.xml 
b/dubbo-spi-container/dubbo-container-logback/pom.xml
index a6f7014..d4437eb 100644
--- a/dubbo-spi-container/dubbo-container-logback/pom.xml
+++ b/dubbo-spi-container/dubbo-container-logback/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.dubbo
 

[dubbo-spi-extensions] 02/03: add travis job

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

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

commit 408c748986ab7995efbe8a8e5d2f521aa8783f6e
Author: ken.lj 
AuthorDate: Thu Aug 27 16:26:58 2020 +0800

add travis job
---
 .travis.yml | 22 ++
 README.md   |  1 +
 2 files changed, 23 insertions(+)

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..f13d3e6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,22 @@
+language: java
+sudo: false # faster builds
+
+jdk:
+  - openjdk11
+  - openjdk8
+
+cache:
+  directories:
+- $HOME/.m2
+
+install: true
+
+script:
+  - rm -rf $HOME/.m2/repository/org/glassfish/javax.el/3.0.1-b08
+  - travis_wait 30 ./mvnw --batch-mode --no-transfer-progress clean install 
-DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false 
-Drat.skip=false -Dmaven.javadoc.skip=true
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
+after_failure:
+  - echo "build failed!"
diff --git a/README.md b/README.md
index 3b188df..8d875cc 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
 # dubbo-spi-extensions
+[![Build 
Status](https://travis-ci.org/apache/dubbo-spi-extensions.svg?branch=master)](https://travis-ci.org/apache/dubbo-spi-extensions)
\ No newline at end of file



[dubbo] branch 3.0-to-master updated (f6378a1 -> e4f6154)

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

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


from f6378a1  delete k8s and dns impl
 add afbf7d5  fix #6561, fix logger typo in Wrapper, setter should be 
getter (#6566)
 add 683db2b  fix issue 6568, remove unnecessary parameter in registry 
cache key when cache NacosRegistry (#6571)
 add 56353ae  Avoid NPE when call AbstractDynamicConfiguration#execute 
(#6576)
 add e24a7b0  Replace custom MD5 method with Bytes.getMD5 (#6597)
 add 392f159  [Dubbo-6536]Add a remoting redis to adapt mono, sentinel and 
cluster redis; refactor redis registry to use the new module (#6614)
 add e1fe4a6  doc: replace comment to java doc of 
GovernanceRuleRepository#removeListener (#6628)
 add 859c9ba  fix code that violates convention (#6624)
 add 37c673d  Merge branch 'master' into 3.0-to-master
 add e4f6154  delete k8s and dns impl

No new revisions were added by this update.

Summary of changes:
 .../governance/GovernanceRuleRepository.java   |   2 +-
 .../loadbalance/ConsistentHashLoadBalance.java |  23 +-
 .../src/main/java/org/apache/dubbo/common/URL.java |   4 -
 .../java/org/apache/dubbo/common/URLBuilder.java   |   3 -
 .../org/apache/dubbo/common/bytecode/Wrapper.java  |   2 +-
 .../configcenter/AbstractDynamicConfiguration.java |   2 +-
 .../configcenter/TreePathDynamicConfiguration.java |   2 +-
 .../dubbo/common/constants/CommonConstants.java|   9 +
 dubbo-dependencies-bom/pom.xml |   2 +-
 dubbo-metadata/dubbo-metadata-report-redis/pom.xml |   4 -
 .../dubbo/registry/client/RegistryProtocol.java|   2 +-
 .../dubbo/registry/nacos/NacosRegistryFactory.java |   7 +
 dubbo-registry/dubbo-registry-redis/pom.xml|   5 +
 .../apache/dubbo/registry/redis/RedisRegistry.java | 327 +++--
 .../dubbo/registry/redis/RedisRegistryTest.java|   9 +-
 dubbo-registry/pom.xml |   2 -
 .../pom.xml|  18 +-
 .../apache/dubbo/remoting/redis/RedisClient.java   |  32 +-
 .../remoting/redis/jedis/ClusterRedisClient.java   | 134 +
 .../remoting/redis/jedis/MonoRedisClient.java  | 118 
 .../remoting/redis/jedis/SentinelRedisClient.java  | 121 
 .../redis/support/AbstractRedisClient.java |  94 ++
 dubbo-remoting/pom.xml |   1 +
 .../java/org/apache/dubbo/rpc/RpcInvocation.java   |   2 +-
 .../rpc/protocol/dubbo/CallbackServiceCodec.java   |   4 +-
 25 files changed, 633 insertions(+), 296 deletions(-)
 copy dubbo-remoting/{dubbo-remoting-netty4 => dubbo-remoting-redis}/pom.xml 
(85%)
 copy 
dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/rest/RestService.java
 => 
dubbo-remoting/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/RedisClient.java
 (59%)
 create mode 100644 
dubbo-remoting/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/ClusterRedisClient.java
 create mode 100644 
dubbo-remoting/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/MonoRedisClient.java
 create mode 100644 
dubbo-remoting/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/SentinelRedisClient.java
 create mode 100644 
dubbo-remoting/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/support/AbstractRedisClient.java



[dubbo] branch 3.0-to-master updated (e4f6154 -> b1b6ef4)

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

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


from e4f6154  delete k8s and dns impl
 add b1b6ef4  delete k8s and dns impl

No new revisions were added by this update.

Summary of changes:
 dubbo-all/pom.xml | 16 
 1 file changed, 16 deletions(-)



[dubbo] branch 3.0 updated: add AbstractServiceDiscovery

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
 new fd0e6d8  add AbstractServiceDiscovery
fd0e6d8 is described below

commit fd0e6d80d5c4b8858a55ca0038d9fac6766b9416
Author: ken.lj 
AuthorDate: Thu Aug 27 15:57:06 2020 +0800

add AbstractServiceDiscovery
---
 .../registry/client/AbstractServiceDiscovery.java  | 36 ++
 .../registry/nacos/NacosServiceDiscovery.java  | 14 +++--
 .../zookeeper/ZookeeperServiceDiscovery.java   | 10 ++
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
new file mode 100644
index 000..bebc73a
--- /dev/null
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
@@ -0,0 +1,36 @@
+/*
+ * 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 org.apache.dubbo.registry.client;
+
+public abstract class AbstractServiceDiscovery implements ServiceDiscovery {
+
+protected ServiceInstance serviceInstance;
+
+@Override
+public ServiceInstance getLocalInstance() {
+return serviceInstance;
+}
+
+@Override
+public void register(ServiceInstance serviceInstance) throws 
RuntimeException {
+}
+
+@Override
+public void update(ServiceInstance serviceInstance) throws 
RuntimeException {
+this.serviceInstance = serviceInstance;
+}
+}
diff --git 
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
 
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
index c7562ad..0a47aa2 100644
--- 
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
+++ 
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
@@ -20,6 +20,7 @@ import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.function.ThrowableFunction;
 import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.client.AbstractServiceDiscovery;
 import org.apache.dubbo.registry.client.ServiceDiscovery;
 import org.apache.dubbo.registry.client.ServiceInstance;
 import 
org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener;
@@ -47,7 +48,7 @@ import static 
org.apache.dubbo.registry.nacos.util.NacosNamingServiceUtils.toIns
  * @see ServiceDiscovery
  * @since 2.7.5
  */
-public class NacosServiceDiscovery implements ServiceDiscovery {
+public class NacosServiceDiscovery extends AbstractServiceDiscovery {
 
 private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -57,8 +58,6 @@ public class NacosServiceDiscovery implements 
ServiceDiscovery {
 
 private URL registryURL;
 
-private ServiceInstance instance;
-
 @Override
 public void initialize(URL registryURL) throws Exception {
 this.namingService = createNamingService(registryURL);
@@ -73,7 +72,7 @@ public class NacosServiceDiscovery implements 
ServiceDiscovery {
 
 @Override
 public void register(ServiceInstance serviceInstance) throws 
RuntimeException {
-this.instance = serviceInstance;
+this.serviceInstance = serviceInstance;
 execute(namingService, service -> {
 Instance instance = toInstance(serviceInstance);
 service.registerInstance(instance.getServiceName(), group, 
instance);
@@ -82,7 +81,7 @@ public class NacosServiceDiscovery implements 
ServiceDiscovery {
 
 @Override
 public void update(ServiceInstance serviceInstance) throws 
RuntimeException {
-this.instance = serviceInstance;
+this.serviceInstance = serviceInstance;
 // TODO: Nacos should support
 unregister(serviceInstance);

[dubbo-spi-extensions] branch master updated: unify parent pom version to {revision}

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 1fa6ce0  unify parent pom version to {revision}
1fa6ce0 is described below

commit 1fa6ce06c3c53f2c044bd2cafa61c7cc1d67f995
Author: ken.lj 
AuthorDate: Thu Aug 27 15:05:59 2020 +0800

unify parent pom version to {revision}
---
 dubbo-all/pom.xml  |   4 +-
 .../dubbo-configcenter-consul/pom.xml  |   2 +-
 .../dubbo-configcenter-etcd/pom.xml|   2 +-
 dubbo-spi-container/dubbo-container-log4j/pom.xml  |   2 +-
 .../dubbo-container-logback/pom.xml|   2 +-
 .../dubbo-metadata-report-consul/pom.xml   |   2 +-
 .../dubbo-metadata-report-etcd/pom.xml |   2 +-
 dubbo-spi-registry/dubbo-registry-consul/pom.xml   |   2 +-
 dubbo-spi-registry/dubbo-registry-default/pom.xml  |   2 +-
 dubbo-spi-registry/dubbo-registry-etcd3/pom.xml|   2 +-
 dubbo-spi-registry/dubbo-registry-eureka/pom.xml   |   2 +-
 dubbo-spi-registry/dubbo-registry-redis/pom.xml|   2 +-
 dubbo-spi-registry/dubbo-registry-sofa/pom.xml |   2 +-
 dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml|   2 +-
 dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml  |   2 +-
 dubbo-spi-remoting/dubbo-remoting-http/pom.xml |   2 +-
 dubbo-spi-remoting/dubbo-remoting-mina/pom.xml |   2 +-
 dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml  |   2 +-
 dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml|   2 +-
 dubbo-spi-rpc/dubbo-rpc-http/pom.xml   |   2 +-
 dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml  |   2 +-
 dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml  |   2 +-
 dubbo-spi-rpc/dubbo-rpc-redis/pom.xml  |   2 +-
 dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml|   2 +-
 dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml |   2 +-
 dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml |   2 +-
 dubbo-spi-rpc/dubbo-rpc-xml/pom.xml|   2 +-
 .../dubbo-serialization-avro/pom.xml   |   2 +-
 .../dubbo-serialization-fastjson/pom.xml   |   2 +-
 .../dubbo-serialization-fst/pom.xml|   2 +-
 .../dubbo-serialization-gson/pom.xml   |   2 +-
 .../dubbo-serialization-kryo/pom.xml   |   2 +-
 .../dubbo-serialization-native-hession/pom.xml |   2 +-
 .../dubbo-serialization-protobuf/pom.xml   |   2 +-
 .../dubbo-serialization-protostuff/pom.xml |   2 +-
 .../dubbo-serialization-test/pom.xml   |   2 +-
 dubbo-test/pom.xml | 207 +
 pom.xml|   3 +-
 38 files changed, 245 insertions(+), 39 deletions(-)

diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index dab2d12..495ef55 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -20,9 +20,9 @@
 
 org.apache.dubbo
 dubbo-parent
-2.7.7-SNAPSHOT
+${revision}
 
-dubbo
+dubbo-all
 jar
 dubbo-all
 The all in one project of dubbo
diff --git a/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml 
b/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
index bdabca7..674728c 100644
--- a/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
+++ b/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.dubbo
 dubbo-configcenter
-2.7.7-SNAPSHOT
+${revision}
 
 
 dubbo-configcenter-consul
diff --git a/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml 
b/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
index 570ec92..22d5f6d 100644
--- a/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
+++ b/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.dubbo
 dubbo-configcenter
-2.7.7-SNAPSHOT
+${revision}
 
 
 dubbo-configcenter-etcd
diff --git a/dubbo-spi-container/dubbo-container-log4j/pom.xml 
b/dubbo-spi-container/dubbo-container-log4j/pom.xml
index a92d9b4..d4503df 100644
--- a/dubbo-spi-container/dubbo-container-log4j/pom.xml
+++ b/dubbo-spi-container/dubbo-container-log4j/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.dubbo
 dubbo-container
-2.7.7-SNAPSHOT
+${revision}
 
 dubbo-container-log4j
 jar
diff --git a/dubbo-spi-container/dubbo-container-logback/pom.xml 
b/dubbo-spi-container/dubbo-container-logback/pom.xml
index dec8f54..a6f7014 100644
--- a/dubbo-spi-container/dubbo-container-logback/pom.xml
+++ b/dubbo-spi-container/dubbo-container-logback/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.dubbo
 dubbo-container
-2.7.7-SNAPSHOT
+${revision}
 
 dubbo-container-logback
 jar
diff --git 

[dubbo] branch 3.0-k8s updated (8d2f1b0 -> 50af097)

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a change to branch 3.0-k8s
in repository https://gitbox.apache.org/repos/asf/dubbo.git.


from 8d2f1b0  upgrade grpc and jecd versions (#6612)
 add 50af097  k8s enhancement: only export MetadataService on Dubbo 
protocol (#6617)

No new revisions were added by this update.

Summary of changes:
 dubbo-config/dubbo-config-api/pom.xml  | 13 
 .../ConfigurableMetadataServiceExporter.java   | 37 ++
 .../metadata/MetadataServiceExporterTest.java  |  2 +-
 ...r.java => InstanceMetadataChangedListener.java} |  2 +-
 .../org/apache/dubbo/metadata/MetadataService.java | 12 +++
 .../StandardMetadataServiceURLBuilder.java | 15 +
 .../store/InMemoryWritableMetadataService.java | 20 ++--
 .../dubbo/registry/dns/DNSServiceDiscovery.java| 24 +++---
 .../registry/dns/DNSServiceDiscoveryTest.java  | 16 +-
 .../registry/nacos/NacosServiceDiscovery.java  | 24 +++---
 dubbo-registry/pom.xml |  2 +-
 11 files changed, 105 insertions(+), 62 deletions(-)
 rename 
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/{MetadataChangeListener.java
 => InstanceMetadataChangedListener.java} (95%)



[dubbo] branch 3.0 updated: Refactor migration

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
 new 346166e  Refactor migration
346166e is described below

commit 346166e674fea88d10dc43be82e387f547156709
Author: ken.lj 
AuthorDate: Thu Aug 27 14:43:10 2020 +0800

Refactor migration
---
 .../DefaultMigrationAddressComparator.java |   2 +-
 .../migration}/InvokersChangedListener.java|   2 +-
 .../migration}/MigrationAddressComparator.java |   2 +-
 .../migration/MigrationClusterInvoker.java}|  23 +++-
 .../migration}/MigrationInvoker.java   | 142 +++--
 .../migration/MigrationRuleHandler.java}   |  13 +-
 .../MigrationRuleListener.java}|  15 +--
 .../ServiceDiscoveryMigrationInvoker.java  |  52 
 .../migration/model}/MigrationRule.java|   9 +-
 .../migration/model}/MigrationStep.java|   2 +-
 .../registry/integration/DynamicDirectory.java |   1 +
 .../InterfaceCompatibleRegistryProtocol.java   |   2 +-
 .../{client => integration}/RegistryProtocol.java  |  38 +-
 .../integration/RegistryProtocolListener.java  |   1 -
 ...try.client.migration.MigrationAddressComparator |   1 +
 ...registry.integration.MigrationAddressComparator |   1 -
 ...o.registry.integration.RegistryProtocolListener |   2 +-
 .../dubbo/internal/org.apache.dubbo.rpc.Protocol   |   2 +-
 pom.xml|  37 ++
 19 files changed, 217 insertions(+), 130 deletions(-)

diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DefaultMigrationAddressComparator.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
similarity index 95%
rename from 
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DefaultMigrationAddressComparator.java
rename to 
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
index a17d601..5fc8480 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DefaultMigrationAddressComparator.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/DefaultMigrationAddressComparator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.registry.integration;
+package org.apache.dubbo.registry.client.migration;
 
 import org.apache.dubbo.rpc.cluster.ClusterInvoker;
 
diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/InvokersChangedListener.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/InvokersChangedListener.java
similarity index 94%
rename from 
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/InvokersChangedListener.java
rename to 
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/InvokersChangedListener.java
index 5a55a02..9ed886f 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/InvokersChangedListener.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/InvokersChangedListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.registry.integration;
+package org.apache.dubbo.registry.client.migration;
 
 public interface InvokersChangedListener {
 void onChange();
diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/MigrationAddressComparator.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationAddressComparator.java
similarity index 95%
copy from 
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/MigrationAddressComparator.java
copy to 
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationAddressComparator.java
index b288720..2be527b 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/MigrationAddressComparator.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationAddressComparator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.registry.integration;
+package 

[dubbo] branch 3.0-to-master updated (05be1fa -> f6378a1)

2020-08-27 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

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


from 05be1fa  元数据上报优化模型bugfix (#6584)
 add 1583bc6  add Kubernetes registry support (#6556)
 add b606cf3  Feat: extend MetadataService (#6574)
 add 29b5ba3  Feat: add DNS registry support (#6591)
 add d07a0a5  Fix Unit test cases in 3.0 branch (#6598)
 add 8d2f1b0  upgrade grpc and jecd versions (#6612)
 add e2a3de6  Merge branch '3.0-k8s' into 3.0-to-master
 add f6378a1  delete k8s and dns impl

No new revisions were added by this update.

Summary of changes:
 dubbo-all/pom.xml  | 16 
 .../support/AbstractClusterInvokerTest.java| 11 +--
 .../support/wrapper/MockClusterInvokerTest.java| 42 +--
 .../wrapper/MockProviderRpcExceptionTest.java  |  8 +-
 .../org/apache/dubbo/config/ApplicationConfig.java | 14 
 .../org/apache/dubbo/config/ServiceConfig.java |  7 +-
 .../bootstrap/builders/ApplicationBuilder.java |  7 ++
 .../ConfigurableMetadataServiceExporter.java   | 53 +++--
 .../dubbo/config/AbstractInterfaceConfigTest.java  |  3 +
 .../dubbo/config/bootstrap/DubboBootstrapTest.java |  4 +-
 .../bootstrap/builders/ApplicationBuilderTest.java | 10 ++-
 .../PublishingServiceDefinitionListenerTest.java   | 22 +-
 .../dubbo/config/mock/MockServiceDiscovery.java| 69 +
 .../metadata/MetadataServiceExporterTest.java  | 32 +++-
 ...g.apache.dubbo.registry.client.ServiceDiscovery |  1 +
 .../spring/registry/MockServiceDiscovery.java  | 69 +
 ...g.apache.dubbo.registry.client.ServiceDiscovery |  1 +
 .../support/etcd/EtcdDynamicConfigurationTest.java |  2 +-
 dubbo-dependencies-bom/pom.xml | 29 +---
 .../dubbo/metadata/MetadataChangeListener.java | 26 +++
 .../org/apache/dubbo/metadata/MetadataService.java | 42 +++
 .../dubbo/qos/command/util/CommandHelperTest.java  |  4 +-
 .../registry/client/ServiceDiscoveryRegistry.java  |  5 ++
 .../registry/client/metadata/MetadataUtils.java|  8 +-
 .../StandardMetadataServiceURLBuilder.java | 87 +-
 .../store/InMemoryWritableMetadataService.java | 20 -
 .../registry/integration/DynamicDirectory.java |  2 +-
 .../InterfaceCompatibleRegistryProtocol.java   |  8 +-
 .../registry/client/InMemoryServiceDiscovery.java  |  9 ++-
 .../support/ServiceOrientedRegistryTest.java   |  5 ++
 .../registry/dubbo/RegistryDirectoryTest.java  | 29 +---
 .../dubbo/registry/dubbo/RegistryProtocolTest.java |  6 +-
 .../registry/dubbo/RegistryStatusCheckerTest.java  |  6 +-
 .../multicast/MulticastServiceDiscovery.java   | 72 ++
 .../MulticastServiceDiscoveryFactory.java} | 12 ++-
 ...g.apache.dubbo.registry.client.ServiceDiscovery |  1 +
 ...e.dubbo.registry.client.ServiceDiscoveryFactory |  1 +
 .../registry/multicast/MulticastRegistryTest.java  | 20 +++--
 dubbo-registry/pom.xml |  9 ++-
 .../remoting/etcd/jetcd/JEtcdClientWrapper.java|  4 +-
 .../dubbo/remoting/etcd/jetcd/LeaseTest.java   |  4 +-
 .../remoting/transport/grizzly/GrizzlyServer.java  | 12 +--
 .../transport/grizzly/GrizzlyTransporterTest.java  |  2 +-
 .../support/header/HeartbeatHandlerTest.java   | 45 ---
 .../transport/netty/ClientReconnectTest.java   |  5 +-
 .../remoting/transport/netty/ThreadNameTest.java   |  4 +-
 .../transport/netty4/NettyTransporterTest.java |  4 +-
 .../transport/netty4/ReplierDispatcherTest.java| 13 +++-
 .../support/MulticastExchangeNetworkerTest.java| 12 +--
 .../remoting/p2p/support/FileNetworkerTest.java|  4 +-
 .../p2p/support/MulticastNetworkerTest.java|  5 +-
 pom.xml|  2 +
 52 files changed, 712 insertions(+), 176 deletions(-)
 create mode 100644 
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockServiceDiscovery.java
 create mode 100644 
dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.registry.client.ServiceDiscovery
 create mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registry/MockServiceDiscovery.java
 create mode 100644 
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscovery
 copy 
dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseCallback.java
 => 
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataChangeListener.java
 (67%)
 create mode 100644 
dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastServiceDiscovery.java
 copy 

[dubbo-js] branch v3.0.0 updated (d68e1f5 -> f55eef2)

2020-08-27 Thread hufeng
This is an automated email from the ASF dual-hosted git repository.

hufeng pushed a change to branch v3.0.0
in repository https://gitbox.apache.org/repos/asf/dubbo-js.git.


from d68e1f5  merge
 new 61a9ad2  remove .yarnc & deduplicate .gitignore
 new 9252764  fix spell
 new f022916  fix comment
 new f55eef2  Merge pull request #218 from godkun/v3.0.0

The 448 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:
 .gitignore  | 6 --
 .yarnrc | 1 -
 packages/dubbo/src/decode-buffer.ts | 7 ---
 packages/dubbo/src/dubbo-agent.ts   | 4 ++--
 packages/dubbo/src/dubbo.ts | 6 +++---
 packages/dubbo/src/encode.ts| 4 ++--
 packages/dubbo/src/heartbeat.ts | 4 ++--
 packages/dubbo/src/scheduler.ts | 6 +++---
 packages/dubbo/src/types.ts | 4 ++--
 9 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 .yarnrc