INTERNAL: Change parsing itemHeader logic in CollectionGetOpImpl.

naver · Aug 25, 2023 · c85af88 · c85af88
1 parent 4318361
commit c85af88
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 57 deletions.
diff --git a/src/main/java/net/spy/memcached/collection/BTreeFindPositionWithGet.java b/src/main/java/net/spy/memcached/collection/BTreeFindPositionWithGet.java
@@ -17,6 +17,8 @@
  */
 package net.spy.memcached.collection;
 
+import java.util.List;
+
 import net.spy.memcached.util.BTreeUtil;
 
 /**
@@ -133,6 +135,10 @@ public void decodeItemHeader(String itemHeader) {
     this.dataLength = bytes;
   }
 
+  @Override
+  public void decodeItemHeader(List<String> itemHeader) {
+  }
+
   public BKeyObject getBkey() {
     return bkey;
   }

diff --git a/src/main/java/net/spy/memcached/collection/BTreeGet.java b/src/main/java/net/spy/memcached/collection/BTreeGet.java
@@ -16,6 +16,8 @@
  */
 package net.spy.memcached.collection;
 
+import java.util.List;
+
 import net.spy.memcached.util.BTreeUtil;
 
 public class BTreeGet extends CollectionGet {
@@ -25,9 +27,6 @@ public class BTreeGet extends CollectionGet {
   protected int count = -1;
   protected ElementFlagFilter elementFlagFilter;
 
-  private boolean isFirstParsing = true;
-  private boolean elementFlagExists = false;
-
   private BTreeGet(String range,
                    boolean delete, boolean dropIfEmpty,
                    ElementFlagFilter elementFlagFilter) {
@@ -120,15 +119,6 @@ public String getCommand() {
     return command;
   }
 
-  public boolean eachRecordParseCompleted() {
-    if (elementFlagExists) {
-      // true if item header was parsed completely
-      return isFirstParsing;
-    } else {
-      return true;
-    }
-  }
-
   @Override
   public byte[] getAddtionalArgs() {
     return null;
@@ -141,30 +131,17 @@ public boolean headerReady(int spaceCount) {
   }
 
   @Override
-  public void decodeItemHeader(String itemHeader) {
-    String[] splited = itemHeader.split(" ");
-
-    if (isFirstParsing) {
-      // found bkey
-      if (splited[0].startsWith("0x")) {
-        this.subkey = splited[0].substring(2);
-      } else {
-        this.subkey = splited[0];
-      }
-
-      // found element flag.
-      if (splited[1].startsWith("0x")) {
-        this.elementFlagExists = true;
-        this.elementFlag = BTreeUtil.hexStringToByteArrays(splited[1].substring(2));
-        // need second parsing because of EFlag field
-        isFirstParsing = false;
-      } else {
-        this.dataLength = Integer.parseInt(splited[1]);
-      }
+  public void decodeItemHeader(List<String> args) {
+    subkey = args.get(0);
+    if (args.size() == 2) {
+      dataLength = Integer.parseInt(args.get(1));
     } else {
-      this.dataLength = Integer.parseInt(splited[1]);
-      // revert true for next B+Tree element parsing
-      this.isFirstParsing = true;
+      elementFlag = BTreeUtil.hexStringToByteArrays(args.get(1));
+      dataLength = Integer.parseInt(args.get(2));
     }
   }
+
+  @Override
+  public void decodeItemHeader(String itemHeader) {
+  }
 }
diff --git a/src/main/java/net/spy/memcached/collection/BTreeGetByPosition.java b/src/main/java/net/spy/memcached/collection/BTreeGetByPosition.java
@@ -17,6 +17,8 @@
  */
 package net.spy.memcached.collection;
 
+import java.util.List;
+
 import net.spy.memcached.util.BTreeUtil;
 
 /**
@@ -157,4 +159,8 @@ public boolean isReversed() {
     return posFrom > posTo;
   }
 
+  @Override
+  public void decodeItemHeader(List<String> itemHeader) {
+
+  }
 }
diff --git a/src/main/java/net/spy/memcached/collection/CollectionGet.java b/src/main/java/net/spy/memcached/collection/CollectionGet.java
@@ -16,6 +16,8 @@
  */
 package net.spy.memcached.collection;
 
+import java.util.List;
+
 public abstract class CollectionGet {
 
   protected boolean delete = false;
@@ -57,16 +59,13 @@ public boolean headerReady(int spaceCount) {
     return headerCount == spaceCount;
   }
 
-  public boolean eachRecordParseCompleted() {
-    return true;
-  }
-
   public abstract byte[] getAddtionalArgs();
 
   public abstract String stringify();
 
   public abstract String getCommand();
 
-  public abstract void decodeItemHeader(String itemHeader);
+  public abstract void decodeItemHeader(List<String> itemHeader);
 
+  public abstract void decodeItemHeader(String itemHeader);
 }
diff --git a/src/main/java/net/spy/memcached/collection/ListGet.java b/src/main/java/net/spy/memcached/collection/ListGet.java
@@ -16,6 +16,8 @@
  */
 package net.spy.memcached.collection;
 
+import java.util.List;
+
 public class ListGet extends CollectionGet {
 
   private static final String command = "lop get";
@@ -73,4 +75,8 @@ public String getCommand() {
   public void decodeItemHeader(String itemHeader) {
     this.dataLength = Integer.parseInt(itemHeader);
   }
+  @Override
+  public void decodeItemHeader(List<String> args) {
+    this.dataLength = Integer.parseInt(args.get(0));
+  }
 }
diff --git a/src/main/java/net/spy/memcached/collection/MapGet.java b/src/main/java/net/spy/memcached/collection/MapGet.java
@@ -100,4 +100,10 @@ public void decodeItemHeader(String itemHeader) {
     this.subkey = splited[0];
     this.dataLength = Integer.parseInt(splited[1]);
   }
+
+  @Override
+  public void decodeItemHeader(List<String> args) {
+    this.subkey = args.get(0);
+    this.dataLength = Integer.parseInt(args.get(1));
+  }
 }
diff --git a/src/main/java/net/spy/memcached/collection/SetGet.java b/src/main/java/net/spy/memcached/collection/SetGet.java
@@ -16,6 +16,8 @@
  */
 package net.spy.memcached.collection;
 
+import java.util.List;
+
 public class SetGet extends CollectionGet {
 
   private static final String command = "sop get";
@@ -67,4 +69,8 @@ public String getCommand() {
   public void decodeItemHeader(String itemHeader) {
     this.dataLength = Integer.parseInt(itemHeader);
   }
+  @Override
+  public void decodeItemHeader(List<String> args) {
+    this.dataLength = Integer.parseInt(args.get(0));
+  }
 }
diff --git a/src/main/java/net/spy/memcached/protocol/ascii/CollectionGetOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/CollectionGetOperationImpl.java
@@ -20,8 +20,10 @@
 import java.io.ByteArrayOutputStream;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 import net.spy.memcached.KeyUtil;
 import net.spy.memcached.collection.BTreeGet;
@@ -79,6 +81,7 @@ public class CollectionGetOperationImpl extends OperationImpl
   protected int readOffset = 0;
   protected byte lookingFor = '\0';
   protected int spaceCount = 0;
+  protected final List<String> args = new ArrayList<String>();
 
   public CollectionGetOperationImpl(String key, CollectionGet collectionGet,
                                     OperationCallback cb) {
@@ -142,32 +145,38 @@ public void handleLine(String line) {
       return;
     }
   }
-
   @Override
   public final void handleRead(ByteBuffer bb) {
+    boolean hasEFlag = false;
     // Decode a collection data header.
     if (lookingFor == '\0' && data == null) {
       while (bb.hasRemaining()) {
         byte b = bb.get();
-
         // Handle spaces.
         if (b == ' ') {
+           /*
+             btree: <bkey> [<eflag>] <bytes> <data>\r\n
+             list:  <bytes> <data>\r\n
+             set:   <bytes> <data>\r\n
+             map:   <field> <bytes> <data>\r\n
+           */
+          String arg = byteBuffer.toString();
+          byteBuffer.reset();
+          if (!args.isEmpty() && arg.startsWith("0x")) {
+            hasEFlag = true;
+          }
+          args.add(arg);
           spaceCount++;
           if (collectionGet.headerReady(spaceCount)) {
-            /*
-              btree: <bkey> [<eflag>] <bytes> <data>\r\n
-              list:  <bytes> <data>\r\n
-              set:   <bytes> <data>\r\n
-              map:   <field> <bytes> <data>\r\n
-             */
-            collectionGet.decodeItemHeader(byteBuffer.toString());
-            byteBuffer.reset();
-
-            if (collectionGet.headerReady(spaceCount) && collectionGet.eachRecordParseCompleted()) {
-              data = new byte[collectionGet.getDataLength()];
-              spaceCount = 0;
-              break;
+            // if item header has eFlag, spaceCount should be 3
+            if (hasEFlag && spaceCount == 2) {
+              continue;
             }
+            collectionGet.decodeItemHeader(args);
+            data = new byte[collectionGet.getDataLength()];
+            spaceCount = 0;
+            args.clear();
+            break;
           }
         }
 
@@ -189,8 +198,10 @@ public final void handleRead(ByteBuffer bb) {
           data = null;
           break;
         }
-
-        byteBuffer.write(b);
+        // Doesn't write space to byteBuffer
+        if (b != ' ') {
+          byteBuffer.write(b);
+        }
       }
       return;
     }

diff --git a/src/test/manual/net/spy/memcached/MultibyteKeyTest.java b/src/test/manual/net/spy/memcached/MultibyteKeyTest.java
@@ -164,6 +164,10 @@ public String getCommand() {
         @Override
         public void decodeItemHeader(String itemHeader) {
         }
+
+        @Override
+        public void decodeItemHeader(List<String> itemHeader) {
+        }
       }, new CollectionGetOperation.Callback() {
         @Override
         public void gotData(String subkey, int flags, byte[] data, byte[] eflag) {