Merge pull request #2025 from DvirDukhan/general_execute_command

General execute command

Author: gkorland

src/main/java/redis/clients/jedis/BinaryJedis.java

@@ -43,6 +43,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKey
   protected Client client = null;
   protected Transaction transaction = null;
   protected Pipeline pipeline = null;
+  private final byte[][] dummyArray = new byte[0][];
 
   public BinaryJedis() {
     client = new Client();
@@ -4045,9 +4046,12 @@ public   List<byte[]> xclaim(byte[] key, byte[] groupname, byte[] consumername,
     return client.getBinaryMultiBulkReply();  
   }
 
-  @Override
   public Object sendCommand(ProtocolCommand cmd, byte[]... args) {
     client.sendCommand(cmd, args);
     return client.getOne();
   }
+
+  public Object sendCommand(ProtocolCommand cmd) {
+    return sendCommand(cmd, dummyArray);
+  }
 }

src/main/java/redis/clients/jedis/BinaryJedisCluster.java

@@ -2203,7 +2203,6 @@ public Long execute(Jedis connection) {
     }.runBinary(key);
   }
 
-  @Override
   public Object sendCommand(final byte[] sampleKey, final ProtocolCommand cmd, final byte[]... args) {
     return new JedisClusterCommand<Object>(connectionHandler, maxAttempts) {
       @Override

src/main/java/redis/clients/jedis/BinaryShardedJedis.java

@@ -18,6 +18,9 @@
 
 public class BinaryShardedJedis extends Sharded<Jedis, JedisShardInfo> implements
     BinaryJedisCommands {
+
+  private final byte[][] dummyArray = new byte[0][];
+
   public BinaryShardedJedis(List<JedisShardInfo> shards) {
     super(shards);
   }
@@ -1036,12 +1039,14 @@ public List<byte[]> xclaim(byte[] key, byte[] groupname, byte[] consumername, lo
     return j.xclaim(key, groupname, consumername, minIdleTime, newIdleTime, retries, force, ids);
   }
 
-  @Override
   public Object sendCommand(ProtocolCommand cmd, byte[]... args) {
     // default since no sample key provided in JedisCommands interface
     byte[] sampleKey = args.length > 0 ? args[0] : cmd.getRaw();
-    Jedis j = getShard(args[0]);
+    Jedis j = getShard(sampleKey);
     return j.sendCommand(cmd, args);
   }
 
+  public Object sendCommand(ProtocolCommand cmd) {
+    return sendCommand(cmd, dummyArray);
+  }
 }

src/main/java/redis/clients/jedis/Jedis.java

@@ -3830,7 +3830,6 @@ public List<StreamEntry> xclaim(String key, String group, String consumername, l
     return BuilderFactory.STREAM_ENTRY_LIST.build(client.getObjectMultiBulkReply());
   }
 
-  @Override
   public Object sendCommand(ProtocolCommand cmd, String... args) {
     client.sendCommand(cmd, args);
     return client.getOne();

src/main/java/redis/clients/jedis/JedisCluster.java

@@ -2235,7 +2235,6 @@ public Long execute(Jedis connection) {
     }.run(key);
   }
 
-  @Override
   public Object sendCommand(final String sampleKey, final ProtocolCommand cmd, final String... args) {
     return new JedisClusterCommand<Object>(connectionHandler, maxAttempts) {
       @Override

src/main/java/redis/clients/jedis/PipelineBase.java

@@ -1963,14 +1963,12 @@ public Response<List<byte[]>> xclaim(byte[] key, byte[] group, byte[] consumerna
     return getResponse(BuilderFactory.BYTE_ARRAY_LIST);            
   }
 
-  @Override
   public Response<Object> sendCommand(ProtocolCommand cmd, String... args){
     String key = args.length > 0 ? args[0] : cmd.toString();
     getClient(key).sendCommand(cmd, args);
     return getResponse(BuilderFactory.OBJECT);
   }
 
-  @Override
   public Response<Object> sendCommand(ProtocolCommand cmd, byte[]... args){
     byte[] key = args.length > 0 ? args[0] : cmd.getRaw();
     getClient(key).sendCommand(cmd, args);

src/main/java/redis/clients/jedis/ShardedJedis.java

@@ -1055,7 +1055,6 @@ public List<StreamEntry> xclaim(String key, String group, String consumername, l
     return j.xclaim(key, group, consumername, minIdleTime, newIdleTime, retries, force, ids);
   }
 
-  @Override
   public Object sendCommand(ProtocolCommand cmd, String... args) {
     // default since no sample key provided in JedisCommands interface
     String sampleKey = args.length > 0 ? args[0] : cmd.toString();

src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java

@@ -350,6 +350,4 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(byte[] key, byte[] member, dou
   List<byte[]> xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, int retries, boolean force, byte[][] ids);
 
   Long waitReplicas(byte[] key, final int replicas, final long timeout);
-
-  Object sendCommand(final byte[] sampleKey, ProtocolCommand cmd, byte[]... args);
 }

src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java

@@ -356,6 +356,4 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(byte[] key, byte[] member, dou
   List<byte[]> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername);
 
   List<byte[]> xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, int retries, boolean force, byte[][] ids);
-
-  Object sendCommand(ProtocolCommand cmd, byte[]... args);
 }

src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java

@@ -353,6 +353,4 @@ Response<List<byte[]>> xclaim(byte[] key, byte[] group, byte[] consumername, lon
   Response<String> psetex(byte[] key, long milliseconds, byte[] value);
 
   Response<Double> hincrByFloat(byte[] key, byte[] field, double increment);
-
-  Response<Object> sendCommand(ProtocolCommand cmd, byte[]... args);
 }

src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java

@@ -482,6 +482,4 @@ List<StreamEntry> xclaim( String key, String group, String consumername, long mi
       long newIdleTime, int retries, boolean force, StreamEntryID... ids);
 
   Long waitReplicas(final String key, final int replicas, final long timeout);
-
-  Object sendCommand(final String sampleKey, ProtocolCommand cmd, String... args);
 }

src/main/java/redis/clients/jedis/commands/JedisCommands.java

@@ -480,7 +480,4 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(String key, String member, dou
    */        
   List<StreamEntry> xclaim( String key, String group, String consumername, long minIdleTime, 
       long newIdleTime, int retries, boolean force, StreamEntryID... ids);
-
-
-  Object sendCommand(ProtocolCommand cmd, String... args);
 }

src/main/java/redis/clients/jedis/commands/RedisPipeline.java

@@ -353,6 +353,4 @@ Response<Set<Tuple>> zrangeByScoreWithScores(String key, String min, String max,
   Response<String> psetex(String key, long milliseconds, String value);
 
   Response<Double> hincrByFloat(String key, String field, double increment);
-
-  Response<Object> sendCommand(ProtocolCommand cmd, String... args);
 }

src/test/java/redis/clients/jedis/tests/ShardedJedisTest.java

@@ -1,11 +1,13 @@
 package redis.clients.jedis.tests;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static redis.clients.jedis.Protocol.Command.PING;
 import static redis.clients.jedis.Protocol.Command.SET;
 
 import java.util.ArrayList;
@@ -21,6 +23,7 @@
 import redis.clients.jedis.ShardedJedis;
 import redis.clients.jedis.tests.utils.ClientKillerUtil;
 import redis.clients.jedis.util.Hashing;
+import redis.clients.jedis.util.SafeEncoder;
 import redis.clients.jedis.util.Sharded;
 
 public class ShardedJedisTest {
@@ -351,6 +354,8 @@ public void testGeneralCommand(){
     assertEquals("bar1", j.get("b"));
     j.disconnect();
 
+    assertEquals("PONG", SafeEncoder.encode((byte[]) jedis.sendCommand(PING)));
+
   }
 
 }

src/test/java/redis/clients/jedis/tests/commands/AllKindOfValuesCommandsTest.java

@@ -9,6 +9,7 @@
 import static org.junit.Assert.fail;
 import static redis.clients.jedis.Protocol.Command.GET;
 import static redis.clients.jedis.Protocol.Command.LRANGE;
+import static redis.clients.jedis.Protocol.Command.PING;
 import static redis.clients.jedis.Protocol.Command.RPUSH;
 import static redis.clients.jedis.Protocol.Command.SET;
 import static redis.clients.jedis.ScanParams.SCAN_POINTER_START;
@@ -862,6 +863,8 @@ public void sendCommandTest(){
     expected.add("c".getBytes());
     for (int i = 0; i < 3; i++)
       assertArrayEquals(expected.get(i), list.get(i));
+
+    assertEquals("PONG", SafeEncoder.encode((byte[]) jedis.sendCommand(PING)));
   }
 
 }

src/test/java/redis/clients/jedis/tests/commands/BinaryValuesCommandsTest.java

@@ -288,6 +288,7 @@ public void strlen() {
     assertEquals(binaryValue.length, jedis.strlen(bfoo).intValue());
   }
 
+  @Test
   public void sendCommandTest(){
     Object obj = jedis.sendCommand(SET, "x".getBytes(), "1".getBytes());
     String returnValue = SafeEncoder.encode((byte[]) obj);