Add Support for non string keys

Author: clun

astra-db-java/src/main/java/com/datastax/astra/client/core/query/Filters.java

@@ -26,6 +26,9 @@
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Helper to create Filter
@@ -386,6 +389,12 @@ public static <V> Filter in(final String fieldName, final V... values) {
         return new Filter().where(fieldName).isInArray(values);
     }
 
+    public static <V> Filter in(final V... values) {
+        Filter f = new Filter();
+        f.documentMap.put(FilterOperator.IN.getOperator(), values);
+        return f;
+    }
+
     /**
      * Creates a filter that matches all documents where the value of a field equals any value in the list of specified values.
      *
@@ -525,4 +534,16 @@ public static Filter not(Filter filter) {
         return andFilter;
     }
 
+    public static Filter values(String fieldName, Map<String, Object> values) {
+        Filter valuesFilter = new Filter();
+        Map<String, Map<String, Object>> map = new HashMap<>();
+        map.put("$values", values);
+        valuesFilter.documentMap.put(fieldName, map);
+        return valuesFilter;
+    }
+
+
+
+
+
 }

astra-db-java/src/main/java/com/datastax/astra/client/tables/DataAPIMap.java

@@ -0,0 +1,4 @@
+package com.datastax.astra.client.tables;
+
+public class DataAPIMap {
+}

astra-db-java/src/main/java/com/datastax/astra/client/tables/DataAPIPair.java

@@ -0,0 +1,25 @@
+package com.datastax.astra.client.tables;
+
+import com.datastax.astra.internal.serdes.tables.DataAPIPairSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * Represent a key/value pair.
+ *
+ * @param <K> key type
+ * @param <V> value type
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonSerialize(using = DataAPIPairSerializer.class)
+public class DataAPIPair<K, V> {
+
+    K key;
+
+    V value;
+}

astra-db-java/src/main/java/com/datastax/astra/client/tables/Table.java

@@ -880,7 +880,7 @@ public <R> Page<R> findPage(Filter filter, TableFindOptions options, Class<R> ne
                             .appendIfNotNull("skip", options.skip())
                             .appendIfNotNull("limit", options.limit())
                             .appendIfNotNull(OPTIONS_PAGE_STATE, options.pageState())
-                            .appendIfNotNull(OPTIONS_INCLUDE_SCORES, options.includeSortVector())
+                            .appendIfNotNull(OPTIONS_INCLUDE_SORT_VECTOR, options.includeSortVector())
                             .appendIfNotNull(OPTIONS_INCLUDE_SIMILARITY, options.includeSimilarity()));
         }
         DataAPIResponse apiResponse = runCommand(findCommand, options);

astra-db-java/src/main/java/com/datastax/astra/client/tables/definition/rows/Row.java

@@ -25,6 +25,7 @@
 import com.datastax.astra.client.core.hybrid.Hybrid;
 import com.datastax.astra.client.core.vector.DataAPIVector;
 import com.datastax.astra.client.exceptions.UnexpectedDataAPIResponseException;
+import com.datastax.astra.client.tables.DataAPIPair;
 import com.datastax.astra.client.tables.definition.TableDuration;
 import com.datastax.astra.internal.serdes.DataAPISerializer;
 import com.datastax.astra.internal.serdes.tables.RowSerializer;
@@ -682,6 +683,18 @@ public <T> Row addSet(String key, Set<T> set) {
      * </pre>
      */
     public <K, V> Row addMap(String key, Map<K, V> myMap) {
+        if (!myMap.isEmpty()) {
+            Object firstKey = myMap.keySet().iterator().next();
+            if (firstKey instanceof String) {
+                return add(key, myMap);
+            } else {
+                // Convert to a list of pairs
+                return add(key, myMap.entrySet()
+                        .stream()
+                        .map(e -> new DataAPIPair<>(e.getKey(), e.getValue()))
+                        .toList());
+            }
+        }
         return add(key, myMap);
     }
 

astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java

