Skip to content

Commit 70f7ea8

Browse files
sazzad16sazzad16
authored
Add zdiffstore (#3454)
and prepare removing zdiffStore
1 parent c4e0525 commit 70f7ea8

12 files changed

+107
-13
lines changed

‎src/main/java/redis/clients/jedis/CommandObjects.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,7 +1814,15 @@ public final CommandObject<List<Tuple>> zdiffWithScores(String... keys) {
18141814
.add(WITHSCORES), getTupleListBuilder());
18151815
}
18161816

1817+
/**
1818+
* @deprecated Use {@link #zdiffstore(java.lang.String, java.lang.String...)}.
1819+
*/
1820+
@Deprecated
18171821
public final CommandObject<Long> zdiffStore(String dstkey, String... keys) {
1822+
return zdiffstore(dstkey, keys);
1823+
}
1824+
1825+
public final CommandObject<Long> zdiffstore(String dstkey, String... keys) {
18181826
return new CommandObject<>(commandArguments(ZDIFFSTORE).key(dstkey)
18191827
.add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
18201828
}
@@ -1828,7 +1836,15 @@ public final CommandObject<List<Tuple>> zdiffWithScores(byte[]... keys) {
18281836
.add(WITHSCORES), getTupleListBuilder());
18291837
}
18301838

