rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #541 from xetorthio/jedis_cluster_hashtag

Browse Source 
Add support for redis cluster hashtags
This commit is contained in:
Jonathan Leibiusky
2014-02-11 22:53:27 -05:00
parent adc9cb215a 76814b56a1
commit c84039c367
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/redis/clients/util/JedisClusterCRC16.java
View File

@@ -4,7 +4,19 @@ public class JedisClusterCRC16 {
public final static int polynomial = 0x1021; // Represents x^16+x^12+x^5+1 public final static int polynomial = 0x1021; // Represents x^16+x^12+x^5+1
static int crc; static int crc;
public static int getSlot(String key) { public static int getSlot(String key) {
int s = key.indexOf("{");
if (s > -1) {
int e = key.indexOf("}", s+1);
if (e > -1 && e != s+1) {
key = key.substring(s+1, e);
}
}
return getCRC16(key) % 16384;
}
private static int getCRC16(String key) {
crc = 0x0000; crc = 0x0000;
for (byte b : key.getBytes()) { for (byte b : key.getBytes()) {
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
@@ -18,6 +30,6 @@ public class JedisClusterCRC16 {
} }
} }
return crc &= 0xffff % 16384; return crc &= 0xffff ;
} }
} }

8
src/test/java/redis/clients/jedis/tests/JedisClusterTest.java
View File

@@ -171,6 +171,14 @@ public class JedisClusterTest extends Assert {
jc.set("51", "foo"); jc.set("51", "foo");
} }
@Test
public void testRedisHashtag() {
assertEquals(JedisClusterCRC16.getSlot("{bar"), JedisClusterCRC16.getSlot("foo{{bar}}zap"));
assertEquals(JedisClusterCRC16.getSlot("{user1000}.following"), JedisClusterCRC16.getSlot("{user1000}.followers"));
assertNotEquals(JedisClusterCRC16.getSlot("foo{}{bar}"), JedisClusterCRC16.getSlot("bar"));
assertEquals(JedisClusterCRC16.getSlot("foo{bar}{zap}"), JedisClusterCRC16.getSlot("bar"));
}
private String getNodeId(String infoOutput) { private String getNodeId(String infoOutput) {
for (String infoLine : infoOutput.split("\n")) { for (String infoLine : infoOutput.split("\n")) {
if (infoLine.contains("myself")) { if (infoLine.contains("myself")) {