Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor ZookeeperRepository#watch to avoid unless refresh metadata. #31403

Merged
merged 2 commits into from
May 27, 2024
Merged

Refactor ZookeeperRepository#watch to avoid unless refresh metadata. #31403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bdb293
Refactor ZookeeperRepository#watch to avoid unless refresh metadata.
zhaojinchao95 May 26, 2024
111ed25
Fix deletes
zhaojinchao95 May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 9 additions & 21 deletions ...java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.curator.framework.api.ACLProvider;
import org.apache.curator.framework.recipes.cache.CuratorCache;
import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.curator.utils.CloseableUtils;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
Expand Down Expand Up @@ -53,6 +52,7 @@
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -242,31 +242,19 @@ public void watch(final String key, final DataChangedEventListener listener) {
caches.put(key, cache);
}
CuratorCacheListener curatorCacheListener = CuratorCacheListener.builder()
.afterInitialized()
.forTreeCache(client, (framework, treeCacheListener) -> {
Type changedType = getChangedType(treeCacheListener.getType());
if (Type.IGNORED != changedType) {
listener.onChange(new DataChangedEvent(treeCacheListener.getData().getPath(),
new String(treeCacheListener.getData().getData(), StandardCharsets.UTF_8), changedType));
.forCreates(childData -> listener.onChange(new DataChangedEvent(childData.getPath(), new String(childData.getData(), StandardCharsets.UTF_8), Type.ADDED)))
.forChanges((oldData, newData) -> {
if (!Objects.equals(oldData, newData)) {
listener.onChange(new DataChangedEvent(newData.getPath(), new String(newData.getData(), StandardCharsets.UTF_8), Type.UPDATED));
}
}).build();
})
.forDeletes(oldData -> listener.onChange(new DataChangedEvent(oldData.getPath(), new String(oldData.getData(), StandardCharsets.UTF_8), Type.DELETED)))
.afterInitialized()
.build();
cache.listenable().addListener(curatorCacheListener);
cache.start();
}

private Type getChangedType(final TreeCacheEvent.Type type) {
switch (type) {
case NODE_ADDED:
return Type.ADDED;
case NODE_UPDATED:
return Type.UPDATED;
case NODE_REMOVED:
return Type.DELETED;
default:
return Type.IGNORED;
}
}

@Override
public void close() {
caches.values().forEach(CuratorCache::close);
Expand Down
Loading