refactor: Introduced LongScoredValue to replace key/long pairs

subprojects/lettucemod/src/main/java/com/redis/lettucemod/RedisModulesAsyncCommandsImpl.java

@@ -13,6 +13,7 @@
 import com.redis.lettucemod.bloom.CuckooFilter;
 import com.redis.lettucemod.bloom.CuckooFilterInsertOptions;
 import com.redis.lettucemod.bloom.CuckooFilterReserveOptions;
+import com.redis.lettucemod.bloom.LongScoredValue;
 import com.redis.lettucemod.bloom.TDigestInfo;
 import com.redis.lettucemod.bloom.TDigestMergeOptions;
 import com.redis.lettucemod.bloom.TopKInfo;
@@ -713,10 +714,10 @@ public RedisFuture<String> cfReserve(K key, long capacity, CuckooFilterReserveOp
 	public RedisFuture<Long> cmsIncrBy(K key, V item, long increment) {
 		return dispatch(bloomCommandBuilder.cmsIncrBy(key, item, increment));
 	}
-
+	
 	@Override
-	public RedisFuture<List<Long>> cmsIncrBy(K key, Map<V, Long> increments) {
-		return dispatch(bloomCommandBuilder.cmsIncrBy(key, increments));
+	public RedisFuture<List<Long>> cmsIncrBy(K key, LongScoredValue<V>... itemIncrements) {
+		return dispatch(bloomCommandBuilder.cmsIncrBy(key, itemIncrements));
 	}
 
 	@Override
@@ -738,10 +739,10 @@ public RedisFuture<List<Long>> cmsQuery(K key, V... items) {
 	public RedisFuture<String> cmsMerge(K destKey, K... keys) {
 		return dispatch(bloomCommandBuilder.cmsMerge(destKey, keys));
 	}
-
+	
 	@Override
-	public RedisFuture<String> cmsMerge(K destKey, Map<K, Long> keyWeightMap) {
-		return dispatch(bloomCommandBuilder.cmsMerge(destKey, keyWeightMap));
+	public RedisFuture<String> cmsMerge(K destKey, LongScoredValue<K>... sourceKeyWeights) {
+		return dispatch(bloomCommandBuilder.cmsMerge(destKey, sourceKeyWeights));
 	}
 
 	@Override
@@ -753,10 +754,10 @@ public RedisFuture<CmsInfo> cmsInfo(K key) {
 	public RedisFuture<List<Value<V>>> topKAdd(K key, V... items) {
 		return dispatch(bloomCommandBuilder.topKAdd(key, items));
 	}
-
+	
 	@Override
-	public RedisFuture<List<Value<V>>> topKIncrBy(K key, Map<V, Long> increments) {
-		return dispatch(bloomCommandBuilder.topKIncrBy(key, increments));
+	public RedisFuture<List<Value<V>>> topKIncrBy(K key, LongScoredValue<V>... itemIncrements) {
+		return dispatch(bloomCommandBuilder.topKIncrBy(key, itemIncrements));
 	}
 
 	@Override

subprojects/lettucemod/src/main/java/com/redis/lettucemod/RedisModulesReactiveCommandsImpl.java

@@ -12,6 +12,7 @@
 import com.redis.lettucemod.bloom.CuckooFilter;
 import com.redis.lettucemod.bloom.CuckooFilterInsertOptions;
 import com.redis.lettucemod.bloom.CuckooFilterReserveOptions;
+import com.redis.lettucemod.bloom.LongScoredValue;
 import com.redis.lettucemod.bloom.TDigestInfo;
 import com.redis.lettucemod.bloom.TDigestMergeOptions;
 import com.redis.lettucemod.bloom.TopKInfo;
@@ -440,10 +441,10 @@ public Flux<V> ftDictdump(K dict) {
 	public Flux<Value<V>> topKAdd(K key, V... items) {
 		return createDissolvingFlux(() -> bloomCommandBuilder.topKAdd(key, items));
 	}
-
+	
 	@Override
-	public Flux<Value<V>> topKIncrBy(K key, Map<V, Long> increments) {
-		return createDissolvingFlux(() -> bloomCommandBuilder.topKIncrBy(key, increments));
+	public Flux<Value<V>> topKIncrBy(K key, LongScoredValue<V>... itemIncrements) {
+		return createDissolvingFlux(() -> bloomCommandBuilder.topKIncrBy(key, itemIncrements));
 	}
 
 	@Override
@@ -824,10 +825,10 @@ public Mono<String> cfReserve(K key, long capacity, CuckooFilterReserveOptions o
 	public Mono<Long> cmsIncrBy(K key, V item, long increment) {
 		return createMono(() -> bloomCommandBuilder.cmsIncrBy(key, item, increment));
 	}
-
+	
 	@Override
-	public Flux<Long> cmsIncrBy(K key, Map<V, Long> increments) {
-		return createDissolvingFlux(() -> bloomCommandBuilder.cmsIncrBy(key, increments));
+	public Flux<Long> cmsIncrBy(K key, LongScoredValue<V>... itemIncrements) {
+		return createDissolvingFlux(() -> bloomCommandBuilder.cmsIncrBy(key, itemIncrements));
 	}
 
 	@Override
@@ -849,10 +850,10 @@ public Flux<Long> cmsQuery(K key, V... items) {
 	public Mono<String> cmsMerge(K destKey, K... keys) {
 		return createMono(() -> bloomCommandBuilder.cmsMerge(destKey, keys));
 	}
-
+	
 	@Override
-	public Mono<String> cmsMerge(K destKey, Map<K, Long> keyWeightMap) {
-		return createMono(() -> bloomCommandBuilder.cmsMerge(destKey, keyWeightMap));
+	public Mono<String> cmsMerge(K destKey, LongScoredValue<K>... sourceKeyWeights) {
+		return createMono(() -> bloomCommandBuilder.cmsMerge(destKey, sourceKeyWeights));
 	}
 
 	@Override

subprojects/lettucemod/src/main/java/com/redis/lettucemod/api/async/RedisBloomAsyncCommands.java

@@ -10,6 +10,7 @@
 import com.redis.lettucemod.bloom.CuckooFilter;
 import com.redis.lettucemod.bloom.CuckooFilterInsertOptions;
 import com.redis.lettucemod.bloom.CuckooFilterReserveOptions;
+import com.redis.lettucemod.bloom.LongScoredValue;
 import com.redis.lettucemod.bloom.TDigestInfo;
 import com.redis.lettucemod.bloom.TDigestMergeOptions;
 import com.redis.lettucemod.bloom.TopKInfo;
@@ -72,7 +73,7 @@ public interface RedisBloomAsyncCommands<K, V> {
 
 	RedisFuture<Long> cmsIncrBy(K key, V item, long increment);
 
-	RedisFuture<List<Long>> cmsIncrBy(K key, Map<V, Long> increments);
+	RedisFuture<List<Long>> cmsIncrBy(K key, LongScoredValue<V>... itemIncrements);
 
 	RedisFuture<String> cmsInitByProb(K key, double error, double probability);
 
@@ -82,13 +83,13 @@ public interface RedisBloomAsyncCommands<K, V> {
 
 	RedisFuture<String> cmsMerge(K destKey, K... keys);
 
-	RedisFuture<String> cmsMerge(K destKey, Map<K, Long> keyWeightMap);
+	RedisFuture<String> cmsMerge(K destKey, LongScoredValue<K>... sourceKeyWeights);
 
 	RedisFuture<CmsInfo> cmsInfo(K key);
 
 	RedisFuture<List<Value<V>>> topKAdd(K key, V... items);
 
-	RedisFuture<List<Value<V>>> topKIncrBy(K key, Map<V, Long> increments);
+	RedisFuture<List<Value<V>>> topKIncrBy(K key, LongScoredValue<V>... itemIncrements);
 
 	RedisFuture<TopKInfo> topKInfo(K key);
 

subprojects/lettucemod/src/main/java/com/redis/lettucemod/api/reactive/RedisBloomReactiveCommands.java

@@ -1,14 +1,13 @@
 package com.redis.lettucemod.api.reactive;
 
-import java.util.Map;
-
 import com.redis.lettucemod.bloom.BloomFilterInfo;
 import com.redis.lettucemod.bloom.BloomFilterInfoType;
 import com.redis.lettucemod.bloom.BloomFilterInsertOptions;
 import com.redis.lettucemod.bloom.BloomFilterReserveOptions;
 import com.redis.lettucemod.bloom.CuckooFilter;
 import com.redis.lettucemod.bloom.CuckooFilterInsertOptions;
 import com.redis.lettucemod.bloom.CuckooFilterReserveOptions;
+import com.redis.lettucemod.bloom.LongScoredValue;
 import com.redis.lettucemod.bloom.TDigestInfo;
 import com.redis.lettucemod.bloom.TDigestMergeOptions;
 import com.redis.lettucemod.bloom.TopKInfo;
@@ -72,7 +71,7 @@ public interface RedisBloomReactiveCommands<K, V> {
 
 	Mono<Long> cmsIncrBy(K key, V item, long increment);
 
-	Flux<Long> cmsIncrBy(K key, Map<V, Long> increments);
+	Flux<Long> cmsIncrBy(K key, LongScoredValue<V>... itemIncrements);
 
 	Mono<String> cmsInitByProb(K key, double error, double probability);
 
@@ -82,13 +81,13 @@ public interface RedisBloomReactiveCommands<K, V> {
 
 	Mono<String> cmsMerge(K destKey, K... keys);
 
-	Mono<String> cmsMerge(K destKey, Map<K, Long> keyWeightMap);
+	Mono<String> cmsMerge(K destKey, LongScoredValue<K>... sourceKeyWeights);
 
 	Mono<CmsInfo> cmsInfo(K key);
 
 	Flux<Value<V>> topKAdd(K key, V... items);
 
-	Flux<Value<V>> topKIncrBy(K key, Map<V, Long> increments);
+	Flux<Value<V>> topKIncrBy(K key, LongScoredValue<V>... itemIncrements);
 
 	Mono<TopKInfo> topKInfo(K key);
 

subprojects/lettucemod/src/main/java/com/redis/lettucemod/api/sync/RedisBloomCommands.java

@@ -1,7 +1,6 @@
 package com.redis.lettucemod.api.sync;
 
 import java.util.List;
-import java.util.Map;
 
 import com.redis.lettucemod.bloom.BloomFilterInfo;
 import com.redis.lettucemod.bloom.BloomFilterInfoType;
@@ -10,6 +9,7 @@
 import com.redis.lettucemod.bloom.CuckooFilter;
 import com.redis.lettucemod.bloom.CuckooFilterInsertOptions;
 import com.redis.lettucemod.bloom.CuckooFilterReserveOptions;
+import com.redis.lettucemod.bloom.LongScoredValue;
 import com.redis.lettucemod.bloom.TDigestInfo;
 import com.redis.lettucemod.bloom.TDigestMergeOptions;
 import com.redis.lettucemod.bloom.TopKInfo;
@@ -71,7 +71,7 @@ public interface RedisBloomCommands<K, V> {
 
 	Long cmsIncrBy(K key, V item, long increment);
 
-	List<Long> cmsIncrBy(K key, Map<V, Long> increments);
+	List<Long> cmsIncrBy(K key, LongScoredValue<V>... itemIncrements);
 
 	String cmsInitByProb(K key, double error, double probability);
 
@@ -81,13 +81,13 @@ public interface RedisBloomCommands<K, V> {
 
 	String cmsMerge(K destKey, K... keys);
 
-	String cmsMerge(K destKey, Map<K, Long> keyWeightMap);
+	String cmsMerge(K destKey, LongScoredValue<K>... sourceKeyWeights);
 
 	CmsInfo cmsInfo(K key);
 
 	List<Value<V>> topKAdd(K key, V... items);
 
-	List<Value<V>> topKIncrBy(K key, Map<V, Long> increments);
+	List<Value<V>> topKIncrBy(K key, LongScoredValue<V>... itemIncrements);
 
 	TopKInfo topKInfo(K key);
 

subprojects/lettucemod/src/main/java/com/redis/lettucemod/bloom/BloomCommandBuilder.java

@@ -1,7 +1,8 @@
 package com.redis.lettucemod.bloom;
 
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.redis.lettucemod.RedisModulesCommandBuilder;
 import com.redis.lettucemod.cms.CmsInfo;
@@ -234,11 +235,12 @@ public Command<K, V, Long> cmsIncrBy(K key, V item, long increment) {
 		return createCommand(CountMinSketchCommandType.INCRBY, new IntegerOutput<>(codec), args);
 	}
 
-	public Command<K, V, List<Long>> cmsIncrBy(K key, Map<V, Long> increments) {
+	@SuppressWarnings("unchecked")
+	public Command<K, V, List<Long>> cmsIncrBy(K key, LongScoredValue<V>... increments) {
 		CommandArgs<K, V> args = args(key);
-		for (Map.Entry<V, Long> entry : increments.entrySet()) {
-			args.addValue(entry.getKey());
-			args.add(entry.getValue());
+		for (LongScoredValue<V> increment : increments) {
+			args.addValue(increment.getValue());
+			args.add(increment.getScore());
 		}
 		return createCommand(CountMinSketchCommandType.INCRBY, new IntegerListOutput<>(codec), args);
 	}
@@ -265,22 +267,22 @@ public Command<K, V, List<Long>> cmsQuery(K key, V... items) {
 	}
 
 	@SuppressWarnings("unchecked")
-	public Command<K, V, String> cmsMerge(K desKey, K... keys) {
+	public Command<K, V, String> cmsMerge(K desKey, K... sourceKeys) {
+		LettuceAssert.isTrue(sourceKeys.length > 0, "At least one source is required");
 		CommandArgs<K, V> args = args(desKey);
-		args.add(keys.length);
-		args.addKeys(keys);
+		args.add(sourceKeys.length);
+		args.addKeys(sourceKeys);
 		return createCommand(CountMinSketchCommandType.MERGE, new StatusOutput<>(codec), args);
 	}
 
-	public Command<K, V, String> cmsMerge(K destKey, Map<K, Long> keyWeightMap) {
+	@SuppressWarnings("unchecked")
+	public Command<K, V, String> cmsMerge(K destKey, LongScoredValue<K>... weights) {
+		LettuceAssert.isTrue(weights.length > 0, "At least one weight is required");
 		CommandArgs<K, V> args = args(destKey);
-		args.add(keyWeightMap.size());
-		args.addKeys(keyWeightMap.keySet());
+		args.add(weights.length);
+		args.addKeys(Stream.of(weights).map(LongScoredValue::getValue).collect(Collectors.toList()));
 		args.add(BloomCommandKeyword.WEIGHTS);
-		for (Long weight : keyWeightMap.values()) {
-			args.add(weight);
-		}
-
+		Stream.of(weights).map(LongScoredValue::getScore).forEach(args::add);
 		return createCommand(CountMinSketchCommandType.MERGE, new StatusOutput<>(codec), args);
 	}
 
@@ -296,11 +298,13 @@ public Command<K, V, List<Value<V>>> topKAdd(K key, V... items) {
 		return createCommand(TopKCommandType.ADD, new ValueValueListOutput<>(codec), args);
 	}
 
-	public Command<K, V, List<Value<V>>> topKIncrBy(K key, Map<V, Long> increments) {
+	@SuppressWarnings("unchecked")
+	public Command<K, V, List<Value<V>>> topKIncrBy(K key, LongScoredValue<V>... increments) {
+		LettuceAssert.isTrue(increments.length > 0, "At least one increment is required");
 		CommandArgs<K, V> args = args(key);
-		for (Map.Entry<V, Long> entry : increments.entrySet()) {
-			args.addValue(entry.getKey());
-			args.add(entry.getValue());
+		for (LongScoredValue<V> entry : increments) {
+			args.addValue(entry.getValue());
+			args.add(entry.getScore());
 		}
 
 		return createCommand(TopKCommandType.ADD, new ValueValueListOutput<>(codec), args);