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 2023/01/06 08:49:07 UTC
[dubbo] branch 3.2 updated (4188b884b2 -> 0419f25ac2)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from 4188b884b2 Feature/modify xds subscribe (#10885)
add d66349f982 Fix app level configuration not work (#11215)
add f16febe70d Update NOTICE
add 4a1aa856ab Store old revisions (#11241)
add 36c9edc8ed Fix Multi Registry Override (#11245)
add c2eef7b5ce Fix zk resubscribe failed (#11247)
new 0419f25ac2 Merge branch 'apache-3.1' into apache-3.2
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:
NOTICE | 2 +-
.../dubbo/common/constants/CommonConstants.java | 11 ++-
.../registry/client/AbstractServiceDiscovery.java | 68 +++++++++++++++++
.../dubbo/registry/client/ServiceDiscovery.java | 10 ++-
.../listener/ServiceInstancesChangedListener.java | 38 +++++-----
.../client/metadata/MetadataServiceDelegation.java | 28 +++----
.../registry/integration/RegistryProtocol.java | 57 ++++++++++-----
.../registry/client/ServiceDiscoveryCacheTest.java | 85 ++++++++++++++++++++++
.../client/support/MockServiceDiscovery.java | 5 --
.../multiple/MultipleServiceDiscovery.java | 21 ++++--
.../zookeeper/ZookeeperServiceDiscovery.java | 3 +
11 files changed, 256 insertions(+), 72 deletions(-)
create mode 100644 dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/ServiceDiscoveryCacheTest.java
[dubbo] 01/01: Merge branch 'apache-3.1' into apache-3.2
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 0419f25ac2bc44c5c74815d9bf64ff4d52606d8d
Merge: 4188b884b2 c2eef7b5ce
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Fri Jan 6 16:48:39 2023 +0800
Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
# dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
NOTICE | 2 +-
.../dubbo/common/constants/CommonConstants.java | 11 ++-
.../registry/client/AbstractServiceDiscovery.java | 68 +++++++++++++++++
.../dubbo/registry/client/ServiceDiscovery.java | 10 ++-
.../listener/ServiceInstancesChangedListener.java | 38 +++++-----
.../client/metadata/MetadataServiceDelegation.java | 28 +++----
.../registry/integration/RegistryProtocol.java | 57 ++++++++++-----
.../registry/client/ServiceDiscoveryCacheTest.java | 85 ++++++++++++++++++++++
.../client/support/MockServiceDiscovery.java | 5 --
.../multiple/MultipleServiceDiscovery.java | 21 ++++--
.../zookeeper/ZookeeperServiceDiscovery.java | 3 +
11 files changed, 256 insertions(+), 72 deletions(-)
diff --cc dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
index f5f3ebac6d,79c9819337..c6eb7a83ec
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
@@@ -38,26 -54,9 +54,10 @@@ import org.apache.dubbo.registry.client
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ScopeModelUtil;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.HashMap;
- import java.util.LinkedList;
- import java.util.List;
- import java.util.Map;
- import java.util.Objects;
- import java.util.Set;
- import java.util.TreeSet;
- import java.util.concurrent.ConcurrentHashMap;
- import java.util.concurrent.ScheduledExecutorService;
- import java.util.concurrent.ScheduledFuture;
- import java.util.concurrent.Semaphore;
- import java.util.concurrent.TimeUnit;
- import java.util.concurrent.atomic.AtomicBoolean;
-
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
- import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_REFRESH_ADDRESS;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.INTERNAL_ERROR;
+ import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_REFRESH_ADDRESS;
+import static org.apache.dubbo.common.constants.RegistryConstants.DEFAULT_ENABLE_EMPTY_PROTECTION;
import static org.apache.dubbo.common.constants.RegistryConstants.EMPTY_PROTOCOL;
import static org.apache.dubbo.common.constants.RegistryConstants.ENABLE_EMPTY_PROTECTION_KEY;
import static org.apache.dubbo.metadata.RevisionResolver.EMPTY_REVISION;