You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@helix.apache.org by "xyuanlu (via GitHub)" <gi...@apache.org> on 2023/04/27 18:36:39 UTC
[GitHub] [helix] xyuanlu opened a new pull request, #2460: Add find and remove for recursive persist listener trie
xyuanlu opened a new pull request, #2460:
URL: https://github.com/apache/helix/pull/2460
### Issues
- [ ] My PR addresses the following Helix issues and references them in the PR description:
(#200 - Link your issue number here: You can write "Fixes #XXX". Please use the proper keyword so that the issue gets closed automatically. See https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue
Any of the following keywords can be used: close, closes, closed, fix, fixes, fixed, resolve, resolves, resolved)
### Description
- [ ] Here are some details about my PR, including screenshots of any UI changes:
(Write a concise description including what, why, how)
### Tests
- [ ] The following tests are written for this issue:
(List the names of added unit/integration tests)
- The following is the result of the "mvn test" command on the appropriate module:
(If CI test fails due to known issue, please specify the issue and test PR locally. Then copy & paste the result of "mvn test" to here.)
### Changes that Break Backward Compatibility (Optional)
- My PR contains changes that break backward compatibility or previous assumptions for certain methods or API. They include:
(Consider including all behavior changes for public methods or API. Also include these changes in merge description so that other developers are aware of these changes. This allows them to make relevant code changes in feature branches accounting for the new method/API behavior.)
### Documentation (Optional)
- In case of new functionality, my PR adds documentation in the following wiki page:
(Link the GitHub wiki you added)
### Commits
- My commits all reference appropriate Apache Helix GitHub issues in their subject lines. In addition, my commits follow the guidelines from "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)":
1. Subject is separated from body by a blank line
1. Subject is limited to 50 characters (not including Jira issue reference)
1. Subject does not end with a period
1. Subject uses the imperative mood ("add", not "adding")
1. Body wraps at 72 characters
1. Body explains "what" and "why", not "how"
### Code Quality
- My diff has been formatted using helix-style.xml
(helix-style-intellij.xml if IntelliJ IDE is used)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] junkaixue commented on a diff in pull request #2460: Add find and remove for recursive persist listener trie
Posted by "junkaixue (via GitHub)" <gi...@apache.org>.
junkaixue commented on code in PR #2460:
URL: https://github.com/apache/helix/pull/2460#discussion_r1180550227
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
Review Comment:
This piece of code can be generalized:
synchronized (this) {
TrieNode cur = _rootNode;
for (final String element : pathComponents) {
cur = cur.getChild(element);
if (cur == null) {
break;
}
callable.call(cur);
}
For this call() {
result.addAll(cur.getRecursiveListeners());
}
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Removing a RecursivePersistWatcherListener on a path.
+ *
+ * Delete a path from the nearest trie node to current node if this is the only listener and there
+ * is no child on the trie node.
+ *
+ * @param path the of the lister registered
+ * @param listener the RecursivePersistListener to be removed
+ */
+ public void removeRecursiveListener(final String path, RecursivePersistListener listener) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ if (path.length() == 0) {
+ throw new IllegalArgumentException("Invalid path: " + path);
+ }
+ final List<String> pathComponents = split(path);
+
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ TrieNode highestNodeForDelete =
+ null; // track the highest node that from that node to leaf node.
+ TrieNode prevDeletable = _rootNode;
+ for (final String part : pathComponents) {
+ cur = cur.getChild(part);
+ if (cur == null) {
+ return;
+ }
+
+ boolean candidateToDelete =
+ (cur.getChildren().size() == 1 && cur.getRecursiveListeners().size() == 0) || (
+ cur.getChildren().size() == 0 && cur.getRecursiveListeners().size() == 1 && cur
+ .getRecursiveListeners().contains(listener));
+ if (candidateToDelete) {
+ if (highestNodeForDelete == null) {
+ highestNodeForDelete = cur;
+ }
+ } else {
+ prevDeletable = cur;
+ highestNodeForDelete = null;
+ }
+ }
+ if (!cur.getRecursiveListeners().contains(listener)) {
+ return;
+ }
+ cur.getRecursiveListeners().remove(listener);
+
+ if (highestNodeForDelete != null) {
+ prevDeletable.getChildren().remove(highestNodeForDelete.getValue());
+ }
Review Comment:
This will be generalized as the call() {
xxx
}
if (!cur.getRecursiveListeners().contains(listener)) {
return;
}
For this line, you have have a flag in original code, if flag == false, then stop search.
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Removing a RecursivePersistWatcherListener on a path.
+ *
+ * Delete a path from the nearest trie node to current node if this is the only listener and there
+ * is no child on the trie node.
+ *
+ * @param path the of the lister registered
+ * @param listener the RecursivePersistListener to be removed
+ */
+ public void removeRecursiveListener(final String path, RecursivePersistListener listener) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ if (path.length() == 0) {
+ throw new IllegalArgumentException("Invalid path: " + path);
+ }
+ final List<String> pathComponents = split(path);
+
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ TrieNode highestNodeForDelete =
+ null; // track the highest node that from that node to leaf node.
+ TrieNode prevDeletable = _rootNode;
+ for (final String part : pathComponents) {
+ cur = cur.getChild(part);
+ if (cur == null) {
+ return;
+ }
+
+ boolean candidateToDelete =
Review Comment:
Better add some explanation here. For the people does not have context may get confused.
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Removing a RecursivePersistWatcherListener on a path.
+ *
+ * Delete a path from the nearest trie node to current node if this is the only listener and there
+ * is no child on the trie node.
+ *
+ * @param path the of the lister registered
+ * @param listener the RecursivePersistListener to be removed
+ */
+ public void removeRecursiveListener(final String path, RecursivePersistListener listener) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ if (path.length() == 0) {
+ throw new IllegalArgumentException("Invalid path: " + path);
+ }
+ final List<String> pathComponents = split(path);
+
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ TrieNode highestNodeForDelete =
+ null; // track the highest node that from that node to leaf node.
+ TrieNode prevDeletable = _rootNode;
+ for (final String part : pathComponents) {
+ cur = cur.getChild(part);
+ if (cur == null) {
+ return;
+ }
+
+ boolean candidateToDelete =
+ (cur.getChildren().size() == 1 && cur.getRecursiveListeners().size() == 0) || (
Review Comment:
This condition means this node has only one subpath. If subpath contains listener and removed, then why not remove this node itself. This node should be empty as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2460: Add find and remove for recursive persist listener trie
Posted by "xyuanlu (via GitHub)" <gi...@apache.org>.
xyuanlu commented on code in PR #2460:
URL: https://github.com/apache/helix/pull/2460#discussion_r1195531628
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
Review Comment:
Had an offline discussion. It is hard to generalize this part of logic with the following func.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2460: Add find and remove for recursive persist listener trie
Posted by "xyuanlu (via GitHub)" <gi...@apache.org>.
xyuanlu commented on code in PR #2460:
URL: https://github.com/apache/helix/pull/2460#discussion_r1195531628
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
Review Comment:
Had an offline discussion. It is hard to generalize this part of logic with the following func. Let's keep it this way.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2460: [WIP] Add find and remove for recursive persist listener trie
Posted by "xyuanlu (via GitHub)" <gi...@apache.org>.
xyuanlu commented on code in PR #2460:
URL: https://github.com/apache/helix/pull/2460#discussion_r1181891116
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Removing a RecursivePersistWatcherListener on a path.
+ *
+ * Delete a path from the nearest trie node to current node if this is the only listener and there
+ * is no child on the trie node.
+ *
+ * @param path the of the lister registered
+ * @param listener the RecursivePersistListener to be removed
+ */
+ public void removeRecursiveListener(final String path, RecursivePersistListener listener) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ if (path.length() == 0) {
+ throw new IllegalArgumentException("Invalid path: " + path);
+ }
+ final List<String> pathComponents = split(path);
+
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ TrieNode highestNodeForDelete =
+ null; // track the highest node that from that node to leaf node.
+ TrieNode prevDeletable = _rootNode;
+ for (final String part : pathComponents) {
+ cur = cur.getChild(part);
+ if (cur == null) {
+ return;
+ }
+
+ boolean candidateToDelete =
+ (cur.getChildren().size() == 1 && cur.getRecursiveListeners().size() == 0) || (
+ cur.getChildren().size() == 0 && cur.getRecursiveListeners().size() == 1 && cur
+ .getRecursiveListeners().contains(listener));
+ if (candidateToDelete) {
+ if (highestNodeForDelete == null) {
+ highestNodeForDelete = cur;
+ }
+ } else {
+ prevDeletable = cur;
+ highestNodeForDelete = null;
+ }
+ }
+ if (!cur.getRecursiveListeners().contains(listener)) {
+ return;
+ }
+ cur.getRecursiveListeners().remove(listener);
+
+ if (highestNodeForDelete != null) {
+ prevDeletable.getChildren().remove(highestNodeForDelete.getValue());
+ }
Review Comment:
Had an offline discussion. This block of code notifies 3 TrieNode in each loop, while the previous block need one TrieNode as input. It is more readable to keep them separate.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2460: Add find and remove for recursive persist listener trie
Posted by "xyuanlu (via GitHub)" <gi...@apache.org>.
xyuanlu commented on code in PR #2460:
URL: https://github.com/apache/helix/pull/2460#discussion_r1195805798
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -1,5 +1,17 @@
package org.apache.helix.zookeeper.zkclient.util;
Review Comment:
It some how come after the import block. Updated..
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] desaikomal commented on a diff in pull request #2460: Add find and remove for recursive persist listener trie
Posted by "desaikomal (via GitHub)" <gi...@apache.org>.
desaikomal commented on code in PR #2460:
URL: https://github.com/apache/helix/pull/2460#discussion_r1195516494
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -1,5 +1,17 @@
package org.apache.helix.zookeeper.zkclient.util;
Review Comment:
nit: Apache Header
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu merged pull request #2460: Add find and remove for recursive persist listener trie
Posted by "xyuanlu (via GitHub)" <gi...@apache.org>.
xyuanlu merged PR #2460:
URL: https://github.com/apache/helix/pull/2460
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] qqu0127 commented on a diff in pull request #2460: Add find and remove for recursive persist listener trie
Posted by "qqu0127 (via GitHub)" <gi...@apache.org>.
qqu0127 commented on code in PR #2460:
URL: https://github.com/apache/helix/pull/2460#discussion_r1180816751
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
Review Comment:
nit: the lambda can be simplified by `TrieNode::new`
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -1,5 +1,17 @@
package org.apache.helix.zookeeper.zkclient.util;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.helix.zookeeper.zkclient.RecursivePersistListener;
+
Review Comment:
Acidental change?
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Removing a RecursivePersistWatcherListener on a path.
+ *
+ * Delete a path from the nearest trie node to current node if this is the only listener and there
+ * is no child on the trie node.
+ *
+ * @param path the of the lister registered
+ * @param listener the RecursivePersistListener to be removed
+ */
+ public void removeRecursiveListener(final String path, RecursivePersistListener listener) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ if (path.length() == 0) {
+ throw new IllegalArgumentException("Invalid path: " + path);
Review Comment:
Let's just say empty path
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Removing a RecursivePersistWatcherListener on a path.
+ *
+ * Delete a path from the nearest trie node to current node if this is the only listener and there
+ * is no child on the trie node.
+ *
+ * @param path the of the lister registered
+ * @param listener the RecursivePersistListener to be removed
+ */
+ public void removeRecursiveListener(final String path, RecursivePersistListener listener) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ if (path.length() == 0) {
Review Comment:
prefer `path.isEmpty()`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2460: Add find and remove for recursive persist listener trie
Posted by "xyuanlu (via GitHub)" <gi...@apache.org>.
xyuanlu commented on code in PR #2460:
URL: https://github.com/apache/helix/pull/2460#discussion_r1180811015
##########
zookeeper-api/src/main/java/org/apache/helix/zookeeper/zkclient/util/ZkPathRecursiveWatcherTrie.java:
##########
@@ -139,17 +139,88 @@ public void addRecursiveListener(final String path, RecursivePersistListener lis
if (path.isEmpty()) {
throw new IllegalArgumentException("Empty path: " + path);
}
- final List<String> pathComponents = split(path);
+ final List<String> pathComponents = split(path);
- synchronized(this) {
+ synchronized (this) {
TrieNode parent = _rootNode;
for (final String part : pathComponents) {
- parent = parent.getChildren().computeIfAbsent(part, (p)-> new TrieNode(part) );
+ parent = parent.getChildren().computeIfAbsent(part, (p) -> new TrieNode(part));
}
parent._recursiveListeners.add(listener);
}
}
+ public Set<RecursivePersistListener> getAllRecursiveListeners(String path) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ final List<String> pathComponents = split(path);
+ Set<RecursivePersistListener> result = new HashSet<>();
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ for (final String element : pathComponents) {
+ cur = cur.getChild(element);
+ if (cur == null) {
+ break;
+ }
+ result.addAll(cur.getRecursiveListeners());
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Removing a RecursivePersistWatcherListener on a path.
+ *
+ * Delete a path from the nearest trie node to current node if this is the only listener and there
+ * is no child on the trie node.
+ *
+ * @param path the of the lister registered
+ * @param listener the RecursivePersistListener to be removed
+ */
+ public void removeRecursiveListener(final String path, RecursivePersistListener listener) {
+ Objects.requireNonNull(path, "Path cannot be null");
+
+ if (path.length() == 0) {
+ throw new IllegalArgumentException("Invalid path: " + path);
+ }
+ final List<String> pathComponents = split(path);
+
+ synchronized (this) {
+ TrieNode cur = _rootNode;
+ TrieNode highestNodeForDelete =
+ null; // track the highest node that from that node to leaf node.
+ TrieNode prevDeletable = _rootNode;
+ for (final String part : pathComponents) {
+ cur = cur.getChild(part);
+ if (cur == null) {
+ return;
+ }
+
+ boolean candidateToDelete =
+ (cur.getChildren().size() == 1 && cur.getRecursiveListeners().size() == 0) || (
Review Comment:
I am not quite sure about this. If one of the following trie node has more than one child or more than one listener, we can not remove this Trie node.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on pull request #2460: Add find and remove for recursive persist listener trie
Posted by "xyuanlu (via GitHub)" <gi...@apache.org>.
xyuanlu commented on PR #2460:
URL: https://github.com/apache/helix/pull/2460#issuecomment-1528114134
Thanks for all the review! This is a draft PR for experimental only. I will post a PR when ready.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on pull request #2460: Add find and remove for recursive persist listener trie
Posted by "xyuanlu (via GitHub)" <gi...@apache.org>.
xyuanlu commented on PR #2460:
URL: https://github.com/apache/helix/pull/2460#issuecomment-1552353425
This pr is ready to be merged. Approved by @junkaixue
commit message:
Add find and remove for recursive persist listener trie
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org