Merge branch 'binaryAPI' of git://github.com/yaourt/jedis

Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java

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

@@ -1,41 +1,45 @@
 package redis.clients.jedis;
 
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
 import redis.clients.util.RedisInputStream;
 import redis.clients.util.RedisOutputStream;
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import static redis.clients.util.RedisOutputStream.CHARSET;
-
 public final class Protocol {
 
     public static final int DEFAULT_PORT = 6379;
 
+    public static final Charset UTF8 = Charset.forName("UTF-8");
+
     public static final byte DOLLAR_BYTE = '$';
     public static final byte ASTERISK_BYTE = '*';
     public static final byte PLUS_BYTE = '+';
     public static final byte MINUS_BYTE = '-';
     public static final byte COLON_BYTE = ':';
 
-    public void sendCommand(RedisOutputStream os, String name, String... args) {
+    public void sendCommand(final RedisOutputStream os, final Command command,
+            final byte[]... args) {
+        sendCommand(os, command.raw, args);
+    }
+
+    private void sendCommand(final RedisOutputStream os, final byte[] command,
+            final byte[]... args) {
         try {
             os.write(ASTERISK_BYTE);
             os.writeIntCrLf(args.length + 1);
             os.write(DOLLAR_BYTE);
-            os.writeIntCrLf(name.length());
-            os.writeAsciiCrLf(name);
+            os.writeIntCrLf(command.length);
+            os.write(command);
+            os.writeCrLf();
 
-            for (String str : args) {
+            for (final byte[] arg : args) {
                 os.write(DOLLAR_BYTE);
-                final int size = RedisOutputStream.utf8Length(str);
-                os.writeIntCrLf(size);
-                if (size == str.length())
-                    os.writeAsciiCrLf(str);
-                else {
-                    os.writeUtf8CrLf(str);
-                }
+                os.writeIntCrLf(arg.length);
+                os.write(arg);
+                os.writeCrLf();
             }
             os.flush();
         } catch (IOException e) {
@@ -43,12 +47,12 @@ public final class Protocol {
         }
     }
 
-    private void processError(RedisInputStream is) {
+    private void processError(final RedisInputStream is) {
         String message = is.readLine();
         throw new JedisException(message);
     }
 
-    private Object process(RedisInputStream is) {
+    private Object process(final RedisInputStream is) {
         try {
             byte b = is.readByte();
             if (b == MINUS_BYTE) {
@@ -70,11 +74,11 @@ public final class Protocol {
         return null;
     }
 
-    private String processStatusCodeReply(RedisInputStream is) {
-        return is.readLine();
+    private byte[] processStatusCodeReply(final RedisInputStream is) {
+        return is.readLine().getBytes(UTF8);
     }
 
-    private String processBulkReply(RedisInputStream is) {
+    private byte[] processBulkReply(final RedisInputStream is) {
         int len = Integer.parseInt(is.readLine());
         if (len == -1) {
             return null;
@@ -92,15 +96,15 @@ public final class Protocol {
             throw new JedisException(e);
         }
 
-        return new String(read, CHARSET);
+        return read;
     }
 
-    private Integer processInteger(RedisInputStream is) {
+    private Integer processInteger(final RedisInputStream is) {
         String num = is.readLine();
         return Integer.valueOf(num);
     }
 
-    private List<Object> processMultiBulkReply(RedisInputStream is) {
+    private List<Object> processMultiBulkReply(final RedisInputStream is) {
         int num = Integer.parseInt(is.readLine());
         if (num == -1) {
             return null;
@@ -112,7 +116,39 @@ public final class Protocol {
         return ret;
     }
 
-    public Object read(RedisInputStream is) {
+    public Object read(final RedisInputStream is) {
         return process(is);
     }
+
+    public static final byte[] toByteArray(final int value) {
+        return String.valueOf(value).getBytes(Protocol.UTF8);
+    }
+
+    public static final byte[] toByteArray(final long value) {
+        return String.valueOf(value).getBytes(Protocol.UTF8);
+    }
+
+    public static final byte[] toByteArray(final double value) {
+        return String.valueOf(value).getBytes(Protocol.UTF8);
+    }
+
+    public static enum Command {
+        PING, SET, GET, QUIT, EXISTS, DEL, TYPE, FLUSHDB, KEYS, RANDOMKEY, RENAME, RENAMENX, RENAMEX, DBSIZE, EXPIRE, EXPIREAT, TTL, SELECT, MOVE, FLUSHALL, GETSET, MGET, SETNX, SETEX, MSET, MSETNX, DECRBY, DECR, INCRBY, INCR, APPEND, SUBSTR, HSET, HGET, HSETNX, HMSET, HMGET, HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, ZCOUNT, ZRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, SHUTDOWN, INFO, MONITOR, SLAVEOF, CONFIG, STRLEN, SYNC, LPUSHX, PERSIST, RPUSHX, ECHO, LINSERT, DEBUG;
+
+        public final byte[] raw;
+
+        Command() {
+            raw = this.name().getBytes(UTF8);
+        }
+    }
+
+    public static enum Keyword {
+        AGGREGATE, ALPHA, ASC, BY, DESC, GET, LIMIT, MESSAGE, NO, NOSORT, PMESSAGE, PSUBSCRIBE, PUNSUBSCRIBE, OK, ONE, QUEUED, SET, STORE, SUBSCRIBE, UNSUBSCRIBE, WEIGHTS, WITHSCORES;
+        public final byte[] raw;
+
+        Keyword() {
+            raw = this.name().toLowerCase().getBytes(UTF8);
+        }
+
+    }
 }