JCBC-110: Delete operation in MemcachedClient now returns it's cas

Change-Id: Id70241db2e4111f335b76ed9e6c6179d266aee94
Reviewed-on: http://review.couchbase.org/20852
Reviewed-by: Matt Ingenthron <[email protected]>
Tested-by: Matt Ingenthron <[email protected]>

Author: Mike Wiederhold

src/main/java/net/spy/memcached/MemcachedClient.java

@@ -1861,11 +1861,15 @@ public OperationFuture<Boolean> delete(String key) {
     final CountDownLatch latch = new CountDownLatch(1);
     final OperationFuture<Boolean> rv = new OperationFuture<Boolean>(key,
         latch, operationTimeout);
-    DeleteOperation op = opFact.delete(key, new OperationCallback() {
+    DeleteOperation op = opFact.delete(key, new DeleteOperation.Callback() {
       public void receivedStatus(OperationStatus s) {
         rv.set(s.isSuccess(), s);
       }
 
+      public void gotData(long cas) {
+        rv.setCas(cas);
+      }
+
       public void complete() {
         latch.countDown();
       }

src/main/java/net/spy/memcached/OperationFactory.java

@@ -76,7 +76,7 @@ public interface OperationFactory {
    * @param operationCallback the status callback
    * @return the new DeleteOperation
    */
-  DeleteOperation delete(String key, OperationCallback operationCallback);
+  DeleteOperation delete(String key, DeleteOperation.Callback callback);
 
   /**
    * Create a Unlock operation.

src/main/java/net/spy/memcached/ops/BaseOperationFactory.java

@@ -65,7 +65,8 @@ public Collection<Operation> clone(KeyedOperation op) {
           cop.getFlags(), cop.getExpiration(), cop.getData(),
           (StoreOperation.Callback) cop.getCallback()));
     } else if(op instanceof DeleteOperation) {
-      rv.add(delete(first(op.getKeys()), op.getCallback()));
+      rv.add(delete(first(op.getKeys()),
+          (DeleteOperation.Callback)op.getCallback()));
     } else if (op instanceof MutatorOperation) {
       MutatorOperation mo = (MutatorOperation) op;
       rv.add(mutate(mo.getType(), first(op.getKeys()), mo.getBy(),

src/main/java/net/spy/memcached/ops/DeleteOperation.java

@@ -26,5 +26,16 @@
  * Deletion operation.
  */
 public interface DeleteOperation extends KeyedOperation {
-  // nothing in particular.
+  /**
+   * Delete operation callback.
+   */
+  interface Callback extends OperationCallback {
+    /**
+     * Callback for each result from a Store.
+     *
+     * @param key the key that was retrieved
+     * @param cas the CAS value for this record
+     */
+    void gotData(long cas);
+  }
 }

src/main/java/net/spy/memcached/ops/ObserveOperation.java

@@ -22,6 +22,7 @@
 
 package net.spy.memcached.ops;
 
+import net.spy.memcached.MemcachedNode;
 import net.spy.memcached.ObserveResponse;
 
 /**

src/main/java/net/spy/memcached/protocol/ascii/AsciiOperationFactory.java

@@ -65,7 +65,7 @@
  */
 public class AsciiOperationFactory extends BaseOperationFactory {
 
-  public DeleteOperation delete(String key, OperationCallback cb) {
+  public DeleteOperation delete(String key, DeleteOperation.Callback cb) {
     return new DeleteOperationImpl(key, cb);
   }
 

src/main/java/net/spy/memcached/protocol/binary/BinaryOperationFactory.java

@@ -67,7 +67,7 @@
 public class BinaryOperationFactory extends BaseOperationFactory {
 
   public DeleteOperation
-  delete(String key, OperationCallback operationCallback) {
+  delete(String key, DeleteOperation.Callback operationCallback) {
     return new DeleteOperationImpl(key, operationCallback);
   }
 

src/main/java/net/spy/memcached/protocol/binary/DeleteOperationImpl.java

@@ -24,7 +24,6 @@
 package net.spy.memcached.protocol.binary;
 
 import net.spy.memcached.ops.DeleteOperation;
-import net.spy.memcached.ops.OperationCallback;
 
 class DeleteOperationImpl extends SingleKeyOperationImpl implements
     DeleteOperation {
@@ -33,11 +32,11 @@ class DeleteOperationImpl extends SingleKeyOperationImpl implements
 
   private final long cas;
 
-  public DeleteOperationImpl(String k, OperationCallback cb) {
+  public DeleteOperationImpl(String k, DeleteOperation.Callback cb) {
     this(k, 0, cb);
   }
 
-  public DeleteOperationImpl(String k, long c, OperationCallback cb) {
+  public DeleteOperationImpl(String k, long c, DeleteOperation.Callback cb) {
     super(CMD, generateOpaque(), k, cb);
     cas = c;
   }
@@ -47,6 +46,12 @@ public void initialize() {
     prepareBuffer(key, cas, EMPTY_BYTES);
   }
 
+  @Override
+  protected void decodePayload(byte[] pl) {
+    super.decodePayload(pl);
+    ((DeleteOperation.Callback) getCallback()).gotData(responseCas);
+  }
+
   @Override
   public String toString() {
     return super.toString() + " Cas: " + cas;

src/test/java/net/spy/memcached/OperationFactoryTestBase.java

@@ -55,6 +55,7 @@ public abstract class OperationFactoryTestBase extends MockObjectTestCase {
   protected OperationFactory ofact = null;
   protected OperationCallback genericCallback;
   protected StoreOperation.Callback storeCallback;
+  protected DeleteOperation.Callback deleteCallback;
   private byte[] testData;
 
   @Override
@@ -82,6 +83,18 @@ public void receivedStatus(OperationStatus status) {
         fail("Unexpected status:  " + status);
       }
     };
+    deleteCallback = new DeleteOperation.Callback() {
+      public void complete() {
+        fail("Unexpected invocation");
+      }
+
+      public void gotData(long cas) {
+      }
+
+      public void receivedStatus(OperationStatus status) {
+        fail("Unexpected status:  " + status);
+      }
+    };
     testData = new byte[64];
     new Random().nextBytes(testData);
   }
@@ -92,11 +105,11 @@ public void receivedStatus(OperationStatus status) {
   protected abstract OperationFactory getOperationFactory();
 
   public void testDeleteOperationCloning() {
-    DeleteOperation op = ofact.delete(TEST_KEY, genericCallback);
+    DeleteOperation op = ofact.delete(TEST_KEY, deleteCallback);
 
     DeleteOperation op2 = cloneOne(DeleteOperation.class, op);
     assertEquals(TEST_KEY, op2.getKeys().iterator().next());
-    assertCallback(op2);
+    assertDeleteCallback(op2);
   }
 
   public void testCASOperationCloning() {
@@ -274,6 +287,10 @@ protected void assertStoreCallback(Operation op) {
     assertSame(storeCallback, op.getCallback());
   }
 
+  protected void assertDeleteCallback(Operation op) {
+    assertSame(deleteCallback, op.getCallback());
+  }
+
   private void assertBytes(byte[] bytes) {
     assertTrue(Arrays.equals(testData, bytes));
   }