tisonkun commented on code in PR #2064:
URL: https://github.com/apache/zookeeper/pull/2064#discussion_r1330451722


##########
zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java:
##########
@@ -735,10 +735,18 @@ private String getParentPathAndValidate(String path) 
throws BadArgumentsExceptio
     }
 
     private static int checkAndIncVersion(int currentVersion, int 
expectedVersion, String path) throws KeeperException.BadVersionException {
-        if (expectedVersion != -1 && expectedVersion != currentVersion) {
-            throw new KeeperException.BadVersionException(path);
+       if (expectedVersion != -1) {
+            if (expectedVersion != currentVersion) {
+                throw new KeeperException.BadVersionException(path);
+            }
+            if (expectedVersion == -2) {
+                return 0;
+            } else {
+                return currentVersion + 1;
+            }
+        } else {
+            return currentVersion + 1;

Review Comment:
   ```java
   if (expectedVersion != -1) {
               if (expectedVersion != currentVersion) {
                   throw new KeeperException.BadVersionException(path);
               }
               if (expectedVersion == -2) {
                   return 0; // <-- this branch is unreachable
   ```
   
   I suppose this is what @kezhuw means?



##########
zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java:
##########
@@ -735,10 +735,18 @@ private String getParentPathAndValidate(String path) 
throws BadArgumentsExceptio
     }
 
     private static int checkAndIncVersion(int currentVersion, int 
expectedVersion, String path) throws KeeperException.BadVersionException {
-        if (expectedVersion != -1 && expectedVersion != currentVersion) {
-            throw new KeeperException.BadVersionException(path);
+       if (expectedVersion != -1) {
+            if (expectedVersion != currentVersion) {
+                throw new KeeperException.BadVersionException(path);
+            }
+            if (expectedVersion == -2) {
+                return 0;
+            } else {
+                return currentVersion + 1;
+            }
+        } else {
+            return currentVersion + 1;

Review Comment:
   ```java
   if (expectedVersion != -1) {
               if (expectedVersion != currentVersion) {
                   throw new KeeperException.BadVersionException(path);
               }
               if (expectedVersion == -2) {
                   return 0; // <-- this branch is unreachable
   ```
   
   I suppose this is what @kezhuw means?



-- 
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: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to