ZUNION/ZINTER commands introduced redis#1450

sokomishalov · Nov 6, 2020 · 905d985 · 905d985
1 parent fe70d44
commit 905d985
Show file tree

Hide file tree

Showing 19 changed files with 1,058 additions and 260 deletions.
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1793,14 +1793,34 @@ public RedisFuture<Double> zincrby(K key, double amount, V member) {
         return dispatch(commandBuilder.zincrby(key, amount, member));
     }
 
+    @Override
+    public RedisFuture<List<V>> zinter(long numkey, K... keys) {
+        return dispatch(commandBuilder.zinter(numkey, keys));
+    }
+
+    @Override
+    public RedisFuture<List<V>> zinter(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        return dispatch(commandBuilder.zinter(numkey, aggregateArgs, keys));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zinterWithScores(long numkey, K... keys) {
+        return dispatch(commandBuilder.zinterWithScores(numkey, keys));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zinterWithScores(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        return dispatch(commandBuilder.zinterWithScores(numkey, aggregateArgs, keys));
+    }
+
     @Override
     public RedisFuture<Long> zinterstore(K destination, K... keys) {
         return dispatch(commandBuilder.zinterstore(destination, keys));
     }
 
     @Override
-    public RedisFuture<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return dispatch(commandBuilder.zinterstore(destination, storeArgs, keys));
+    public RedisFuture<Long> zinterstore(K destination, ZAggregateArgs aggregateArgs, K... keys) {
+        return dispatch(commandBuilder.zinterstore(destination, aggregateArgs, keys));
     }
 
     @Override
@@ -2255,14 +2275,34 @@ public RedisFuture<Double> zscore(K key, V member) {
         return dispatch(commandBuilder.zscore(key, member));
     }
 
+    @Override
+    public RedisFuture<List<V>> zunion(long numkey, K... keys) {
+        return dispatch(commandBuilder.zunion(numkey, keys));
+    }
+
+    @Override
+    public RedisFuture<List<V>> zunion(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        return dispatch(commandBuilder.zunion(numkey, aggregateArgs, keys));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zunionWithScores(long numkey, K... keys) {
+        return dispatch(commandBuilder.zunionWithScores(numkey, keys));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zunionWithScores(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        return dispatch(commandBuilder.zunionWithScores(numkey, aggregateArgs, keys));
+    }
+
     @Override
     public RedisFuture<Long> zunionstore(K destination, K... keys) {
         return dispatch(commandBuilder.zunionstore(destination, keys));
     }
 
     @Override
-    public RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return dispatch(commandBuilder.zunionstore(destination, storeArgs, keys));
+    public RedisFuture<Long> zunionstore(K destination, ZAggregateArgs aggregateArgs, K... keys) {
+        return dispatch(commandBuilder.zunionstore(destination, aggregateArgs, keys));
     }
 
     private byte[] encodeScript(String script) {

diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1866,14 +1866,34 @@ public Mono<Double> zincrby(K key, double amount, V member) {
         return createMono(() -> commandBuilder.zincrby(key, amount, member));
     }
 
+    @Override
+    public Flux<V> zinter(long numkey, K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.zinter(numkey, keys));
+    }
+
+    @Override
+    public Flux<V> zinter(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.zinter(numkey, aggregateArgs, keys));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zinterWithScores(long numkey, K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.zinterWithScores(numkey, keys));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zinterWithScores(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.zinterWithScores(numkey, aggregateArgs, keys));
+    }
+
     @Override
     public Mono<Long> zinterstore(K destination, K... keys) {
         return createMono(() -> commandBuilder.zinterstore(destination, keys));
     }
 
     @Override
-    public Mono<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return createMono(() -> commandBuilder.zinterstore(destination, storeArgs, keys));
+    public Mono<Long> zinterstore(K destination, ZAggregateArgs aggregateArgs, K... keys) {
+        return createMono(() -> commandBuilder.zinterstore(destination, aggregateArgs, keys));
     }
 
     @Override
@@ -2320,14 +2340,34 @@ public Mono<Double> zscore(K key, V member) {
         return createMono(() -> commandBuilder.zscore(key, member));
     }
 
+    @Override
+    public Flux<V> zunion(long numkey, K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.zunion(numkey, keys));
+    }
+
+    @Override
+    public Flux<V> zunion(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.zunion(numkey, aggregateArgs, keys));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zunionWithScores(long numkey, K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.zunionWithScores(numkey, keys));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zunionWithScores(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.zunionWithScores(numkey, aggregateArgs, keys));
+    }
+
     @Override
     public Mono<Long> zunionstore(K destination, K... keys) {
         return createMono(() -> commandBuilder.zunionstore(destination, keys));
     }
 
     @Override
-    public Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return createMono(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
+    public Mono<Long> zunionstore(K destination, ZAggregateArgs aggregateArgs, K... keys) {
+        return createMono(() -> commandBuilder.zunionstore(destination, aggregateArgs, keys));
     }
 
     private byte[] encodeScript(String script) {

diff --git a/src/main/java/io/lettuce/core/CompositeArgument.java b/src/main/java/io/lettuce/core/CompositeArgument.java
@@ -29,7 +29,7 @@
  * @since 5.0
  * @see CommandArgs
  * @see SetArgs
- * @see ZStoreArgs
+ * @see ZAggregateArgs
  * @see GeoArgs
  */
 public interface CompositeArgument {

diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2609,19 +2609,49 @@ Command<K, V, Double> zincrby(K key, double amount, V member) {
         return createCommand(ZINCRBY, new DoubleOutput<>(codec), args);
     }
 
+    Command<K, V, List<V>> zinter(long numkey, K... keys) {
+        notEmpty(keys);
+
+        return zinter(numkey, new ZAggregateArgs(), keys);
+    }
+
+    Command<K, V, List<V>> zinter(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.add(numkey).addKeys(keys);
+        aggregateArgs.build(args);
+        return createCommand(ZINTER, new ValueListOutput<>(codec), args);
+    }
+
+    Command<K, V, List<ScoredValue<V>>> zinterWithScores(long numkey, K... keys) {
+        notEmpty(keys);
+
+        return zinterWithScores(numkey, new ZAggregateArgs(), keys);
+    }
+
+    Command<K, V, List<ScoredValue<V>>> zinterWithScores(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.add(numkey).addKeys(keys).add(WITHSCORES);
+        aggregateArgs.build(args);
+        return createCommand(ZINTER, new ScoredValueListOutput<>(codec), args);
+    }
+
     Command<K, V, Long> zinterstore(K destination, K... keys) {
         notEmpty(keys);
 
-        return zinterstore(destination, new ZStoreArgs(), keys);
+        return zinterstore(destination, new ZAggregateArgs(), keys);
     }
 
-    Command<K, V, Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
+    Command<K, V, Long> zinterstore(K destination, ZAggregateArgs aggregateArgs, K... keys) {
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(storeArgs, "ZStoreArgs " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(aggregateArgs, "ZStoreArgs " + MUST_NOT_BE_NULL);
         notEmpty(keys);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(destination).add(keys.length).addKeys(keys);
-        storeArgs.build(args);
+        aggregateArgs.build(args);
         return createCommand(ZINTERSTORE, new IntegerOutput<>(codec), args);
     }
 
@@ -3230,19 +3260,49 @@ Command<K, V, Double> zscore(K key, V member) {
         return createCommand(ZSCORE, new DoubleOutput<>(codec), key, member);
     }
 
+    Command<K, V, List<V>> zunion(long numkey, K... keys) {
+        notEmpty(keys);
+
+        return zunion(numkey, new ZAggregateArgs(), keys);
+    }
+
+    Command<K, V, List<V>> zunion(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.add(numkey).addKeys(keys);
+        aggregateArgs.build(args);
+        return createCommand(ZUNION, new ValueListOutput<>(codec), args);
+    }
+
+    Command<K, V, List<ScoredValue<V>>> zunionWithScores(long numkey, K... keys) {
+        notEmpty(keys);
+
+        return zunionWithScores(numkey, new ZAggregateArgs(), keys);
+    }
+
+    Command<K, V, List<ScoredValue<V>>> zunionWithScores(long numkey, ZAggregateArgs aggregateArgs, K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.add(numkey).addKeys(keys).add(WITHSCORES);
+        aggregateArgs.build(args);
+        return createCommand(ZUNION, new ScoredValueListOutput<>(codec), args);
+    }
+
     Command<K, V, Long> zunionstore(K destination, K... keys) {
         notEmpty(keys);
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
 
-        return zunionstore(destination, new ZStoreArgs(), keys);
+        return zunionstore(destination, new ZAggregateArgs(), keys);
     }
 
-    Command<K, V, Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
+    Command<K, V, Long> zunionstore(K destination, ZAggregateArgs aggregateArgs, K... keys) {
         notEmpty(keys);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(destination).add(keys.length).addKeys(keys);
-        storeArgs.build(args);
+        aggregateArgs.build(args);
         return createCommand(ZUNIONSTORE, new IntegerOutput<>(codec), args);
     }