[geode] branch develop updated: GEODE-8451 Redis PING response contains unneeded quotes (#5472)

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 666ea7d  GEODE-8451 Redis PING response contains unneeded quotes (#5472)
666ea7d is described below

commit 666ea7d29ecfcb02974654eccfd7ffd8b7ec1a32
Author: John Hutchison <jh...@gmail.com>
AuthorDate: Mon Aug 24 23:24:52 2020 -0400

    GEODE-8451 Redis PING response contains unneeded quotes (#5472)
---
 .../org/apache/geode/redis/internal/executor/RedisResponse.java    | 4 ++++
 .../geode/redis/internal/executor/connection/PingExecutor.java     | 4 ++--
 .../src/main/java/org/apache/geode/redis/internal/netty/Coder.java | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/RedisResponse.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/RedisResponse.java
index 75a91c1..8a6d153 100644
--- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/RedisResponse.java
+++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/RedisResponse.java
@@ -52,6 +52,10 @@ public class RedisResponse {
     return new RedisResponse((bba) -> Coder.getSimpleStringResponse(bba, stringValue));
   }
 
+  public static RedisResponse string(byte[] byteArray) {
+    return new RedisResponse((bba) -> Coder.getSimpleStringResponse(bba, byteArray));
+  }
+
   public static RedisResponse bulkString(Object value) {
     return new RedisResponse((bba) -> {
       try {
diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/PingExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/PingExecutor.java
index b66fe72..80a7c1a 100755
--- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/PingExecutor.java
+++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/PingExecutor.java
@@ -30,10 +30,10 @@ public class PingExecutor extends AbstractExecutor {
   public RedisResponse executeCommand(Command command,
       ExecutionHandlerContext context) {
     List<byte[]> commandElems = command.getProcessedCommand();
-    Object result = PING_RESPONSE;
+    byte[] result = PING_RESPONSE.getBytes();
     if (commandElems.size() > 1) {
       result = commandElems.get(1);
     }
-    return RedisResponse.bulkString(result);
+    return RedisResponse.string(result);
   }
 }
diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/Coder.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/Coder.java
index 6c06c08..9b20ee7 100644
--- a/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/Coder.java
+++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/Coder.java
@@ -260,10 +260,13 @@ public class Coder {
 
   public static ByteBuf getSimpleStringResponse(ByteBufAllocator alloc, String string) {
     byte[] simpAr = stringToBytes(string);
+    return getSimpleStringResponse(alloc, simpAr);
+  }
 
-    ByteBuf response = alloc.buffer(simpAr.length + 20);
+  public static ByteBuf getSimpleStringResponse(ByteBufAllocator alloc, byte[] byteArray) {
+    ByteBuf response = alloc.buffer(byteArray.length + 20);
     response.writeByte(SIMPLE_STRING_ID);
-    response.writeBytes(simpAr);
+    response.writeBytes(byteArray);
     response.writeBytes(CRLFar);
     return response;
   }