FIX: getOperationStatus method in asyncCollectionPipedInsert/Update.

naver · Jun 16, 2023 · e8e053d · e8e053d
1 parent 0119a75
commit e8e053d
Showing 1 changed file with 24 additions and 36 deletions.
diff --git a/src/main/java/net/spy/memcached/ArcusClient.java b/src/main/java/net/spy/memcached/ArcusClient.java
@@ -952,9 +952,6 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncCollectionPip
 
     final CountDownLatch latch = new CountDownLatch(updateList.size());
 
-    final List<OperationStatus> mergedOperationStatus = Collections
-            .synchronizedList(new ArrayList<OperationStatus>(updateList.size()));
-
     final Map<Integer, CollectionOperationStatus> mergedResult =
         new ConcurrentHashMap<Integer, CollectionOperationStatus>();
 
@@ -966,15 +963,12 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncCollectionPip
           new CollectionPipedUpdateOperation.Callback() {
             // each result status
             public void receivedStatus(OperationStatus status) {
-              CollectionOperationStatus cstatus;
-
-              if (status instanceof CollectionOperationStatus) {
-                cstatus = (CollectionOperationStatus) status;
-              } else {
-                getLogger().warn("Unhandled state: " + status);
-                cstatus = new CollectionOperationStatus(status);
-              }
-              mergedOperationStatus.add(cstatus);
+              /*
+               * Nothing to do here.
+               * Because the result status is handled in gotStatus method.
+               * gotStatus method put failed status into mergedResult.
+               * If mergedResult was not empty, the merged operation status is failed.
+               * */
             }
 
             // complete
@@ -1058,12 +1052,12 @@ public Map<Integer, CollectionOperationStatus> get(long duration,
 
       @Override
       public CollectionOperationStatus getOperationStatus() {
-        for (OperationStatus status : mergedOperationStatus) {
-          if (!status.isSuccess()) {
-            return new CollectionOperationStatus(status);
-          }
-        }
-        return new CollectionOperationStatus(true, "END", CollectionResponse.END);
+        return isDone() ?
+                (mergedResult.isEmpty()
+                        ? new CollectionOperationStatus(true, "END", CollectionResponse.END)
+                        : new CollectionOperationStatus(false, "END", CollectionResponse.END)
+                )
+                : null;
       }
 
       @Override
@@ -3907,9 +3901,6 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncCollectionPip
 
     final CountDownLatch latch = new CountDownLatch(insertList.size());
 
-    final List<OperationStatus> mergedOperationStatus = Collections
-            .synchronizedList(new ArrayList<OperationStatus>(insertList.size()));
-
     final Map<Integer, CollectionOperationStatus> mergedResult =
         new ConcurrentHashMap<Integer, CollectionOperationStatus>();
 
@@ -3921,15 +3912,12 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncCollectionPip
           new CollectionPipedInsertOperation.Callback() {
             // each result status
             public void receivedStatus(OperationStatus status) {
-              CollectionOperationStatus cstatus;
-
-              if (status instanceof CollectionOperationStatus) {
-                cstatus = (CollectionOperationStatus) status;
-              } else {
-                getLogger().warn("Unhandled state: " + status);
-                cstatus = new CollectionOperationStatus(status);
-              }
-              mergedOperationStatus.add(cstatus);
+              /*
+              * Nothing to do here.
+              * Because the result status is handled in gotStatus method.
+              * gotStatus method put failed status into mergedResult.
+              * If mergedResult was not empty, the merged operation status is failed.
+              * */
             }
 
             // complete
@@ -4012,12 +4000,12 @@ public Map<Integer, CollectionOperationStatus> get(long duration,
 
       @Override
       public CollectionOperationStatus getOperationStatus() {
-        for (OperationStatus status : mergedOperationStatus) {
-          if (!status.isSuccess()) {
-            return new CollectionOperationStatus(status);
-          }
-        }
-        return new CollectionOperationStatus(true, "END", CollectionResponse.END);
+        return isDone() ?
+                (mergedResult.isEmpty()
+                        ? new CollectionOperationStatus(true, "END", CollectionResponse.END)
+                        : new CollectionOperationStatus(false, "END", CollectionResponse.END)
+                )
+                : null;
       }
 
       @Override