@@ -199,12 +199,11 @@ public DataAPIResponse runCommand(Command command, BaseOptions<?> overridingOpti
         // Should we override the client to use a different one
         long requestTimeout = this.options.getRequestTimeout();
         if (overridingOptions != null && overridingOptions.getDataAPIClientOptions() != null) {
-            DataAPIClientOptions overClientOptions = overridingOptions.getDataAPIClientOptions();
+            DataAPIClientOptions overClientOptions  = overridingOptions.getDataAPIClientOptions();
             HttpClientOptions overHttpClientOptions = overClientOptions.getHttpClientOptions();
             TimeoutOptions    overTimeoutOptions    = overClientOptions.getTimeoutOptions();
             // User provided specific parameters for the client
             if (overHttpClientOptions != null || overTimeoutOptions != null) {
-                log.debug("Overriding Http Client");
                 // overTimeoutOptions used only for connection timeout
                 requestHttpClient = new RetryHttpClient(
                         overHttpClientOptions != null ? overHttpClientOptions : options.getHttpClientOptions(),
@@ -216,7 +215,6 @@ public DataAPIResponse runCommand(Command command, BaseOptions<?> overridingOpti
             // =======================
             if (overTimeoutOptions != null) {
                 requestTimeout = overridingOptions.getRequestTimeout();
-                log.debug("Overriding Timeouts to {}", requestTimeout);
             }
         }
 

astra-db-java/src/main/java/com/datastax/astra/internal/http/RetryHttpClient.java

@@ -144,7 +144,6 @@ public String getUserAgentHeader() {
      */
     public ApiResponseHttp parseHttpResponse(HttpResponse<String> response) {
         if (response == null) return null;
-
         ApiResponseHttp res = new ApiResponseHttp(response.body(), response.statusCode(),
                     response.headers().map().entrySet()
                             .stream()
@@ -178,7 +177,7 @@ public Status<HttpResponse<String>> executeHttpRequest(HttpRequest req) {
                 .afterFailedTryListener(s -> {
                     log.error("Failure on attempt {}/{} ", s.getTotalTries(), retryConfig.getMaxNumberOfTries());
                     log.error("Failed request {} on {}", req.method() , req.uri().toString() );
-                    log.error("+ Exception was ", s.getLastExceptionThatCausedRetry());
+                    log.error("Exception was ", s.getLastExceptionThatCausedRetry());
                 })
                 .build()
                 .execute(executeRequest);

astra-db-java/src/main/java/com/datastax/astra/internal/serdes/tables/DataAPIPairArrayDeserializerToMap.java

@@ -0,0 +1,75 @@
+package com.datastax.astra.internal.serdes.tables;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
+import com.fasterxml.jackson.databind.type.MapType;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class DataAPIPairArrayDeserializerToMap<K, V>
+        extends JsonDeserializer<Map<K, V>>
+        implements ContextualDeserializer {
+
+    private JavaType keyType;
+    private JavaType valueType;
+
+    public DataAPIPairArrayDeserializerToMap() {
+        // default constructor
+    }
+
+    public DataAPIPairArrayDeserializerToMap(JavaType keyType, JavaType valueType) {
+        this.keyType = keyType;
+        this.valueType = valueType;
+    }
+
+    @Override
+    public Map<K, V> deserialize(JsonParser p, DeserializationContext ctxt)
+            throws IOException {
+        ObjectMapper mapper = (ObjectMapper) p.getCodec();
+        Map<K, V> map = new LinkedHashMap<>();
+
+        if (p.currentToken() == null) p.nextToken();
+        if (p.currentToken() != JsonToken.START_ARRAY) {
+            throw JsonMappingException.from(p, "Expected START_ARRAY for list of pairs");
+        }
+
+        while (p.nextToken() != JsonToken.END_ARRAY) {
+            if (p.currentToken() != JsonToken.START_ARRAY) {
+                throw JsonMappingException.from(p, "Expected START_ARRAY for pair");
+            }
+
+            p.nextToken();
+            K key = mapper.readValue(p, keyType);
+
+            p.nextToken();
+            V value = mapper.readValue(p, valueType);
+
+            map.put(key, value);
+
+            if (p.nextToken() != JsonToken.END_ARRAY) {
+                throw JsonMappingException.from(p, "Expected END_ARRAY after pair");
+            }
+        }
+
+        return map;
+    }
+
+    @Override
+    public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property) {
+        if (property != null) {
+            JavaType type = property.getType(); // Map<K,V>
+            MapType mapType = (MapType) type;
+            return new DataAPIPairArrayDeserializerToMap<>(mapType.getKeyType(), mapType.getContentType());
+        }
+        return this;
+    }
+}

astra-db-java/src/main/java/com/datastax/astra/internal/serdes/tables/DataAPIPairSerializer.java

@@ -0,0 +1,22 @@
+package com.datastax.astra.internal.serdes.tables;
+
+import com.datastax.astra.client.tables.DataAPIPair;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+
+/**
+ * Serialize a pair as an array of two elements.
+ */
+public class DataAPIPairSerializer extends JsonSerializer<DataAPIPair<?, ?>> {
+
+    @Override
+    public void serialize(DataAPIPair<?, ?> pair, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartArray();
+        gen.writeObject(pair.getKey());
+        gen.writeObject(pair.getValue());
+        gen.writeEndArray();
+    }
+}

astra-db-java/src/main/java/com/datastax/astra/internal/serdes/tables/MapToDataApiPairArraySerializer.java

@@ -0,0 +1,25 @@
+package com.datastax.astra.internal.serdes.tables;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class MapToDataApiPairArraySerializer<K, V> extends JsonSerializer<Map<K, V>> {
+
+    @Override
+    public void serialize(Map<K, V> map, JsonGenerator gen, SerializerProvider serializers)
+            throws IOException {
+        gen.writeStartArray();
+        for (Map.Entry<K, V> entry : map.entrySet()) {
+            gen.writeStartArray();
+            serializers.defaultSerializeValue(entry.getKey(), gen);
+            serializers.defaultSerializeValue(entry.getValue(), gen);
+            gen.writeEndArray();
+        }
+        gen.writeEndArray();
+    }
+
+}