[dubbo-go] branch feature/dubbo-2.7.5 updated (669301f -> 024f7b2)
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a change to branch feature/dubbo-2.7.5 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. from 669301f Merge pull request #522 from flycash/nacos-meta new b815070 code clean new efd2305 fix new 2398d20 fix log new 4f382b0 test: assert --> require to use fail now new a7c2c8b add lock for event registry map to avoid concurrent read write new e6c92b9 Merge branch 'feature/dubbo-2.7.5' into zk_client new df758dc require --> assert new 024f7b2 Merge pull request #601 from dubbo-x/zk_client The 2124 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: remoting/zookeeper/client.go | 101 +- remoting/zookeeper/client_test.go | 33 - 2 files changed, 64 insertions(+), 70 deletions(-)
[dubbo] branch 2.7.8-dev updated: 2.7.8 service introspection (#6337)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.8-dev
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.8-dev by this push:
new e65f81f 2.7.8 service introspection (#6337)
e65f81f is described below
commit e65f81f26da226fd352daff4feac38a82b873e09
Author: Mercy Ma
AuthorDate: Wed Jun 17 11:02:48 2020 +0800
2.7.8 service introspection (#6337)
* Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection
* Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection
* Polish apache/dubbo#6171 : [Feature] Introducing the composite
implementation of MetadataService
* Revert "fix wrong check of InvokerListener when export a service (fix
issue_6269) (#6271)"
This reverts commit 91989cae508f8482f31ac335879da4a5975661c8.
* Revert "fix wrong check of InvokerListener when export a service (fix
issue_6269) (#6271)"
This reverts commit 91989cae508f8482f31ac335879da4a5975661c8.
* Revert the MetadataReport
* Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig
publish the ServiceDefinition based on the Dubbo Event
* Polish apache/dubbo#6198 : [Issue] Fixing
NacosDynamicConfiguration#publishConfig bug
* Polish apache/dubbo#6310 : Refactoring MetadataReport's methods
* Polish apache/dubbo#6198 : [Issue] Fixing
NacosDynamicConfiguration#publishConfig bug
* Polish apache/dubbo#6198 : [Issue] Fixing
NacosDynamicConfiguration#publishConfig bug
* Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of
MetadataReport based on The Config-Center infrastructure
Deprecated List :
- NacosMetadataReport
- ZookeeperMetadataReport
* Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration
* Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by
TreePathDynamicConfiguration
* Polish apache/dubbo#6315 : Reset the config base path to be "metadata"
for ConfigCenterBasedMetadataReportFactory
* Polish apache/dubbo#6315 : Bugfix
* Polish apache/dubbo#6315 : Bugfix
* Polish apache/dubbo#6315 : Correct words
* Polish apache/dubbo#6333 : [Refactor] Using mandatory implementation of
Service Instance registration instead of the event
* Polish apache/dubbo#6336 : [Refactor]
org.apache.dubbo.metadata.ServiceNameMapping
---
.../dubbo/config/bootstrap/DubboBootstrap.java | 29
.../event/listener/ServiceNameMappingListener.java | 8 +-
.../DynamicConfigurationServiceNameMapping.java| 18 +++--
.../apache/dubbo/metadata/ServiceNameMapping.java | 31 +++---
...DynamicConfigurationServiceNameMappingTest.java | 25 ++---
.../CustomizableServiceInstanceListener.java | 2 ++
.../metadata/ServiceInstanceMetadataUtils.java | 4 +--
.../internal/org.apache.dubbo.event.EventListener | 5 +++-
8 files changed, 104 insertions(+), 18 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
index 16d331c..863e834 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -66,6 +66,7 @@ import
org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceDiscovery;
import org.apache.dubbo.registry.client.ServiceDiscoveryRegistry;
import org.apache.dubbo.registry.client.ServiceInstance;
+import org.apache.dubbo.registry.client.ServiceInstanceCustomizer;
import org.apache.dubbo.registry.support.AbstractRegistryFactory;
import org.apache.dubbo.rpc.model.ApplicationModel;
@@ -1085,9 +1086,37 @@ public class DubboBootstrap extends GenericEventListener
{
ServiceInstance serviceInstance = createServiceInstance(serviceName,
host, port);
+preRegisterServiceInstance(serviceInstance);
+
getServiceDiscoveries().forEach(serviceDiscovery ->
serviceDiscovery.register(serviceInstance));
}
+/**
+ * Pre-register {@link ServiceInstance the service instance}
+ *
+ * @param serviceInstance {@link ServiceInstance the service instance}
+ * @since 2.7.8
+ */
+private void preRegisterServiceInstance(ServiceInstance serviceInstance) {
+customizeServiceInstance(serviceInstance);
+}
+
+/**
+ * Customize {@link ServiceInstance the service instance}
+ *
+ * @param serviceInstance
[dubbo-go] branch develop updated: Mod: remove unuseful code at dubbo/pool.go
This is an automated email from the ASF dual-hosted git repository.
fangyc pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/develop by this push:
new c0868a3 Mod: remove unuseful code at dubbo/pool.go
new 41879da Merge pull request #600 from watermelo/feature/optCode
c0868a3 is described below
commit c0868a33cad3313d09fbfce2f652d33bfc1c215f
Author: watermelo <80680...@qq.com>
AuthorDate: Thu Jun 11 16:41:35 2020 +0800
Mod: remove unuseful code at dubbo/pool.go
---
protocol/dubbo/pool.go | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/protocol/dubbo/pool.go b/protocol/dubbo/pool.go
index f0bd09b..c9f5e34 100644
--- a/protocol/dubbo/pool.go
+++ b/protocol/dubbo/pool.go
@@ -319,9 +319,7 @@ func (p *gettyRPCClientPool) getGettyRpcClient(protocol,
addr string) (*gettyRPC
conn, err := p.get()
if err == nil && conn == nil {
// create new conn
- var rpcClientConn *gettyRPCClient
- rpcClientConn, err = newGettyRPCClientConn(p, protocol, addr)
- return rpcClientConn, perrors.WithStack(err)
+ conn, err = newGettyRPCClientConn(p, protocol, addr)
}
return conn, perrors.WithStack(err)
}
[dubbo-go] branch fix_confilict created (now 236dba0)
This is an automated email from the ASF dual-hosted git repository. not-in-ldap pushed a change to branch fix_confilict in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. at 236dba0 fmt file No new revisions were added by this update.
[dubbo-go] branch master updated: fix user images error
This is an automated email from the ASF dual-hosted git repository. flycash pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/master by this push: new 6950060 fix user images error new 2c830f7 Merge pull request #609 from zouyx/fix-logo-error 6950060 is described below commit 69500606908735823fa09d641e656ea8fb2ab14d Author: Joe Zou AuthorDate: Tue Jun 16 11:06:00 2020 +0800 fix user images error --- README.md| 2 +- README_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0de082e..26e2ae8 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ If you are using [apache/dubbo-go](github.com/apache/dubbo-go) and think that it - https://raw.githubusercontent.com/dajiiu/photo/static/mirror/haozhuo_logo.png;> + https://user-images.githubusercontent.com/52339367/84628582-80512200-af1b-11ea-945a-c6b4b9ad31f2.png;> diff --git a/README_CN.md b/README_CN.md index 05a7a20..9770108 100644 --- a/README_CN.md +++ b/README_CN.md @@ -185,7 +185,7 @@ go test ./... -coverprofile=coverage.txt -covermode=atomic - https://raw.githubusercontent.com/dajiiu/photo/static/mirror/haozhuo_logo.png;> + https://user-images.githubusercontent.com/52339367/84628582-80512200-af1b-11ea-945a-c6b4b9ad31f2.png;>
[dubbo] branch master updated: maybe we can remove null judge in this case (#6321)
This is an automated email from the ASF dual-hosted git repository.
tswstarplanet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new c2d357b maybe we can remove null judge in this case (#6321)
c2d357b is described below
commit c2d357be02198e98a9fa617efc16e90d51897e27
Author: Nine
AuthorDate: Tue Jun 16 23:20:23 2020 +0800
maybe we can remove null judge in this case (#6321)
* update
* update
---
.../org/apache/dubbo/common/extension/support/ActivateComparator.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
index 1114804..9ad1aaf 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
@@ -75,10 +75,8 @@ public class ActivateComparator implements
Comparator {
}
}
}
-int n1 = a1 == null ? 0 : a1.order;
-int n2 = a2 == null ? 0 : a2.order;
// never return 0 even if n1 equals n2, otherwise, o1 and o2 will
override each other in collection like HashSet
-return n1 > n2 ? 1 : -1;
+return a1.order > a2.order ? 1 : -1;
}
private Class findSpi(Class clazz) {
