Issue alphazeroGH-47 (wip) -- keys() and mget binary support. (The fu…

…ture was written Joe ..)
rcohen · Apr 23, 2011 · cf65061 · cf65061
1 parent c682615
commit cf65061
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/core/api/src/main/java/org/jredis/JRedis.java b/core/api/src/main/java/org/jredis/JRedis.java
@@ -161,7 +161,7 @@ public interface JRedis {
 	 * @return
 	 * @throws RedisException
 	 */
-	public <K extends Object> List<byte[]> mget(String...keys) throws RedisException;
+	public <K extends Object> List<byte[]> mget(K...keys) throws RedisException;
 
 	/**
 	 * @Redis MSET
@@ -283,7 +283,7 @@ public interface JRedis {
 	 * @return
 	 * @throws RedisException
 	 */
-	public <K extends Object> List<String> keys (K pattern) throws RedisException;
+	public <K extends Object> List<byte[]> keys (K pattern) throws RedisException;
 
 	/**
 	 * Convenience method.  Equivalent to calling <code>jredis.keys("*");</code>
@@ -292,7 +292,7 @@ public interface JRedis {
 	 * @throws RedisException
 	 * @see {@link JRedis#keys(String)}
 	 */
-	public <K extends Object> List<String> keys () throws RedisException;
+	public <K extends Object> List<byte[]> keys () throws RedisException;
 
 	/**
 	 * @Redis RANDOMKEY

diff --git a/core/ri/src/main/java/org/jredis/ri/alphazero/JRedisSupport.java b/core/ri/src/main/java/org/jredis/ri/alphazero/JRedisSupport.java
@@ -1117,13 +1117,13 @@ public <K extends Object, T extends Serializable> void mset(KeyValueSet.Objects<
 	}
 
 //	@Override
-	public <K extends Object> List<byte[]> mget(String...keys) throws RedisException {
+	public <K extends Object> List<byte[]> mget(K...keys) throws RedisException {
 
 		if(null == keys || keys.length == 0) throw new IllegalArgumentException("no keys specified");
 		byte[] keydata = null;
 		byte[][] keybytes = new byte[keys.length][];
 		int i=0;
-		for(String k : keys) {
+		for(K k : keys) {
 			if((keydata = getKeyBytes(k)) == null) 
 				throw new IllegalArgumentException ("invalid key => ["+k+"] @ index: " + i);
 
@@ -1158,12 +1158,12 @@ public <K extends Object> List<byte[]> smembers(K key) throws RedisException {
 		return multiBulkData;
 	}
 //	@Override
-	public <K extends Object> List<String> keys() throws RedisException {
+	public <K extends Object> List<byte[]> keys() throws RedisException {
 		return this.keys("*");
 	}
 
 //	@Override
-	public <K extends Object> List<String> keys(K pattern) throws RedisException {
+	public <K extends Object> List<byte[]> keys(K pattern) throws RedisException {
 		byte[] keydata = null;
 		if((keydata = getKeyBytes(pattern)) == null) 
 			throw new RedisException (Command.KEYS, "ERR Invalid key.");
@@ -1176,7 +1176,8 @@ public <K extends Object> List<String> keys(K pattern) throws RedisException {
 		catch (ClassCastException e){
 			throw new ProviderException("Expecting a MultiBulkResponse here => " + e.getLocalizedMessage(), e);
 		}
-		return DefaultCodec.toStr(multiBulkData);
+//		return DefaultCodec.toStr(multiBulkData);
+		return multiBulkData;
 		/*
 		byte[] bulkData= null;
 		try {

diff --git a/core/ri/src/test/java/org/jredis/ri/alphazero/JRedisProviderTestsBase.java b/core/ri/src/test/java/org/jredis/ri/alphazero/JRedisProviderTestsBase.java
@@ -25,6 +25,8 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
+
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -3016,7 +3018,10 @@ public void testKeys() {
 			for (int i=0; i<SMALL_CNT; i++)
 				provider.set(keys.get(i), dataList.get(i));
 
-			List<String> rediskeys = provider.keys();
+			List<byte[]> redisBinkeys = provider.keys();
+			List<String> rediskeys = new ArrayList<String>(redisBinkeys.size());
+			for(byte[] bk : redisBinkeys)
+				rediskeys.add(new String(bk));
 			assertEquals(SMALL_CNT, rediskeys.size(), "size of key list should be SMALL_CNT");
 			for(int i=0; i<SMALL_CNT; i++) 
 				assertTrue(rediskeys.contains(keys.get(i)), "should contain " + keys.get(i));
@@ -3037,7 +3042,10 @@ public void testKeysString() {
 			for (int i=0; i<SMALL_CNT; i++)
 				provider.set(patternList.get(i), dataList.get(i));
 
-			List<String> rediskeys = provider.keys("*"+patternA+"*");
+			List<byte[]> redisBinkeys = provider.keys("*"+patternA+"*");
+			List<String> rediskeys = new ArrayList<String>(redisBinkeys.size());
+			for(byte[] bk : redisBinkeys)
+				rediskeys.add(new String(bk));
 			assertEquals(SMALL_CNT, rediskeys.size(), "size of key list should be SMALL_CNT");
 			for(int i=0; i<SMALL_CNT; i++) 
 				assertTrue(rediskeys.contains(patternList.get(i)), "should contain " + patternList.get(i));