Added sharding+pipelining support

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

@@ -1,15 +1,15 @@
 package redis.clients.jedis;
 
-import redis.clients.util.RedisInputStream;
-import redis.clients.util.RedisOutputStream;
-
-import java.io.*;
+import java.io.IOException;
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
+import redis.clients.util.RedisInputStream;
+import redis.clients.util.RedisOutputStream;
+
 public class Connection {
     private String host;
     private int port = Protocol.DEFAULT_PORT;
@@ -21,134 +21,139 @@ public class Connection {
     private int timeout = 2000;
 
     public int getTimeout() {
-	return timeout;
+        return timeout;
     }
 
     public void setTimeout(int timeout) {
-	this.timeout = timeout;
+        this.timeout = timeout;
     }
 
     public void setTimeoutInfinite() {
-	try {
-	    socket.setSoTimeout(0);
-	} catch (SocketException ex) {
-	    throw new JedisException(ex);
-	}
+        try {
+            socket.setSoTimeout(0);
+        } catch (SocketException ex) {
+            throw new JedisException(ex);
+        }
     }
 
     public void rollbackTimeout() {
-	try {
-	    socket.setSoTimeout(timeout);
-	} catch (SocketException ex) {
-	    throw new JedisException(ex);
-	}
+        try {
+            socket.setSoTimeout(timeout);
+        } catch (SocketException ex) {
+            throw new JedisException(ex);
+        }
     }
 
     public Connection(String host) {
-	super();
-	this.host = host;
+        super();
+        this.host = host;
     }
 
     protected Connection sendCommand(String name, String... args) {
-		try {
-			connect();
-		} catch (UnknownHostException e) {
-			throw new JedisException("Could not connect to redis-server", e);
-		} catch (IOException e) {
-			throw new JedisException("Could not connect to redis-server", e);
-		}
-	protocol.sendCommand(outputStream, name, args);
-	pipelinedCommands++;
-	return this;
+        try {
+            connect();
+        } catch (UnknownHostException e) {
+            throw new JedisException("Could not connect to redis-server", e);
+        } catch (IOException e) {
+            throw new JedisException("Could not connect to redis-server", e);
+        }
+        protocol.sendCommand(outputStream, name, args);
+        pipelinedCommands++;
+        return this;
     }
 
     public Connection(String host, int port) {
-	super();
-	this.host = host;
-	this.port = port;
+        super();
+        this.host = host;
+        this.port = port;
     }
 
     public String getHost() {
-	return host;
+        return host;
     }
 
     public void setHost(String host) {
-	this.host = host;
+        this.host = host;
     }
 
     public int getPort() {
-	return port;
+        return port;
     }
 
     public void setPort(int port) {
-	this.port = port;
+        this.port = port;
     }
 
     public Connection() {
     }
 
     public void connect() throws UnknownHostException, IOException {
-	if (!isConnected()) {
-	    socket = new Socket(host, port);
-	    socket.setSoTimeout(timeout);
-	    outputStream = new RedisOutputStream(socket.getOutputStream());
-	    inputStream = new RedisInputStream(socket.getInputStream());
-	}
+        if (!isConnected()) {
+            socket = new Socket(host, port);
+            socket.setSoTimeout(timeout);
+            outputStream = new RedisOutputStream(socket.getOutputStream());
+            inputStream = new RedisInputStream(socket.getInputStream());
+        }
     }
 
     public void disconnect() {
-	if (isConnected()) {
-	    try {
-		inputStream.close();
-		outputStream.close();
-		if (!socket.isClosed()) {
-		    socket.close();
-		}
-	    } catch (IOException ex) {
-		throw new JedisException(ex);
-	    }
-	}
+        if (isConnected()) {
+            try {
+                inputStream.close();
+                outputStream.close();
+                if (!socket.isClosed()) {
+                    socket.close();
+                }
+            } catch (IOException ex) {
+                throw new JedisException(ex);
+            }
+        }
     }
 
     public boolean isConnected() {
-	return socket != null && socket.isBound() && !socket.isClosed()
-		&& socket.isConnected() && !socket.isInputShutdown()
-		&& !socket.isOutputShutdown();
+        return socket != null && socket.isBound() && !socket.isClosed()
+                && socket.isConnected() && !socket.isInputShutdown()
+                && !socket.isOutputShutdown();
     }
 
     protected String getStatusCodeReply() {
-	pipelinedCommands--;
-	return (String) protocol.read(inputStream);
+        pipelinedCommands--;
+        return (String) protocol.read(inputStream);
     }
 
     public String getBulkReply() {
-	pipelinedCommands--;
-	return (String) protocol.read(inputStream);
+        pipelinedCommands--;
+        return (String) protocol.read(inputStream);
     }
 
     public int getIntegerReply() {
-	pipelinedCommands--;
-	return ((Integer) protocol.read(inputStream)).intValue();
+        pipelinedCommands--;
+        return ((Integer) protocol.read(inputStream)).intValue();
     }
 
     @SuppressWarnings("unchecked")
     public List<String> getMultiBulkReply() {
-	pipelinedCommands--;
-	return (List<String>) protocol.read(inputStream);
+        pipelinedCommands--;
+        return (List<String>) protocol.read(inputStream);
     }
 
     @SuppressWarnings("unchecked")
     public List<Object> getObjectMultiBulkReply() {
-	pipelinedCommands--;
-	return (List<Object>) protocol.read(inputStream);
+        pipelinedCommands--;
+        return (List<Object>) protocol.read(inputStream);
     }
 
     public List<Object> getAll() {
-	List<Object> all = new ArrayList<Object>();
-	while (pipelinedCommands > 0) {
-	    all.add(protocol.read(inputStream));
-	    pipelinedCommands--;
-	}
-	return all;
+        List<Object> all = new ArrayList<Object>();
+        while (pipelinedCommands > 0) {
+            all.add(protocol.read(inputStream));
+            pipelinedCommands--;
+        }
+        return all;
     }
-}
+
+    public Object getOne() {
+        pipelinedCommands--;
+        return protocol.read(inputStream);
+    }
+}