From bfb7f9e0b316e9269d7bb191183f36bbc36918f1 Mon Sep 17 00:00:00 2001
From: hjyun <hjyun@jam2in.com>
Date: Thu, 25 Feb 2021 19:14:12 +0900
Subject: [PATCH] FIX: invalid key length in bop mget, smget command

---
 .../java/net/spy/memcached/collection/BTreeGetBulkImpl.java    | 3 ++-
 .../spy/memcached/collection/BTreeSMGetWithByteTypeBkey.java   | 3 ++-
 .../memcached/collection/BTreeSMGetWithByteTypeBkeyOld.java    | 3 ++-
 .../spy/memcached/collection/BTreeSMGetWithLongTypeBkey.java   | 3 ++-
 .../memcached/collection/BTreeSMGetWithLongTypeBkeyOld.java    | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/spy/memcached/collection/BTreeGetBulkImpl.java b/src/main/java/net/spy/memcached/collection/BTreeGetBulkImpl.java
index 611a47830..eb4546cdd 100644
--- 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
index e3e404b47..c17741840 100644
--- 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
index 4ca158ae5..61856bb81 100644
--- 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
index bcd122d48..faf4a83c9 100644
--- 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
index 1da853a68..b65df96c6 100644
--- 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);