Merge pull request #334 from hjyun328/mget_keylen

FIX: invalid key length in bop mget, smget command
naver · Mar 3, 2021 · 3c10195 · 3c10195
2 parents d013768 + bfb7f9e
commit 3c10195
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/net/spy/memcached/collection/BTreeGetBulkImpl.java b/src/main/java/net/spy/memcached/collection/BTreeGetBulkImpl.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import net.spy.memcached.KeyUtil;
 import net.spy.memcached.util.BTreeUtil;
 
 public abstract class BTreeGetBulkImpl<T> implements BTreeGetBulk<T> {
@@ -115,7 +116,7 @@ public String stringify() {
 
     StringBuilder b = new StringBuilder();
 
-    b.append(getSpaceSeparatedKeys().length());
+    b.append(KeyUtil.getKeyBytes(getSpaceSeparatedKeys()).length);
     b.append(" ").append(keyList.size());
     b.append(" ").append(range);
 

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetWithByteTypeBkey.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetWithByteTypeBkey.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import net.spy.memcached.KeyUtil;
 import net.spy.memcached.util.BTreeUtil;
 
 public class BTreeSMGetWithByteTypeBkey<T> implements BTreeSMGet<T> {
@@ -99,7 +100,7 @@ public String stringify() {
 
     StringBuilder b = new StringBuilder();
 
-    b.append(getSpaceSeparatedKeys().length());
+    b.append(KeyUtil.getKeyBytes(getSpaceSeparatedKeys()).length);
     b.append(" ").append(keyList.size());
     b.append(" ").append(range);
 

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetWithByteTypeBkeyOld.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetWithByteTypeBkeyOld.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import net.spy.memcached.KeyUtil;
 import net.spy.memcached.util.BTreeUtil;
 
 public class BTreeSMGetWithByteTypeBkeyOld<T> implements BTreeSMGet<T> {
@@ -98,7 +99,7 @@ public String stringify() {
 
     StringBuilder b = new StringBuilder();
 
-    b.append(getSpaceSeparatedKeys().length());
+    b.append(KeyUtil.getKeyBytes(getSpaceSeparatedKeys()).length);
     b.append(" ").append(keyList.size());
     b.append(" ").append(range);
 

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetWithLongTypeBkey.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetWithLongTypeBkey.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import net.spy.memcached.KeyUtil;
 import net.spy.memcached.util.BTreeUtil;
 
 public class BTreeSMGetWithLongTypeBkey<T> implements BTreeSMGet<T> {
@@ -102,7 +103,7 @@ public String stringify() {
 
     StringBuilder b = new StringBuilder();
 
-    b.append(getSpaceSeparatedKeys().length());
+    b.append(KeyUtil.getKeyBytes(getSpaceSeparatedKeys()).length);
     b.append(" ").append(keyList.size());
     b.append(" ").append(range);
 

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetWithLongTypeBkeyOld.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetWithLongTypeBkeyOld.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import net.spy.memcached.KeyUtil;
 import net.spy.memcached.util.BTreeUtil;
 
 public class BTreeSMGetWithLongTypeBkeyOld<T> implements BTreeSMGet<T> {
@@ -101,7 +102,7 @@ public String stringify() {
 
     StringBuilder b = new StringBuilder();
 
-    b.append(getSpaceSeparatedKeys().length());
+    b.append(KeyUtil.getKeyBytes(getSpaceSeparatedKeys()).length);
     b.append(" ").append(keyList.size());
     b.append(" ").append(range);