Merge pull request #36939 from jmartisk/redis-vector-arguments

Redis vector fields and arguments

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/RedisCommandExtraArguments.java

@@ -8,17 +8,17 @@
 public interface RedisCommandExtraArguments {
 
     /**
-     * @return the list of arguments, encoded as a list of String.
+     * @return the list of arguments.
      */
-    default List<String> toArgs() {
+    default List<Object> toArgs() {
         return toArgs(null);
     }
 
     /**
      * @param encoder an optional encoder to encode some of the values
-     * @return the list of arguments, encoded as a list of String.
+     * @return the list of arguments.
      */
-    default List<String> toArgs(Codec encoder) {
+    default List<Object> toArgs(Codec encoder) {
         return Collections.emptyList();
     }
 

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/SortArgs.java

@@ -131,8 +131,8 @@ public SortArgs get(String get) {
         return this;
     }
 
-    public List<String> toArgs() {
-        List<String> args = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> args = new ArrayList<>();
         if (by != null && !by.isBlank()) {
             args.add("BY");
             args.add(by);

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/autosuggest/GetArgs.java

@@ -47,8 +47,8 @@ public GetArgs withScores() {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> list = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> list = new ArrayList<>();
         if (fuzzy) {
             list.add("FUZZY");
         }

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/bitmap/BitFieldArgs.java

@@ -88,7 +88,7 @@ public String toString() {
 
     }
 
-    private final List<String> commands = new ArrayList<>();
+    private final List<Object> commands = new ArrayList<>();
     private BitFieldType previousBitFieldType;
 
     /**
@@ -351,7 +351,7 @@ private BitFieldType getPreviousFieldType() {
         }
     }
 
-    public List<String> toArgs() {
+    public List<Object> toArgs() {
         return commands;
     }
 

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/bloom/BfInsertArgs.java

@@ -82,8 +82,8 @@ public BfInsertArgs expansion(int expansion) {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> list = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> list = new ArrayList<>();
 
         if (capacity > 0) {
             list.add("CAPACITY");

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/bloom/BfReserveArgs.java

@@ -41,8 +41,8 @@ public BfReserveArgs expansion(int expansion) {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> list = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> list = new ArrayList<>();
         if (expansion > 0) {
             list.add("EXPANSION");
             list.add(Integer.toString(expansion));

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/cuckoo/CfInsertArgs.java

@@ -36,8 +36,8 @@ public CfInsertArgs nocreate() {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> list = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> list = new ArrayList<>();
         if (capacity > 0) {
             list.add("CAPACITY");
             list.add(Long.toString(capacity));

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/cuckoo/CfReserveArgs.java

@@ -51,8 +51,8 @@ public CfReserveArgs expansion(int expansion) {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> list = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> list = new ArrayList<>();
         if (bucketSize > 0) {
             list.add("BUCKETSIZE");
             list.add(Long.toString(bucketSize));

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoAddArgs.java

@@ -42,11 +42,11 @@ public GeoAddArgs ch() {
         return this;
     }
 
-    public List<String> toArgs() {
+    public List<Object> toArgs() {
         if (xx && nx) {
             throw new IllegalArgumentException("Cannot set XX and NX together");
         }
-        List<String> args = new ArrayList<>();
+        List<Object> args = new ArrayList<>();
         if (xx) {
             args.add("XX");
         }

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoRadiusArgs.java

@@ -101,13 +101,13 @@ public GeoRadiusArgs any() {
     }
 
     @Override
-    public List<String> toArgs() {
+    public List<Object> toArgs() {
         // Validation
         if (any && count == -1) {
             throw new IllegalArgumentException("ANY can only be used if COUNT is also set");
         }
 
-        List<String> list = new ArrayList<>();
+        List<Object> list = new ArrayList<>();
         if (withDistance) {
             list.add("WITHDIST");
         }

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoRadiusStoreArgs.java

@@ -127,7 +127,7 @@ public GeoRadiusStoreArgs<K> storeDistKey(K storeDistKey) {
     }
 
     @Override
-    public List<String> toArgs(Codec codec) {
+    public List<Object> toArgs(Codec codec) {
         // Validation
         if (any && count == -1) {
             throw new IllegalArgumentException("ANY can only be used if COUNT is also set");
@@ -136,7 +136,7 @@ public List<String> toArgs(Codec codec) {
             throw new IllegalArgumentException("At least `STORE` or `STOREDIST` must be set");
         }
 
-        List<String> list = new ArrayList<>();
+        List<Object> list = new ArrayList<>();
         if (withDistance) {
             list.add("WITHDIST");
         }

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoSearchArgs.java

@@ -184,7 +184,7 @@ public GeoSearchArgs<V> any() {
     }
 
     @Override
-    public List<String> toArgs(Codec codec) {
+    public List<Object> toArgs(Codec codec) {
         // Validation
         if (any && count == -1) {
             throw new IllegalArgumentException("ANY can only be used if COUNT is also set");
@@ -198,7 +198,7 @@ public List<String> toArgs(Codec codec) {
             throw new IllegalArgumentException("FROMMEMBER and FROMLONLAT cannot be used together");
         }
 
-        List<String> list = new ArrayList<>();
+        List<Object> list = new ArrayList<>();
         if (member != null) {
             list.add("FROMMEMBER");
             list.add(new String(codec.encode(member), StandardCharsets.UTF_8));
@@ -249,7 +249,7 @@ public boolean hasCoordinates() {
         return withCoordinates;
     }
 
-    private void putFlag(List<String> list, boolean flag, String value) {
+    private void putFlag(List<Object> list, boolean flag, String value) {
         if (flag) {
             list.add(value);
         }

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoSearchStoreArgs.java

@@ -146,7 +146,7 @@ public GeoSearchStoreArgs<V> any() {
     }
 
     @Override
-    public List<String> toArgs(Codec codec) {
+    public List<Object> toArgs(Codec codec) {
         // Validation
         if (any && count == -1) {
             throw new IllegalArgumentException("ANY can only be used if COUNT is also set");
@@ -160,7 +160,7 @@ public List<String> toArgs(Codec codec) {
             throw new IllegalArgumentException("FROMMEMBER and FROMLONLAT cannot be used together");
         }
 
-        List<String> list = new ArrayList<>();
+        List<Object> list = new ArrayList<>();
         if (member != null) {
             list.add("FROMMEMBER");
             list.add(new String(codec.encode(member), StandardCharsets.UTF_8));

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/json/JsonSetArgs.java

@@ -31,11 +31,11 @@ public JsonSetArgs xx() {
     }
 
     @Override
-    public List<String> toArgs() {
+    public List<Object> toArgs() {
         if (xx && nx) {
             throw new IllegalArgumentException("Cannot set XX and NX together");
         }
-        List<String> args = new ArrayList<>();
+        List<Object> args = new ArrayList<>();
         if (xx) {
             args.add("XX");
         }

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/keys/CopyArgs.java

@@ -37,8 +37,8 @@ public CopyArgs replace(boolean replace) {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> args = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> args = new ArrayList<>();
         if (destinationDb != -1) {
             args.add("DB");
             args.add(Long.toString(destinationDb));

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/keys/ExpireArgs.java

@@ -55,8 +55,8 @@ public ExpireArgs gt() {
         return this;
     }
 
-    public List<String> toArgs() {
-        List<String> args = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> args = new ArrayList<>();
 
         boolean exclusion = false;
         if (nx) {

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/list/LPosArgs.java

@@ -40,8 +40,8 @@ public LPosArgs maxlen(long max) {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> list = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> list = new ArrayList<>();
         if (rank != 0) {
             list.add("RANK");
             list.add(Long.toString(rank));

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/search/AggregateArgs.java

@@ -242,8 +242,8 @@ public AggregateArgs cursorMaxIdleTime(Duration maxIdleDuration) {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> list = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> list = new ArrayList<>();
         if (verbatim) {
             list.add("VERBATIM");
         }

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/search/CreateArgs.java

@@ -288,8 +288,8 @@ public CreateArgs indexedField(String field, String alias, FieldType type) {
     }
 
     @Override
-    public List<String> toArgs() {
-        List<String> list = new ArrayList<>();
+    public List<Object> toArgs() {
+        List<Object> list = new ArrayList<>();
 
         if (onHash) {
             if (onJson) {

extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/search/DistanceMetric.java

@@ -0,0 +1,10 @@
+package io.quarkus.redis.datasource.search;
+
+/**
+ * Metric for computing the distance between two vectors.
+ */
+public enum DistanceMetric {
+    L2,
+    IP,
+    COSINE
+}