double typing cursor and specialization

datastax · clun · Apr 4, 2025 · Nov 21, 2024 · Nov 30, 2024 · Nov 30, 2024
commit acaf500340acb4d58f1d19e54ac8fdc1447e6a1d
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/Table.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/Table.java
@@ -66,6 +66,7 @@
 import com.datastax.astra.internal.utils.Assert;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.hc.core5.http.NotImplementedException;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -557,8 +558,6 @@ private Callable<TableInsertManyResult> getInsertManyResultCallable(List<? exten
     // ---   findOne         ----
     // --------------------------
 
-
-
     public <R> Optional<R> findOne(Filter filter, TableFindOneOptions findOneOptions, Class<R> newRowClass) {
         Command findOne = Command.create("findOne").withFilter(filter);
         if (findOneOptions != null) {
@@ -731,41 +730,18 @@ public Page<T> findPage(Filter filter, TableFindOptions options) {
     // ---   distinct       ----
     // -------------------------
 
-    /**
-     * Gets the distinct values of the specified field name.
-     * The iteration is performed at CLIENT-SIDE and will exhaust all the table elements.
-     *
-     * @param fieldName
-     *      the field name
-     * @param resultClass
-     *      the class to cast any distinct items into.
-     * @param <F>
-     *      the target type of the iterable.
-     * @return
-     *      an iterable of distinct values
+    /*
+
+    Cursor could take a boolean in the constructor to mark the distinct
 
-    public <F> CollectionDistinctIterable<T, F> distinct(String fieldName, Class<F> resultClass) {
-    return distinct(fieldName, null, resultClass);
+    public <R> TableCursor<T, R> distinct(String fieldName, TableFindOptions options, Class<R> resultClass) {
+        throw new UnsupportedOperationException("distinct is not implemented yet");
     }
 
-    /**
-     * Gets the distinct values of the specified field name.
-     *
-     * @param fieldName
-     *      the field name
-     * @param filter
-     *      the query filter
-     * @param resultClass
-     *      the class to cast any distinct items into.
-     * @param <F>
-     *      the target type of the iterable.
-     * @return
-     *      an iterable of distinct values
+    public TableCursor<T, T> distinct(String fieldName, TableFindOptions options) {
+        return distinct(fieldName, null, getRowClass());
+    }*/
 
-    public <F> CollectionDistinctIterable<T, F> distinct(String fieldName, Filter filter, Class<F> resultClass) {
-    return new CollectionDistinctIterable<>(this, fieldName, filter, resultClass);
-    }
-     */
     // -------------------------
     // ---   updateOne      ----
     // -------------------------
@@ -777,11 +753,9 @@ public <F> CollectionDistinctIterable<T, F> distinct(String fieldName, Filter fi
      *      a row describing the query filter, which may not be null.
      * @param update
      *      a row describing the update, which may not be null. The update to apply must include at least one update operator.
-     * @return
-     *      the result of the update one operation
      */
-    public TableUpdateResult updateOne(Filter filter, TableUpdateOperation update) {
-        return updateOne(filter, update, new TableUpdateOneOptions());
+    public void updateOne(Filter filter, TableUpdateOperation update) {
+        updateOne(filter, update, new TableUpdateOneOptions());
     }
 
     /**
@@ -793,46 +767,15 @@ public TableUpdateResult updateOne(Filter filter, TableUpdateOperation update) {
      *      a document describing the update, which may not be null. The update to apply must include at least one update operator.
      * @param updateOptions
      *      the options to apply to the update operation
-     * @return
-     *      the result of the update one operation
      */
-    public TableUpdateResult updateOne(Filter filter, TableUpdateOperation update, TableUpdateOneOptions updateOptions) {
+    public void updateOne(Filter filter, TableUpdateOperation update, TableUpdateOneOptions updateOptions) {
         notNull(update, ARG_UPDATE);
         notNull(updateOptions, ARG_OPTIONS);
         Command cmd = Command
                 .create("updateOne")
                 .withFilter(filter)
-                .withUpdate(update)
-                .withSort(updateOptions.getSortArray())
-                .withOptions(new Document()
-                        .appendIfNotNull(INPUT_UPSERT, updateOptions.upsert())
-                );
-        return getUpdateResult(runCommand(cmd, updateOptions));
-    }
-
-    /**
-     * Update all documents in the collection according to the specified arguments.
-     *
-     * @param apiResponse
-     *       response for the API
-     * @return
-     *      the result of the update many operation
-     */
-    private static TableUpdateResult getUpdateResult(DataAPIResponse apiResponse) {
-        TableUpdateResult result = new TableUpdateResult();
-        DataAPIStatus status = apiResponse.getStatus();
-        if (status != null) {
-            if (status.containsKey(RESULT_MATCHED_COUNT)) {
-                result.setMatchedCount(status.getInteger(RESULT_MATCHED_COUNT));
-            }
-            if (status.containsKey(RESULT_MODIFIED_COUNT)) {
-                result.setModifiedCount(status.getInteger(RESULT_MODIFIED_COUNT));
-            }
-            if (status.containsKey(RESULT_UPSERTED_ID)) {
-                result.setMatchedCount(status.getInteger(RESULT_UPSERTED_ID));
-            }
-        }
-        return result;
+                .withUpdate(update);
+         runCommand(cmd, updateOptions);
     }
 
     // -------------------------

diff --git a/...db-java/src/main/java/com/datastax/astra/client/tables/commands/TableUpdateOperation.java b/...db-java/src/main/java/com/datastax/astra/client/tables/commands/TableUpdateOperation.java
@@ -60,26 +60,24 @@ public TableUpdateOperation(Map<String, Object> obj) {
         this.columnMap.putAll(obj);
     }
 
-    /**
-     * Allow to creat a new instance.
-     *
-     * @return
-     *      a new instance
-     */
-    public static TableUpdateOperation create() {
-        return new TableUpdateOperation();
-    }
-
     /**
      * Builder pattern
      *
-     * @param fieldName
-     *      field name
+     * @param fields
+     *      fields name
      * @return
      *      reference to self
      */
-    public TableUpdateOperation unset(String fieldName) {
-        return update("$unset", fieldName, "");
+    public TableUpdateOperation unset(String... fields) {
+        if (fields != null) {
+            for (String field : fields) {
+                update("$unset", field, "");
+            }
+        }
+        return this;
+    }
+    public TableUpdateOperation unset(String field, Object value) {
+        return update("$unset", field, value);
     }
 
     /**

diff --git a/...rc/main/java/com/datastax/astra/client/tables/commands/options/TableUpdateOneOptions.java b/...rc/main/java/com/datastax/astra/client/tables/commands/options/TableUpdateOneOptions.java
@@ -32,39 +32,12 @@
 
  */
 @Getter @Setter
-@NoArgsConstructor
 @Accessors(fluent = true, chain = true)
 public class TableUpdateOneOptions extends BaseOptions<TableUpdateOneOptions> {
 
     /**
-     * if upsert is selected
+     * Default constructor.
      */
-    private Boolean upsert;
-
-    /**
-     * Order by.
-     */
-    private Sort[] sort;
-
-    /**
-     * Adding this on top of sort(Sort[] s) to allow for a more fluent API.
-     * @param s
-     *      sort options
-     * @return
-     *     current command
-     */
-    public TableUpdateOneOptions sort(Sort... s) {
-        this.sort = s;
-        return this;
-    }
-
-    /**
-     * Get the sort options.
-     *
-     * @return
-     *      sort options
-     */
-    public Sort[] getSortArray() {
-        return sort;
+    public TableUpdateOneOptions() {
     }
 }
diff --git a/astra-db-java/src/test/java/com/datastax/astra/test/integration/local/LocalTableITTest.java b/astra-db-java/src/test/java/com/datastax/astra/test/integration/local/LocalTableITTest.java
@@ -671,7 +671,7 @@ public void should_updateOne() {
         assertThat(table.findOne(johnFilter)).isPresent();
 
         // Update the document
-        TableUpdateResult birthday = table.updateOne(johnFilter, TableUpdateOperation.create()
+        TableUpdateResult birthday = table.updateOne(johnFilter, new TableUpdateOperation()
                 .set("age", 43));
                 //.updateMul(Map.of("price", 1.1d)));
         Assertions.assertThat(birthday.getMatchedCount()).isEqualTo(1);

diff --git a/examples/src/main/java/com/datastax/astra/client/tables/UpdateOne.java b/examples/src/main/java/com/datastax/astra/client/tables/UpdateOne.java
@@ -0,0 +1,61 @@
+package com.datastax.astra.client.tables;
+
+import com.datastax.astra.client.DataAPIClients;
+import com.datastax.astra.client.collections.commands.Update;
+import com.datastax.astra.client.core.query.Filter;
+import com.datastax.astra.client.core.query.Projection;
+import com.datastax.astra.client.core.query.Sort;
+import com.datastax.astra.client.core.vector.DataAPIVector;
+import com.datastax.astra.client.databases.Database;
+import com.datastax.astra.client.tables.commands.TableUpdateOperation;
+import com.datastax.astra.client.tables.commands.options.TableFindOneOptions;
+import com.datastax.astra.client.tables.commands.options.TableUpdateOneOptions;
+import com.datastax.astra.client.tables.commands.results.TableUpdateResult;
+import com.datastax.astra.client.tables.definition.rows.Row;
+import com.datastax.astra.client.tables.mapping.Column;
+import lombok.Data;
+
+import java.util.Optional;
+import java.util.Set;
+
+import static com.datastax.astra.client.core.query.Filters.and;
+import static com.datastax.astra.client.core.query.Filters.eq;
+import static com.datastax.astra.client.core.query.Filters.gt;
+
+public class UpdateOne {
+ public static void main(String[] args) {
+  Database db = DataAPIClients.localDbWithDefaultKeyspace();
+  // Database astraDb = new DataAPIClient(token).getDatabase(endpoint);
+
+  Table<Row> tableRow = db.getTable("games");
+
+  // Update
+  Filter filter = and(
+    eq("match_id", "fight4"),
+    eq("round", 1));
+  new TableUpdateOneOptions()
+    .timeout(1000);
+  tableRow.updateOne(filter, new TableUpdateOperation()
+    .set("winner", "Winona"));
+
+  // Unset 2 columns
+  tableRow.updateOne(filter, new TableUpdateOperation()
+    .set("winner", "Winona"));
+
+  // Set a new value for a column
+  tableRow.updateOne(and(
+    eq("match_id", "fight4"),
+    eq("round", 1)),
+  new TableUpdateOperation().set("winner", "Winona"));
+
+  // Set a new value for a column while unsetting another colum
+  tableRow.updateOne(and(
+    eq("match_id", "fight4"),
+    eq("round", 1)),
+  new TableUpdateOperation()
+    .set("score", 24)
+    .unset("winner")
+    .unset("fighters", Set.of()));
+ }
+
+}