Adding controls on serializations

clun · clun · commit 15c5e8607dd4 · 2024-12-10T09:29:16.000+01:00
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/core/options/BaseOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/core/options/BaseOptions.java
@@ -301,11 +301,11 @@ public long getTimeout(TimeoutOptions timeoutOptions, CommandType type) {
      */
     public long getRequestTimeout(TimeoutOptions timeoutOptions, CommandType type) {
         return switch (type) {
-            case DATABASE_ADMIN -> timeoutOptions.getDatabaseAdminTimeoutMillis();
-            case KEYSPACE_ADMIN -> timeoutOptions.getKeyspaceAdminTimeoutMillis();
-            case TABLE_ADMIN -> timeoutOptions.getTableAdminTimeoutMillis();
+            case DATABASE_ADMIN ->   timeoutOptions.getDatabaseAdminTimeoutMillis();
+            case KEYSPACE_ADMIN ->   timeoutOptions.getKeyspaceAdminTimeoutMillis();
+            case TABLE_ADMIN ->      timeoutOptions.getTableAdminTimeoutMillis();
             case COLLECTION_ADMIN -> timeoutOptions.getCollectionAdminTimeoutMillis();
-            default -> timeoutOptions.getRequestTimeoutMillis();
+            case GENERAL_METHOD ->   timeoutOptions.getGeneralMethodTimeoutMillis();
         };
     }
 
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/AlterTableAddColumns.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/AlterTableAddColumns.java
@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.tables.definition.columns.ColumnDefinition;
 import com.datastax.astra.client.tables.definition.columns.ColumnDefinitionList;
 import com.datastax.astra.client.tables.definition.columns.ColumnDefinitionMap;
@@ -31,6 +32,8 @@
 
 import java.util.LinkedHashMap;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * Represents an operation to add columns to an existing table in a database schema.
  * This class implements the {@link AlterTableOperation} interface, providing functionality
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/CountRowsOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/CountRowsOptions.java
@@ -20,22 +20,26 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * List Options for a FindOne command.
  */
 @Getter @Setter
 @Accessors(fluent = true, chain = true)
 public class CountRowsOptions extends BaseOptions<CountRowsOptions> {
 
-            /**
-            * Default constructor.
-            */
-            public CountRowsOptions() {
-            }
+ /**
+  * Default constructor.
+  */
+  public CountRowsOptions() {
+      super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
+  }
 }
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/EstimatedCountRowsOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/EstimatedCountRowsOptions.java
@@ -20,12 +20,15 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * List Options for a FindOne command.
  */
@@ -34,8 +37,9 @@
 public class EstimatedCountRowsOptions extends BaseOptions<EstimatedCountRowsOptions> {
 
         /**
-        * Default constructor.
-        */
+         * Default constructor.
+         */
         public EstimatedCountRowsOptions() {
+                super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
         }
 }
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableDeleteManyOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableDeleteManyOptions.java
@@ -20,12 +20,15 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * Options to delete many documents.
  */
@@ -37,5 +40,6 @@ public class TableDeleteManyOptions extends BaseOptions<TableDeleteManyOptions>
      * Default constructor.
      */
     public TableDeleteManyOptions() {
+        super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
     }
 }
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableDeleteOneOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableDeleteOneOptions.java
@@ -20,13 +20,16 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import com.datastax.astra.client.core.query.Sort;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * Options to delete One document.
  */
@@ -37,6 +40,8 @@ public class TableDeleteOneOptions extends BaseOptions<TableDeleteOneOptions> {
     /**
      * Default constructor.
      */
-    public TableDeleteOneOptions() {}
+    public TableDeleteOneOptions() {
+        super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
+    }
 
 }
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableDistinctOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableDistinctOptions.java
@@ -20,12 +20,15 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * Options to delete many documents.
  */
@@ -37,5 +40,6 @@ public class TableDistinctOptions extends BaseOptions<TableDistinctOptions> {
      * Default constructor.
      */
     public TableDistinctOptions() {
+        super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
     }
 }
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableFindOneOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableFindOneOptions.java
@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import com.datastax.astra.client.core.query.Projection;
 import com.datastax.astra.client.core.query.Sort;
@@ -28,6 +29,8 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * List Options for a FindOne command.
  */
