From 7b7c6c9602f41b0b9f8a022aa16c6da9556cf64b Mon Sep 17 00:00:00 2001
From: samhendley <sam.hendley@gmail.com>
Date: Wed, 26 Dec 2012 11:58:48 -0500
Subject: [PATCH] fixed up some missing pipelined methods

---
 .../redis/clients/jedis/BinaryRedisPipeline.java   |  2 ++
 .../redis/clients/jedis/BinaryShardedJedis.java    |  9 +++++----
 .../clients/jedis/MultiKeyBinaryRedisPipeline.java |  2 ++
 .../java/redis/clients/jedis/RedisPipeline.java    |  2 ++
 .../java/redis/clients/jedis/ShardedJedis.java     |  7 -------
 .../redis/clients/jedis/ShardedJedisPipeline.java  | 14 ++++++++++++++
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java
index 959f915..af57473 100644
--- a/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java
+++ b/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java
@@ -85,6 +85,8 @@ public interface BinaryRedisPipeline {
 
     Response<String> ltrim(byte[] key, long start, long end);
 
+    Response<Long> move(byte[] key, int dbIndex);
+
     Response<Long> persist(byte[] key);
 
     Response<byte[]> rpop(byte[] key);
diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java
index 686af12..e8a5dc5 100644
--- a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java
+++ b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java
@@ -30,10 +30,11 @@ public class BinaryShardedJedis extends Sharded<Jedis, JedisShardInfo>
 	super(shards, algo, keyTagPattern);
     }
 
-    public void disconnect() throws IOException {
-	for (Jedis jedis : getAllShards()) {
-	    jedis.disconnect();
-	}
+    public void disconnect() {
+    for (Jedis jedis : getAllShards()) {
+        jedis.quit();
+        jedis.disconnect();
+    }
     }
 
     protected Jedis create(JedisShardInfo shard) {
diff --git a/src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java
index 12e2368..1413774 100644
--- a/src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java
+++ b/src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java
@@ -60,4 +60,6 @@ public interface MultiKeyBinaryRedisPipeline {
     Response<byte[]> brpoplpush(byte[] source, byte[] destination, int timeout);
 
     Response<Long> publish(byte[] channel, byte[] message);
+
+    Response<byte[]> randomKeyBinary();
 }
diff --git a/src/main/java/redis/clients/jedis/RedisPipeline.java b/src/main/java/redis/clients/jedis/RedisPipeline.java
index 570e620..3d79393 100644
--- a/src/main/java/redis/clients/jedis/RedisPipeline.java
+++ b/src/main/java/redis/clients/jedis/RedisPipeline.java
@@ -88,6 +88,8 @@ public interface RedisPipeline {
 
     Response<String> ltrim(String key, long start, long end);
 
+    Response<Long> move(String key, int dbIndex);
+
     Response<Long> persist(String key);
 
     Response<String> rpop(String key);
diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java
index cb5b122..142e754 100644
--- a/src/main/java/redis/clients/jedis/ShardedJedis.java
+++ b/src/main/java/redis/clients/jedis/ShardedJedis.java
@@ -26,13 +26,6 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
 	super(shards, algo, keyTagPattern);
     }
 
-    public void disconnect() {
-	for (Jedis jedis : getAllShards()) {
-	    jedis.quit();
-	    jedis.disconnect();
-	}
-    }
-
     public String set(String key, String value) {
 	Jedis j = getShard(key);
 	return j.set(key, value);
diff --git a/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java b/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java
index 771cdc9..8725bf3 100644
--- a/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java
+++ b/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java
@@ -91,6 +91,20 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline
         return getResponse(BuilderFactory.STRING_LIST);
     }
 
+    public Response<Long> move(byte[] key, int dbIndex) {
+        Client c = getClient(key);
+        c.move(key, dbIndex);
+        results.add(new FutureResult(c));
+        return getResponse(BuilderFactory.LONG);
+    }
+
+    public Response<Long> move(String key, int dbIndex) {
+        Client c = getClient(key);
+        c.move(key, dbIndex);
+        results.add(new FutureResult(c));
+        return getResponse(BuilderFactory.LONG);
+    }
+
     public Response<byte[]> echo(byte[] string) {
         Client c = getClient(string);
         c.echo(string);