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

Merge branch 'markust push origin master-s24-master'

Browse Source
This commit is contained in:
Jungtaek Lim
2014-08-29 14:20:08 +09:00
parent db6d8c0daf f6aced860a
commit d3d5d476e3
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/redis/clients/jedis/ZParams.java
View File

@@ -23,6 +23,14 @@ public class ZParams {
private List<byte[]> params = new ArrayList<byte[]>(); private List<byte[]> params = new ArrayList<byte[]>();
/**
* Set weights.
*
* @param weights
* weights.
* @deprecated Use {@link #weightsByDouble(double...)} instead
*/
@Deprecated
public ZParams weights(final int... weights) { public ZParams weights(final int... weights) {
params.add(WEIGHTS.raw); params.add(WEIGHTS.raw);
for (final int weight : weights) { for (final int weight : weights) {
@@ -32,6 +40,21 @@ public class ZParams {
return this; return this;
} }
/**
* Set weights.
*
* @param weights
* weights.
*/
public ZParams weightsByDouble(final double... weights) {
params.add(WEIGHTS.raw);
for (final double weight : weights) {
params.add(Protocol.toByteArray(weight));
}
return this;
}
public Collection<byte[]> getParams() { public Collection<byte[]> getParams() {
return Collections.unmodifiableCollection(params); return Collections.unmodifiableCollection(params);
} }

20
src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
View File

@@ -783,15 +783,15 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("bar", 2, "b"); jedis.zadd("bar", 2, "b");
ZParams params = new ZParams(); ZParams params = new ZParams();
params.weights(2, 2); params.weightsByDouble(2, 2.5);
params.aggregate(ZParams.Aggregate.SUM); params.aggregate(ZParams.Aggregate.SUM);
long result = jedis.zunionstore("dst", params, "foo", "bar"); long result = jedis.zunionstore("dst", params, "foo", "bar");
assertEquals(2, result); assertEquals(2, result);
Set<Tuple> expected = new LinkedHashSet<Tuple>(); Set<Tuple> expected = new LinkedHashSet<Tuple>();
expected.add(new Tuple("b", new Double(8))); expected.add(new Tuple("b", new Double(9)));
expected.add(new Tuple("a", new Double(6))); expected.add(new Tuple("a", new Double(7)));
assertEquals(expected, jedis.zrangeWithScores("dst", 0, 100)); assertEquals(expected, jedis.zrangeWithScores("dst", 0, 100));
@@ -802,7 +802,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bbar, 2, bb); jedis.zadd(bbar, 2, bb);
ZParams bparams = new ZParams(); ZParams bparams = new ZParams();
bparams.weights(2, 2); bparams.weightsByDouble(2, 2.5);
bparams.aggregate(ZParams.Aggregate.SUM); bparams.aggregate(ZParams.Aggregate.SUM);
long bresult = jedis.zunionstore(SafeEncoder.encode("dst"), bparams, long bresult = jedis.zunionstore(SafeEncoder.encode("dst"), bparams,
bfoo, bbar); bfoo, bbar);
@@ -810,8 +810,8 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
assertEquals(2, bresult); assertEquals(2, bresult);
Set<Tuple> bexpected = new LinkedHashSet<Tuple>(); Set<Tuple> bexpected = new LinkedHashSet<Tuple>();
bexpected.add(new Tuple(bb, new Double(8))); bexpected.add(new Tuple(bb, new Double(9)));
bexpected.add(new Tuple(ba, new Double(6))); bexpected.add(new Tuple(ba, new Double(7)));
assertEquals(bexpected, assertEquals(bexpected,
jedis.zrangeWithScores(SafeEncoder.encode("dst"), 0, 100)); jedis.zrangeWithScores(SafeEncoder.encode("dst"), 0, 100));
@@ -855,14 +855,14 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("bar", 2, "a"); jedis.zadd("bar", 2, "a");
ZParams params = new ZParams(); ZParams params = new ZParams();
params.weights(2, 2); params.weightsByDouble(2, 2.5);
params.aggregate(ZParams.Aggregate.SUM); params.aggregate(ZParams.Aggregate.SUM);
long result = jedis.zinterstore("dst", params, "foo", "bar"); long result = jedis.zinterstore("dst", params, "foo", "bar");
assertEquals(1, result); assertEquals(1, result);
Set<Tuple> expected = new LinkedHashSet<Tuple>(); Set<Tuple> expected = new LinkedHashSet<Tuple>();
expected.add(new Tuple("a", new Double(6))); expected.add(new Tuple("a", new Double(7)));
assertEquals(expected, jedis.zrangeWithScores("dst", 0, 100)); assertEquals(expected, jedis.zrangeWithScores("dst", 0, 100));
@@ -872,7 +872,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bbar, 2, ba); jedis.zadd(bbar, 2, ba);
ZParams bparams = new ZParams(); ZParams bparams = new ZParams();
bparams.weights(2, 2); bparams.weightsByDouble(2, 2.5);
bparams.aggregate(ZParams.Aggregate.SUM); bparams.aggregate(ZParams.Aggregate.SUM);
long bresult = jedis.zinterstore(SafeEncoder.encode("dst"), bparams, long bresult = jedis.zinterstore(SafeEncoder.encode("dst"), bparams,
bfoo, bbar); bfoo, bbar);
@@ -880,7 +880,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
assertEquals(1, bresult); assertEquals(1, bresult);
Set<Tuple> bexpected = new LinkedHashSet<Tuple>(); Set<Tuple> bexpected = new LinkedHashSet<Tuple>();
bexpected.add(new Tuple(ba, new Double(6))); bexpected.add(new Tuple(ba, new Double(7)));
assertEquals(bexpected, assertEquals(bexpected,
jedis.zrangeWithScores(SafeEncoder.encode("dst"), 0, 100)); jedis.zrangeWithScores(SafeEncoder.encode("dst"), 0, 100));