@@ -58,7 +61,9 @@ public class TableFindOneOptions extends BaseOptions<TableFindOneOptions> {
     /**
      * Default constructor.
      */
-    public TableFindOneOptions() {}
+    public TableFindOneOptions() {
+        super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
+    }
 
     /**
      * Adding this on top of sort(Sort[] s) to allow for a more fluent API.
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableFindOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableFindOptions.java
@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import com.datastax.astra.client.core.query.Projection;
 import com.datastax.astra.client.core.query.Sort;
@@ -28,6 +29,8 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * List Options for a FindOne command.
  */
@@ -73,7 +76,9 @@ public class TableFindOptions extends BaseOptions<TableFindOptions> {
     /**
      * Default constructor.
      */
-    public TableFindOptions() {}
+    public TableFindOptions() {
+        super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
+    }
 
     /**
      * Add a skip clause in the find block
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableInsertManyOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableInsertManyOptions.java
@@ -20,13 +20,16 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.DataAPIClientOptions;
 import com.datastax.astra.client.core.options.BaseOptions;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * Options for InsertMany
  */
@@ -62,6 +65,8 @@ public class TableInsertManyOptions extends BaseOptions<TableInsertManyOptions>
     /**
      * Default constructor.
      */
-    public TableInsertManyOptions() {}
+    public TableInsertManyOptions() {
+        super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
+    }
 
 }
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableInsertOneOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableInsertOneOptions.java
@@ -20,12 +20,15 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * Options for InsertOne
  */
@@ -37,5 +40,6 @@ public class TableInsertOneOptions extends BaseOptions<TableInsertOneOptions> {
      * Default constructor.
      */
     public TableInsertOneOptions() {
+        super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
     }
 }
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableUpdateOneOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/commands/options/TableUpdateOneOptions.java
@@ -20,13 +20,16 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.BaseOptions;
 import com.datastax.astra.client.core.query.Sort;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import static com.datastax.astra.client.tables.Table.DEFAULT_TABLE_SERIALIZER;
+
 /**
  * Options for the updateOne operation
 
@@ -39,5 +42,6 @@ public class TableUpdateOneOptions extends BaseOptions<TableUpdateOneOptions> {
      * Default constructor.
      */
     public TableUpdateOneOptions() {
+        super(null, CommandType.GENERAL_METHOD, DEFAULT_TABLE_SERIALIZER, null);
     }
 }
diff --git a/astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java b/astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java
@@ -178,6 +178,7 @@ public AbstractCommandRunner(String apiEndpoint, OPTIONS options) {
     public DataAPIResponse runCommand(Command command, BaseOptions<?> overridingOptions) {
 
         log.debug("Running command: " + AnsiUtils.green("{}"), command.getName());
+
         // Initializing options with the Collection/Table/Database level options
         DataAPIClientOptions options = this.options.getDataAPIClientOptions();
 
@@ -191,16 +192,27 @@ public DataAPIResponse runCommand(Command command, BaseOptions<?> overridingOpti
         RetryHttpClient requestHttpClient = httpClient;
 
         // 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();
             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(),
                         overTimeoutOptions != null ? overTimeoutOptions : options.getTimeoutOptions());
             }
+
+            // =======================
+            // ===   Timeouts      ===
+            // =======================
+            if (overTimeoutOptions != null) {
+                requestTimeout = overridingOptions.getRequestTimeout();
+                log.debug("Overriding Timeouts to {}", requestTimeout);
+            }
         }
 
         // ==================
@@ -244,16 +256,7 @@ public DataAPIResponse runCommand(Command command, BaseOptions<?> overridingOpti
             serializer = overridingOptions.getSerializer();
         }
 
-        // =======================
-        // ===   Timeouts      ===
-        // =======================
 
-        long requestTimeout = this.options.getRequestTimeout();
-        if (overridingOptions != null
-              && overridingOptions.getDataAPIClientOptions() != null
-              && overridingOptions.getDataAPIClientOptions().getTimeoutOptions() != null) {
-            requestTimeout = overridingOptions.getRequestTimeout();
-        }
 
         // Initializing the Execution infos (could be pushed to 3rd parties)
         ExecutionInfos.DataApiExecutionInfoBuilder executionInfo =
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
@@ -25,6 +25,7 @@
 import com.datastax.astra.client.tables.commands.options.CreateTableOptions;
 import com.datastax.astra.client.tables.commands.options.CreateVectorIndexOptions;
 import com.datastax.astra.client.tables.commands.options.DropTableIndexOptions;
+import com.datastax.astra.client.tables.commands.options.TableDeleteManyOptions;
 import com.datastax.astra.client.tables.commands.options.TableDeleteOneOptions;
 import com.datastax.astra.client.tables.commands.options.TableFindOneOptions;
 import com.datastax.astra.client.tables.commands.options.TableFindOptions;
@@ -469,14 +470,30 @@ public void should_insert_many() {
     @Test
     public void should_delete_many() {
         Table<TableCompositeRow> t = getDatabase().getTable(TABLE_COMPOSITE, TableCompositeRow.class);
-        t.insertMany(
-                new TableCompositeRow(10, "a", "b"),
-                new TableCompositeRow(20, "a", "b"),
-                new TableCompositeRow(30, "a", "b"));
-
-        t.deleteMany(new Filter()
-                .where("name").isEqualsTo("a")
-                .where("id").isEqualsTo("b"));
+        /*
+        for(int i = 0; i < 1000; i+=10) {
+            t.insertMany(
+                    new TableCompositeRow(i, "a", "b"),
+                    new TableCompositeRow(i+1, "a", "b"),
+                    new TableCompositeRow(i+2, "d", "c"),
+                    new TableCompositeRow(i+3, "f", "c"),
+                    new TableCompositeRow(i+4, "g", "c"),
+                    new TableCompositeRow(i+5, "h", "c"),
+                    new TableCompositeRow(i+6, "j", "c"),
+                    new TableCompositeRow(i+7, "j", "c"),
+                    new TableCompositeRow(i+8, "c", "c"),
+                    new TableCompositeRow(i+9, "a", "b"));
+        }
+*/
+        // Position a retry count at 3 default is 1
+        HttpClientOptions httpClientOptions =  new HttpClientOptions()
+                .retryCount(3)
+                .retryDelay(Duration.ofMillis(100));
+        TableDeleteManyOptions deleteManyOptions = new TableDeleteManyOptions()
+                .httpClientOptions(httpClientOptions)
+                .timeout(Duration.ofMillis(10));
+
+        t.deleteMany(null, deleteManyOptions);
     }
 
     @Test
