INTERNAL: Add eflag parameter in collectionGetOperation callback.

naver · Aug 2, 2023 · 4fbe331 · 4fbe331
1 parent 6998801
commit 4fbe331
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/src/main/java/net/spy/memcached/ArcusClient.java b/src/main/java/net/spy/memcached/ArcusClient.java
@@ -528,8 +528,7 @@ public void complete() {
             latch.countDown();
           }
 
-          public void gotData(String key, int flags, String subkey, byte[] data) {
-            assert key.equals(k) : "Wrong key returned";
+          public void gotData(String subkey, int flags, byte[] data, byte[] eflag) {
             list.add(tc.decode(new CachedData(flags, data, tc.getMaxSize())));
           }
         });
@@ -607,8 +606,7 @@ public void complete() {
             latch.countDown();
           }
 
-          public void gotData(String key, int flags, String subkey, byte[] data) {
-            assert key.equals(k) : "Wrong key returned";
+          public void gotData(String subkey, int flags, byte[] data, byte[] eflag) {
             set.add(tc.decode(new CachedData(flags, data, tc.getMaxSize())));
           }
         });
@@ -674,12 +672,10 @@ public void complete() {
             latch.countDown();
           }
 
-          public void gotData(String key, int flags, String bkey, byte[] data) {
-            assert key.equals(k) : "Wrong key returned";
+          public void gotData(String bkey, int flags, byte[] data, byte[] eflag) {
             long longBkey = Long.parseLong(bkey);
             map.put(longBkey, new Element<T>(longBkey,
-                            tc.decode(new CachedData(flags, data, tc.getMaxSize())),
-                            collectionGet.getElementFlag()));
+                            tc.decode(new CachedData(flags, data, tc.getMaxSize())), eflag));
           }
         });
     rv.setOperation(op);
@@ -740,8 +736,7 @@ public void complete() {
             latch.countDown();
           }
 
-          public void gotData(String key, int flags, String mkey, byte[] data) {
-            assert key.equals(k) : "Wrong key returned";
+          public void gotData(String mkey, int flags, byte[] data, byte[] eflag) {
             map.put(mkey, tc.decode(new CachedData(flags, data, tc.getMaxSize())));
           }
         });
@@ -2980,12 +2975,10 @@ public void complete() {
             latch.countDown();
           }
 
-          public void gotData(String key, int flags, String bkey, byte[] data) {
-            assert key.equals(k) : "Wrong key returned";
+          public void gotData(String bkey, int flags, byte[] data, byte[] eflag) {
             byte[] byteBkey = BTreeUtil.hexStringToByteArrays(bkey);
             Element<T> element = new Element<T>(byteBkey,
-                    tc.decode(new CachedData(flags, data, tc.getMaxSize())),
-                    collectionGet.getElementFlag());
+                    tc.decode(new CachedData(flags, data, tc.getMaxSize())), eflag);
             map.put(new ByteArrayBKey(byteBkey), element);
           }
         });

diff --git a/src/main/java/net/spy/memcached/ops/CollectionGetOperation.java b/src/main/java/net/spy/memcached/ops/CollectionGetOperation.java
@@ -26,7 +26,7 @@ public interface CollectionGetOperation extends KeyedOperation {
   CollectionGet getGet();
 
   interface Callback extends OperationCallback {
-    void gotData(String key, int flags, String subkey, byte[] data);
+    void gotData(String subkey, int flags, byte[] data, byte[] eflag);
   }
 
 }
diff --git a/src/main/java/net/spy/memcached/protocol/ascii/CollectionGetOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/CollectionGetOperationImpl.java
@@ -223,7 +223,7 @@ public final void handleRead(ByteBuffer bb) {
     if (lookingFor == '\0' && readOffset == data.length) {
       CollectionGetOperation.Callback cb =
               (CollectionGetOperation.Callback) getCallback();
-      cb.gotData(key, flags, collectionGet.getSubkey(), data);
+      cb.gotData(collectionGet.getSubkey(), flags, data, collectionGet.getElementFlag());
       lookingFor = '\r';
     }
 

diff --git a/src/test/manual/net/spy/memcached/MultibyteKeyTest.java b/src/test/manual/net/spy/memcached/MultibyteKeyTest.java
@@ -166,7 +166,7 @@ public void decodeItemHeader(String itemHeader) {
         }
       }, new CollectionGetOperation.Callback() {
         @Override
-        public void gotData(String key, int flags, String subkey, byte[] data) {
+        public void gotData(String subkey, int flags, byte[] data, byte[] eflag) {
         }
 
         @Override
@@ -425,7 +425,7 @@ public void ExtendedBTreeGetOperationImplTest() {
           new BTreeGet(from, to, 0, 0, false, false, ElementFlagFilter.DO_NOT_FILTER),
           new CollectionGetOperation.Callback() {
             @Override
-            public void gotData(String key, int flags, String subkey, byte[] data) {
+            public void gotData(String subkey, int flags, byte[] data, byte[] eflag) {
             }
 
             @Override