1839+
/**
1840+
* @deprecated Use {@link #zdiffstore(byte..., byte[]...)}.
1841+
*/
1842+
@Deprecated
18311843
public final CommandObject<Long> zdiffStore(byte[] dstkey, byte[]... keys) {
1844+
return zdiffstore(dstkey, keys);
1845+
}
1846+
1847+
public final CommandObject<Long> zdiffstore(byte[] dstkey, byte[]... keys) {
18321848
return new CommandObject<>(commandArguments(ZDIFFSTORE).key(dstkey)
18331849
.add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
18341850
}

‎src/main/java/redis/clients/jedis/Jedis.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2700,11 +2700,18 @@ public List<Tuple> zdiffWithScores(final byte[]... keys) {
27002700
}
27012701

27022702
@Override
2703+
@Deprecated
27032704
public long zdiffStore(final byte[] dstkey, final byte[]... keys) {
27042705
checkIsInMultiOrPipeline();
27052706
return connection.executeCommand(commandObjects.zdiffStore(dstkey, keys));
27062707
}
27072708

2709+
@Override
2710+
public long zdiffstore(final byte[] dstkey, final byte[]... keys) {
2711+
checkIsInMultiOrPipeline();
2712+
return connection.executeCommand(commandObjects.zdiffstore(dstkey, keys));
2713+
}
2714+
27082715
/**
27092716
* Return the all the elements in the sorted set at key with a score between min and max
27102717
* (including elements with score equal to min or max).
@@ -6446,11 +6453,18 @@ public List<Tuple> zdiffWithScores(String... keys) {
64466453
}
64476454

64486455
@Override
6456+
@Deprecated
64496457
public long zdiffStore(final String dstkey, final String... keys) {
64506458
checkIsInMultiOrPipeline();
64516459
return connection.executeCommand(commandObjects.zdiffStore(dstkey, keys));
64526460
}
64536461

6462+
@Override
6463+
public long zdiffstore(final String dstkey, final String... keys) {
6464+
checkIsInMultiOrPipeline();
6465+
return connection.executeCommand(commandObjects.zdiffstore(dstkey, keys));
6466+
}
6467+
64546468
@Override
64556469
public List<String> zrange(final String key, final long start, final long stop) {
64566470
checkIsInMultiOrPipeline();

‎src/main/java/redis/clients/jedis/PipelineBase.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,10 +1146,16 @@ public Response<List<Tuple>> zdiffWithScores(String... keys) {
11461146
}
11471147

11481148
@Override
1149+
@Deprecated
11491150
public Response<Long> zdiffStore(String dstKey, String... keys) {
11501151
return appendCommand(commandObjects.zdiffStore(dstKey, keys));
11511152
}
11521153

1154+
@Override
1155+
public Response<Long> zdiffstore(String dstKey, String... keys) {
1156+
return appendCommand(commandObjects.zdiffstore(dstKey, keys));
1157+
}
1158+
11531159
@Override
11541160
public Response<Long> zinterstore(String dstKey, String... sets) {
11551161
return appendCommand(commandObjects.zinterstore(dstKey, sets));
@@ -2891,10 +2897,16 @@ public Response<List<Tuple>> zdiffWithScores(byte[]... keys) {
28912897
}
28922898

28932899
@Override
2900+
@Deprecated
28942901
public Response<Long> zdiffStore(byte[] dstkey, byte[]... keys) {
28952902
return appendCommand(commandObjects.zdiffStore(dstkey, keys));
28962903
}
28972904

2905+
@Override
2906+
public Response<Long> zdiffstore(byte[] dstkey, byte[]... keys) {
2907+
return appendCommand(commandObjects.zdiffstore(dstkey, keys));
2908+
}
2909+
28982910
@Override
28992911
public Response<List<byte[]>> zinter(ZParams params, byte[]... keys) {
29002912
return appendCommand(commandObjects.zinter(params, keys));

‎src/main/java/redis/clients/jedis/TransactionBase.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,10 +1304,16 @@ public Response<List<Tuple>> zdiffWithScores(String... keys) {
13041304
}
13051305

13061306
@Override
1307+
@Deprecated
13071308
public Response<Long> zdiffStore(String dstKey, String... keys) {
13081309
return appendCommand(commandObjects.zdiffStore(dstKey, keys));
13091310
}
13101311

1312+
@Override
1313+
public Response<Long> zdiffstore(String dstKey, String... keys) {
1314+
return appendCommand(commandObjects.zdiffstore(dstKey, keys));
1315+
}
1316+
13111317
@Override
13121318
public Response<Long> zinterstore(String dstKey, String... sets) {
13131319
return appendCommand(commandObjects.zinterstore(dstKey, sets));
@@ -3058,10 +3064,16 @@ public Response<List<Tuple>> zdiffWithScores(byte[]... keys) {
30583064
}
30593065

30603066
@Override
3067+
@Deprecated
30613068
public Response<Long> zdiffStore(byte[] dstkey, byte[]... keys) {
30623069
return appendCommand(commandObjects.zdiffStore(dstkey, keys));
30633070
}
30643071

3072+
@Override
3073+
public Response<Long> zdiffstore(byte[] dstkey, byte[]... keys) {
3074+
return appendCommand(commandObjects.zdiffstore(dstkey, keys));
3075+
}
3076+
30653077
@Override
30663078
public Response<List<byte[]>> zinter(ZParams params, byte[]... keys) {
30673079
return appendCommand(commandObjects.zinter(params, keys));

‎src/main/java/redis/clients/jedis/UnifiedJedis.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2376,10 +2376,16 @@ public List<Tuple> zdiffWithScores(String... keys) {
23762376
}
23772377

23782378
@Override
2379+
@Deprecated
23792380
public long zdiffStore(String dstkey, String... keys) {
23802381
return executeCommand(commandObjects.zdiffStore(dstkey, keys));
23812382
}
23822383

2384+
@Override
2385+
public long zdiffstore(String dstkey, String... keys) {
2386+
return executeCommand(commandObjects.zdiffstore(dstkey, keys));
2387+
}
2388+
23832389
@Override
23842390
public List<byte[]> zdiff(byte[]... keys) {
23852391
return executeCommand(commandObjects.zdiff(keys));
@@ -2391,10 +2397,16 @@ public List<Tuple> zdiffWithScores(byte[]... keys) {
23912397
}
23922398

23932399
@Override
2400+
@Deprecated
23942401
public long zdiffStore(byte[] dstkey, byte[]... keys) {
23952402
return executeCommand(commandObjects.zdiffStore(dstkey, keys));
23962403
}
23972404

2405+
@Override
2406+
public long zdiffstore(byte[] dstkey, byte[]... keys) {
2407+
return executeCommand(commandObjects.zdiffstore(dstkey, keys));
2408+
}
2409+
23982410
@Override
23992411
public long zinterstore(String dstkey, String... sets) {
24002412
return executeCommand(commandObjects.zinterstore(dstkey, sets));

‎src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,14 @@ default ScanResult<Tuple> zscan(byte[] key, byte[] cursor) {
138138

139139
List<Tuple> zdiffWithScores(byte[]... keys);
140140

141+
/**
142+
* @deprecated Use {@link #zdiffstore(byte..., byte[]...)}.
143+
*/
144+
@Deprecated
141145
long zdiffStore(byte[] dstkey, byte[]... keys);
142146

147+
long zdiffstore(byte[] dstkey, byte[]... keys);
148+
143149
List<byte[]> zinter(ZParams params, byte[]... keys);
144150

145151
List<Tuple> zinterWithScores(ZParams params, byte[]... keys);

‎src/main/java/redis/clients/jedis/commands/SortedSetCommands.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,9 +699,19 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
699699
* @param dstkey
700700
* @param keys group of sets
701701
* @return The number of elements in the resulting sorted set at dstkey.
702+
* @deprecated Use {@link #zdiffstore(java.lang.String, java.lang.String...)}.
702703
*/
704+
@Deprecated
703705
long zdiffStore(String dstkey, String... keys);
704706

707+
/**
708+
* Compute the difference between all the sets in the given keys. Store the result in dstkey.
709+
* @param dstkey
710+
* @param keys group of sets
711+
* @return The number of elements in the resulting sorted set at dstkey.
712+
*/
713+
long zdiffstore(String dstkey, String... keys);
714+
705715
/**
706716
* Compute the intersection between all the sets in the given keys.
707717
* <p>

‎src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,14 @@ default Response<ScanResult<Tuple>> zscan(byte[] key, byte[] cursor) {
139139

140140
Response<List<Tuple>> zdiffWithScores(byte[]... keys);
141141

142+
/**
143+
* @deprecated Use {@link #zdiffstore(byte..., byte[]...)}.
144+
*/
145+
@Deprecated
142146
Response<Long> zdiffStore(byte[] dstkey, byte[]... keys);
143147

148+
Response<Long> zdiffstore(byte[] dstkey, byte[]... keys);
149+
144150
Response<List<byte[]>> zinter(ZParams params, byte[]... keys);
145151

146152
Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys);

‎src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,14 @@ default Response<ScanResult<Tuple>> zscan(String key, String cursor) {
139139

140140
Response<List<Tuple>> zdiffWithScores(String... keys);
141141

142+
/**
143+
* @deprecated Use {@link #zdiffstore(java.lang.String, java.lang.String...)}.
144+
*/
145+
@Deprecated
142146
Response<Long> zdiffStore(String dstKey, String... keys);
143147

148+
Response<Long> zdiffstore(String dstKey, String... keys);
149+
144150
Response<Long> zinterstore(String dstKey, String... sets);
145151

146152
Response<Long> zinterstore(String dstKey, ZParams params, String... sets);

‎src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,13 +1573,13 @@ public void zdiff() {
15731573
}
15741574

15751575
@Test
1576-
public void zdiffStore() {
1576+
public void zdiffstore() {
15771577
jedis.zadd("foo", 1.0, "a");
15781578
jedis.zadd("foo", 2.0, "b");
15791579
jedis.zadd("bar", 1.0, "a");
15801580

1581-
assertEquals(0, jedis.zdiffStore("bar3", "bar1", "bar2"));
1582-
assertEquals(1, jedis.zdiffStore("bar3", "foo", "bar"));
1581+
assertEquals(0, jedis.zdiffstore("bar3", "bar1", "bar2"));
1582+
assertEquals(1, jedis.zdiffstore("bar3", "foo", "bar"));
15831583
assertEquals(singletonList("b"), jedis.zrange("bar3", 0, -1));
15841584

15851585
// binary
@@ -1588,8 +1588,8 @@ public void zdiffStore() {
15881588
jedis.zadd(bfoo, 2.0, bb);
15891589
jedis.zadd(bbar, 1.0, ba);
15901590

1591-
assertEquals(0, jedis.zdiffStore(bbar3, bbar1, bbar2));
1592-
assertEquals(1, jedis.zdiffStore(bbar3, bfoo, bbar));
1591+
assertEquals(0, jedis.zdiffstore(bbar3, bbar1, bbar2));
1592+
assertEquals(1, jedis.zdiffstore(bbar3, bfoo, bbar));
15931593
List<byte[]> bactual = jedis.zrange(bbar3, 0, -1);
15941594
assertArrayEquals(bb, bactual.iterator().next());
15951595
}

0 commit comments

Comments
 (0)