This is an automated email from the ASF dual-hosted git repository.
randgalt pushed a change to branch CURATOR-549-zk36-persistent-watcher-bridge
in repository https://gitbox.apache.org/repos/asf/curator.git.
omit 5e719c5 CURATOR-549
omit 94270bf CURATOR-549
omit 94df65e CURATOR-549
omit 1988502 CURATOR-549
omit b950c0a CURATOR-549 - optimization: if a node that the cache knows
about gets a change event, there's no need to query for children if the
Cversion hasn't changed
omit bf738b3 CURATOR-549
omit 5f7fdad CURATOR-549
omit b32160f CURATOR-549
omit 105a7a1 CURATOR-549
omit 4b4f2e5 CURATOR-549
omit c1b43b6 CURATOR-549
omit c53f614 CURATOR-549
add c05a61b Fix typo
add a470379 - ServiceCacheImpl should allow the self-created executor
service to be closed - Allow an optional executor service for ServiceProvider
add 34fdb43 Merge pull request #343 from naude-r/servicecache_thread_leak
add 75226fb CURATOR-551 (#345)
add 7670ae3 [CURATOR-548] Bump zookeeper version to 3.5.7
add 9c54bab CURATOR-560
add 959c1ca CURATOR-559 (#346)
add 009bfc4 CURATOR-562 - Remove ConnectionHandlingPolicy - flatten out
behavior to match old StandardConnectionHandlingPolicy - closes #348
add 9745ec4 CURATOR-562 - Remove ConnectionHandlingPolicy - flatten out
behavior to match old StandardConnectionHandlingPolicy
add 55a6d92 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/curator
add d1a9234 CURATOR-558 (#344)
add 7bbb719 [CURATOR-558] - Updates for ZooKeeper 3.6.0 (#350)
add d65669b CURATOR-549 (#334)
add 8dceb70 CURATOR-549
new c0648d6 CURATOR-549
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5e719c5)
\
N -- N -- N
refs/heads/CURATOR-549-zk36-persistent-watcher-bridge (c0648d6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
curator-client/pom.xml | 4 +-
.../java/org/apache/curator/ConnectionState.java | 95 +--
.../org/apache/curator/CuratorZookeeperClient.java | 45 +-
.../main/java/org/apache/curator/HandleHolder.java | 70 +--
.../src/main/java/org/apache/curator/Helper.java | 36 +-
.../main/java/org/apache/curator/RetryLoop.java | 122 ++--
.../java/org/apache/curator/RetryLoopImpl.java | 100 ++++
.../connection/ConnectionHandlingPolicy.java | 111 ----
.../StandardConnectionHandlingPolicy.java | 86 ---
.../curator/connection/ThreadLocalRetryLoop.java | 156 +++++
.../exhibitor/DefaultExhibitorRestClient.java | 68 ---
.../exhibitor/ExhibitorEnsembleProvider.java | 335 -----------
.../ensemble/exhibitor/ExhibitorRestClient.java | 34 --
.../curator/ensemble/exhibitor/Exhibitors.java | 66 ---
.../org/apache/curator/utils/Compatibility.java | 119 ++--
.../curator/utils/DefaultZookeeperFactory.java | 18 +-
.../curator/utils/InjectSessionExpiration.java | 77 ---
.../curator/utils/NonAdminZookeeperFactory.java | 17 +-
.../test/java/org/apache/curator/BasicTests.java | 3 +-
.../java/org/apache/curator/TestEnsurePath.java | 7 +-
.../src/test/java/org/apache/curator/TestIs36.java | 29 +-
.../apache/curator/TestSessionFailRetryLoop.java | 9 +-
.../exhibitor/TestExhibitorEnsembleProvider.java | 227 --------
curator-examples/pom.xml | 2 +-
curator-framework/pom.xml | 4 +-
.../apache/curator/framework/CuratorFramework.java | 32 +-
.../curator/framework/CuratorFrameworkFactory.java | 93 +--
.../curator/framework/api/AddWatchBuilder2.java | 4 +-
.../framework/api/BackgroundPathableInt.java | 25 -
.../apache/curator/framework/api/CuratorEvent.java | 16 -
.../curator/framework/api/CuratorEventType.java | 16 +-
.../framework/api/ErrorListenerPathableInt.java | 32 -
.../framework/api/GetAllChildrenNumberBuilder.java | 23 -
.../framework/api/GetEphemeralsBuilder.java | 25 -
.../apache/curator/framework/api/PathableInt.java | 32 -
.../apache/curator/framework/api/Watchable.java | 22 +-
.../api/{AddWatchable.java => WatchableBase.java} | 5 +-
.../framework/imps/AddWatchBuilderImpl.java | 18 +-
.../framework/imps/CompatibleCreateCallback.java | 26 -
.../curator/framework/imps/CreateBuilderImpl.java | 78 +--
.../apache/curator/framework/imps/CreateZK35.java | 47 --
.../curator/framework/imps/CuratorEventImpl.java | 13 -
.../framework/imps/CuratorFrameworkImpl.java | 110 +---
.../imps/CuratorMultiTransactionImpl.java | 18 +-
.../curator/framework/imps/EnsembleTracker.java | 4 +-
.../imps/GetAllChildrenNumberBuilderImpl.java | 143 -----
.../framework/imps/GetEphemeralsBuilderImpl.java | 148 -----
.../framework/imps/WatcherRemovalManager.java | 7 +-
.../framework/listen/ListenerContainer.java | 112 ----
.../framework/listen/MappingListenerManager.java | 3 +-
.../curator/framework/state/ConnectionState.java | 12 +-
.../framework/state/ConnectionStateManager.java | 3 +-
.../curator/framework/imps/TestCleanState.java | 7 -
.../framework/imps/TestCreateReturningStat.java | 1 -
.../imps/TestEnabledSessionExpiredState.java | 3 +-
.../curator/framework/imps/TestFramework.java | 37 --
.../framework/imps/TestFrameworkBackground.java | 46 +-
.../curator/framework/imps/TestFrameworkEdges.java | 10 +-
.../framework/imps/TestReconfiguration.java | 1 -
.../curator/framework/imps/TestTtlNodes.java | 1 -
.../framework/imps/TestWatcherRemovalManager.java | 1 -
.../curator/framework/imps/TestWatchesBuilder.java | 498 +++++++++-------
.../curator/framework/imps/TestWithCluster.java | 9 +-
.../state/TestConnectionStateManager.java | 3 +-
curator-recipes/pom.xml | 4 +-
.../cache/CompatibleCuratorCacheBridge.java | 17 +-
.../framework/recipes/cache/CuratorCache.java | 15 +
.../recipes/cache/CuratorCacheBridge.java | 7 +-
.../recipes/cache/CuratorCacheBridgeBuilder.java | 57 ++
.../cache/CuratorCacheBridgeBuilderImpl.java | 76 +++
.../recipes/cache/CuratorCacheBuilder.java | 17 -
.../recipes/cache/CuratorCacheBuilderImpl.java | 30 +-
.../framework/recipes/cache/CuratorCacheImpl.java | 11 +-
.../recipes/cache/CuratorCacheListenerBuilder.java | 22 +-
.../cache/CuratorCacheListenerBuilderImpl.java | 19 +-
.../recipes/cache/CuratorCacheStorage.java | 1 -
.../curator/framework/recipes/cache/NodeCache.java | 39 +-
.../framework/recipes/cache/PathChildrenCache.java | 39 +-
.../cache/PathChildrenCacheListenerWrapper.java | 11 +-
.../curator/framework/recipes/cache/TreeCache.java | 85 +--
.../framework/recipes/leader/LeaderLatch.java | 25 +-
.../framework/recipes/locks/ChildReaper.java | 307 ----------
.../curator/framework/recipes/locks/Reaper.java | 380 ------------
.../framework/recipes/nodes/GroupMember.java | 43 +-
.../framework/recipes/nodes/PersistentNode.java | 41 +-
.../recipes/queue/DistributedDelayQueue.java | 4 +-
.../recipes/queue/DistributedIdQueue.java | 4 +-
.../recipes/queue/DistributedPriorityQueue.java | 4 +-
.../framework/recipes/queue/DistributedQueue.java | 63 +-
.../curator/framework/recipes/queue/QueueBase.java | 4 +-
.../framework/recipes/shared/SharedValue.java | 52 +-
.../recipes/shared/SharedValueReader.java | 4 +-
.../connection/TestThreadLocalRetryLoop.java | 118 ++++
.../framework/recipes/cache/TestCuratorCache.java | 27 -
.../recipes/cache/TestCuratorCacheWrappers.java | 2 +-
.../framework/recipes/cache/TestNodeCache.java | 3 +-
.../recipes/cache/TestPathChildrenCache.java | 3 +-
.../framework/recipes/cache/TestTreeCache.java | 5 +-
.../recipes/cache/TestWrappedNodeCache.java | 3 +-
.../framework/recipes/leader/TestLeaderLatch.java | 2 +-
.../recipes/leader/TestLeaderLatchCluster.java | 22 +-
.../recipes/leader/TestLeaderSelector.java | 3 +-
.../recipes/leader/TestLeaderSelectorCluster.java | 9 +-
.../recipes/leader/TestLeaderSelectorEdges.java | 1 -
.../framework/recipes/locks/TestChildReaper.java | 351 -----------
.../recipes/locks/TestInterProcessMutex.java | 3 +-
.../recipes/locks/TestInterProcessMutexBase.java | 3 +-
.../recipes/locks/TestInterProcessSemaphore.java | 47 --
.../framework/recipes/locks/TestReaper.java | 647 ---------------------
.../recipes/nodes/TestPersistentEphemeralNode.java | 9 +-
.../recipes/nodes/TestPersistentTtlNode.java | 1 -
curator-test-zk34/README.md | 11 -
curator-test-zk34/pom.xml | 191 ------
.../org/apache/curator/test/TestCompatibility.java | 97 ---
.../src/test/resources/log4j.properties | 27 -
curator-test-zk35/pom.xml | 71 +--
.../java/org/apache/curator/zk35/TestIs35.java | 29 +-
curator-test/pom.xml | 4 +-
.../org/apache/curator/test/BaseClassForTests.java | 19 +-
.../org/apache/curator/test/Compatibility.java | 7 +-
.../curator/test/FailedServerStartException.java | 11 +-
.../java/org/apache/curator/test/InstanceSpec.java | 1 +
.../apache/curator/test/QuorumConfigBuilder.java | 11 +-
.../apache/curator/test/TestingQuorumPeerMain.java | 4 +-
.../apache/curator/test/TestingZooKeeperMain.java | 22 +-
.../org/apache/curator/test/ZooKeeperMainFace.java | 6 +-
.../test/compatibility/CuratorTestBase.java | 1 -
.../apache/curator/test/compatibility/Timing2.java | 11 +
curator-x-async/pom.xml | 17 +-
.../x/async/api/AsyncCuratorFrameworkDsl.java | 20 +-
.../curator/x/async/api/AsyncWatchBuilder.java | 4 +-
.../curator/x/async/api/AsyncWatchBuilder2.java | 4 +-
.../x/async/details/AsyncCuratorFrameworkImpl.java | 12 -
.../AsyncGetAllChildrenNumberBuilderImpl.java | 47 --
.../details/AsyncGetEphemeralsBuilderImpl.java | 48 --
.../x/async/details/AsyncWatchBuilderImpl.java | 4 +-
.../curator/x/async/details/BackgroundProcs.java | 1 -
.../details/CachedModeledFrameworkImpl.java | 11 +-
.../x/async/modeled/details/ModeledCacheImpl.java | 63 +-
.../modeled/details/ModeledFrameworkImpl.java | 4 +-
.../curator/framework/imps/TestFramework.java | 38 --
.../x/async/modeled/TestModeledFrameworkBase.java | 4 +-
curator-x-discovery-server/pom.xml | 4 +-
curator-x-discovery/pom.xml | 19 +-
.../apache/curator/x/discovery/ServiceCache.java | 19 +-
.../curator/x/discovery/ServiceCacheBuilder.java | 12 +-
.../curator/x/discovery/ServiceProvider.java | 24 +-
.../x/discovery/ServiceProviderBuilder.java | 28 +-
.../discovery/details/ServiceCacheBuilderImpl.java | 21 +-
.../x/discovery/details/ServiceCacheImpl.java | 64 +-
.../x/discovery/details/ServiceDiscoveryImpl.java | 5 +-
.../details/ServiceProviderBuilderImpl.java | 14 +-
.../x/discovery/details/ServiceProviderImpl.java | 41 +-
.../x/discovery/ServiceCacheLeakTester.java | 3 +
.../curator/x/discovery/TestServiceCache.java | 6 +
.../x/discovery/details/TestServiceDiscovery.java | 7 +-
.../details/TestServiceDiscoveryBuilder.java | 6 +-
.../x/discovery/details/TestServiceProvider.java | 2 +
.../x/discovery/details/TestWatchedInstances.java | 2 -
pom.xml | 39 +-
src/site/confluence/breaking-changes.confluence | 13 +
src/site/confluence/exhibitor.confluence | 24 -
src/site/confluence/index.confluence | 12 +-
...y.confluence => zk-compatibility-34.confluence} | 31 +-
src/site/site.xml | 8 +-
165 files changed, 1630 insertions(+), 5738 deletions(-)
copy
curator-framework/src/main/java/org/apache/curator/framework/imps/PathAndBytes.java
=> curator-client/src/main/java/org/apache/curator/Helper.java (56%)
create mode 100644
curator-client/src/main/java/org/apache/curator/RetryLoopImpl.java
delete mode 100644
curator-client/src/main/java/org/apache/curator/connection/ConnectionHandlingPolicy.java
delete mode 100644
curator-client/src/main/java/org/apache/curator/connection/StandardConnectionHandlingPolicy.java
create mode 100644
curator-client/src/main/java/org/apache/curator/connection/ThreadLocalRetryLoop.java
delete mode 100644
curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/DefaultExhibitorRestClient.java
delete mode 100644
curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorEnsembleProvider.java
delete mode 100644
curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorRestClient.java
delete mode 100644
curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/Exhibitors.java
delete mode 100644
curator-client/src/main/java/org/apache/curator/utils/InjectSessionExpiration.java
copy
curator-framework/src/main/java/org/apache/curator/framework/WatcherRemoveCuratorFramework.java
=>
curator-client/src/main/java/org/apache/curator/utils/NonAdminZookeeperFactory.java
(68%)
rename
curator-framework/src/main/java/org/apache/curator/framework/SafeIsTtlMode.java
=> curator-client/src/test/java/org/apache/curator/TestIs36.java (63%)
delete mode 100644
curator-client/src/test/java/org/apache/curator/ensemble/exhibitor/TestExhibitorEnsembleProvider.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/api/BackgroundPathableInt.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/api/ErrorListenerPathableInt.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/api/GetAllChildrenNumberBuilder.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/api/GetEphemeralsBuilder.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/api/PathableInt.java
rename
curator-framework/src/main/java/org/apache/curator/framework/api/{AddWatchable.java
=> WatchableBase.java} (97%)
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/imps/CompatibleCreateCallback.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/imps/CreateZK35.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/imps/GetAllChildrenNumberBuilderImpl.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/imps/GetEphemeralsBuilderImpl.java
delete mode 100644
curator-framework/src/main/java/org/apache/curator/framework/listen/ListenerContainer.java
create mode 100644
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/CuratorCacheBridgeBuilder.java
create mode 100644
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/CuratorCacheBridgeBuilderImpl.java
delete mode 100644
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/ChildReaper.java
delete mode 100644
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/Reaper.java
create mode 100644
curator-recipes/src/test/java/org/apache/curator/connection/TestThreadLocalRetryLoop.java
delete mode 100644
curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestChildReaper.java
delete mode 100644
curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java
delete mode 100644 curator-test-zk34/README.md
delete mode 100644 curator-test-zk34/pom.xml
delete mode 100644
curator-test-zk34/src/test/java/org/apache/curator/test/TestCompatibility.java
delete mode 100644 curator-test-zk34/src/test/resources/log4j.properties
copy
curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/Stepper.java
=> curator-test-zk35/src/test/java/org/apache/curator/zk35/TestIs35.java (67%)
rename
curator-test-zk34/src/test/java/org/apache/curator/test/Compatibility.java =>
curator-test/src/main/java/org/apache/curator/test/FailedServerStartException.java
(79%)
delete mode 100644
curator-x-async/src/main/java/org/apache/curator/x/async/details/AsyncGetAllChildrenNumberBuilderImpl.java
delete mode 100644
curator-x-async/src/main/java/org/apache/curator/x/async/details/AsyncGetEphemeralsBuilderImpl.java
create mode 100644 src/site/confluence/breaking-changes.confluence
delete mode 100644 src/site/confluence/exhibitor.confluence
rename src/site/confluence/{zk-compatibility.confluence =>
zk-compatibility-34.confluence} (58%)
