update list tables

datastax · clun · Apr 4, 2025 · Nov 21, 2024 · Nov 30, 2024 · Nov 30, 2024
commit 43931f96be8fc1e0e811aa9f70ba8c9e32a78374
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/databases/Database.java b/astra-db-java/src/main/java/com/datastax/astra/client/databases/Database.java
@@ -952,6 +952,15 @@ public List<String> listTableNames() {
      * </pre>
      */
     public List<String> listTableNames(ListTablesOptions listTablesOptions) {
+        // Keyspace is part of the database, a new temporary database object is required.
+        if (listTablesOptions != null && Utils.hasLength(listTablesOptions.getKeyspace())) {
+            String otherKeyspace = listTablesOptions.getKeyspace();
+            listTablesOptions.keyspace(null);
+            return new Database(
+                    this.rootEndpoint,
+                    this.options.clone().keyspace(otherKeyspace))
+                    .listTableNames(listTablesOptions);
+        }
         return runCommand(Command.create("listTables"), listTablesOptions)
                 .getStatusKeyAsStringStream("tables")
                 .toList();
@@ -988,6 +997,15 @@ public List<TableDescriptor> listTables() {
      * </pre>
      */
     public List<TableDescriptor> listTables(ListTablesOptions listTableOptions) {
+        // Keyspace is part of the database, a new temporary database object is required.
+        if (listTableOptions != null && Utils.hasLength(listTableOptions.getKeyspace())) {
+            String otherKeyspace = listTableOptions.getKeyspace();
+            listTableOptions.keyspace(null);
+            return new Database(
+                    this.rootEndpoint,
+                    this.options.clone().keyspace(otherKeyspace))
+                    .listTables(listTableOptions);
+        }
         Command findTables = Command
                 .create("listTables")
                 .withOptions(new Document().append("explain", true));
@@ -1044,7 +1062,8 @@ public boolean tableExists(String tableName) {
     public <T> Table<T> getTable(String tableName, Class<T> rowClass, TableOptions tableOptions) {
         hasLength(tableName, "tableName");
         notNull(rowClass, "rowClass");
-        return new Table<>(this, tableName, tableOptions, rowClass);
+        Database db2 = new Database(this.rootEndpoint, this.options.clone());
+        return new Table<>(db2, tableName, tableOptions, rowClass);
     }
 
     /**

diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/databases/DatabaseOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/databases/DatabaseOptions.java
@@ -103,6 +103,7 @@ public String getKeyspace() {
     public DatabaseOptions clone() {
         // Cloning options, token, and serializer
         DatabaseOptions cloned = (DatabaseOptions) super.clone();
+        cloned.token    = token;
         cloned.keyspace = keyspace;
         return cloned;
     }

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
@@ -23,10 +23,9 @@
 import com.datastax.astra.client.collections.commands.options.CollectionFindOptions;
 import com.datastax.astra.client.collections.definition.CollectionDefinition;
 import com.datastax.astra.client.collections.definition.documents.Document;
-import com.datastax.astra.client.core.options.BaseOptions;
 import com.datastax.astra.client.core.commands.Command;
+import com.datastax.astra.client.core.options.BaseOptions;
 import com.datastax.astra.client.core.paging.Page;
-import com.datastax.astra.client.tables.cursor.TableCursor;
 import com.datastax.astra.client.core.query.Filter;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.client.exceptions.DataAPIException;
@@ -48,6 +47,7 @@
 import com.datastax.astra.client.tables.commands.results.TableInsertManyResult;
 import com.datastax.astra.client.tables.commands.results.TableInsertOneResult;
 import com.datastax.astra.client.tables.commands.results.TableUpdateResult;
+import com.datastax.astra.client.tables.cursor.TableCursor;
 import com.datastax.astra.client.tables.definition.TableDefinition;
 import com.datastax.astra.client.tables.definition.TableDescriptor;
 import com.datastax.astra.client.tables.definition.indexes.TableIndexDefinition;
@@ -83,9 +83,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static com.datastax.astra.client.core.DataAPIKeywords.SORT_VECTOR;
 import static com.datastax.astra.client.core.options.DataAPIClientOptions.MAX_CHUNK_SIZE;
 import static com.datastax.astra.client.core.options.DataAPIClientOptions.MAX_COUNT;
-import static com.datastax.astra.client.core.DataAPIKeywords.SORT_VECTOR;
 import static com.datastax.astra.client.exceptions.DataAPIException.ERROR_CODE_INTERRUPTED;
 import static com.datastax.astra.client.exceptions.DataAPIException.ERROR_CODE_TIMEOUT;
 import static com.datastax.astra.internal.utils.AnsiUtils.cyan;
@@ -166,6 +166,12 @@ public Table(Database db, String tableName, TableOptions tableOptions, Class<T>
         this.database  = db;
         this.rowClass  = rowClass;
         this.options.serializer(DEFAULT_TABLE_SERIALIZER);
+        if (tableOptions.getToken() == null) {
+            this.options.token(db.getOptions().getToken());
+        }
+        if (tableOptions.getDataAPIClientOptions() == null) {
+            this.options.dataAPIClientOptions(db.getOptions().getDataAPIClientOptions()).clone();
+        }
         if (tableOptions.getKeyspace() != null) {
             this.database.useKeyspace(tableOptions.getKeyspace());
         }

diff --git a/...va/src/main/java/com/datastax/astra/client/tables/commands/options/ListTablesOptions.java b/...va/src/main/java/com/datastax/astra/client/tables/commands/options/ListTablesOptions.java
@@ -21,13 +21,33 @@
  */
 
 import com.datastax.astra.client.core.options.BaseOptions;
+import com.datastax.astra.client.core.options.DataAPIClientOptions;
 import com.datastax.astra.internal.serdes.tables.RowSerializer;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import static com.datastax.astra.client.core.commands.CommandType.TABLE_ADMIN;
 
+@Setter
+@Accessors(fluent = true, chain = true)
 public class ListTablesOptions extends BaseOptions<ListTablesOptions> {
 
+    /**
+     * The keyspace to use for the database.
+     */
+    String keyspace = DataAPIClientOptions.DEFAULT_KEYSPACE;
+
+
     public ListTablesOptions() {
         super(null, TABLE_ADMIN, new RowSerializer(), null);
     }
+
+    /**
+     * Gets keyspace
+     *
+     * @return value of keyspace
+     */
+    public String getKeyspace() {
+        return keyspace;
+    }
 }
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
@@ -31,6 +31,7 @@
 import com.datastax.astra.internal.api.DataAPIResponse;
 import com.datastax.astra.internal.http.RetryHttpClient;
 import com.datastax.astra.internal.serdes.DataAPISerializer;
+import com.datastax.astra.internal.utils.AnsiUtils;
 import com.datastax.astra.internal.utils.Assert;
 import com.datastax.astra.internal.utils.CompletableFutures;
 import com.evanlennick.retry4j.Status;
@@ -175,6 +176,7 @@ public AbstractCommandRunner(String apiEndpoint, OPTIONS options) {
     @Override
     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();
 
@@ -228,6 +230,9 @@ public DataAPIResponse runCommand(Command command, BaseOptions<?> overridingOpti
         if (overridingOptions != null && overridingOptions.getToken() != null) {
             token = overridingOptions.getToken();
         }
+        if (token == null) {
+            throw new IllegalArgumentException("No token provided for the command");
+        }
 
         // =======================
         // ===   SERIALIZER    ===

diff --git a/astra-db-java/src/main/java/com/datastax/astra/internal/utils/Utils.java b/astra-db-java/src/main/java/com/datastax/astra/internal/utils/Utils.java
@@ -0,0 +1,17 @@
+package com.datastax.astra.internal.utils;
+
+/**
+ * Utility class for internal usage
+ */
+public class Utils {
+
+    /**
+     * Hide contructors for utilities
+     */
+    private Utils() {
+    }
+
+    public static boolean hasLength(String str) {
+        return (null != str && !"".equals(str));
+    }
+}
diff --git a/examples/src/main/java/com/datastax/astra/client/database/ListTables.java b/examples/src/main/java/com/datastax/astra/client/database/ListTables.java
@@ -0,0 +1,36 @@
+package com.datastax.astra.client.database;
+
+import com.datastax.astra.client.DataAPIClients;
+import com.datastax.astra.client.databases.Database;
+import com.datastax.astra.client.tables.Game;
+import com.datastax.astra.client.tables.Table;
+import com.datastax.astra.client.tables.TableOptions;
+import com.datastax.astra.client.tables.commands.options.ListTablesOptions;
+import com.datastax.astra.client.tables.definition.TableDefinition;
+import com.datastax.astra.client.tables.definition.TableDescriptor;
+import com.datastax.astra.client.tables.definition.rows.Row;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+
+public class ListTables {
+
+ public static void main(String[] args) {
+  // Database astraDb =  new DataAPIClient(token).getDatabase(endpoint);
+  Database db =
+    DataAPIClients.localDbWithDefaultKeyspace();
+
+  // Default
+  List<TableDescriptor> tableList = db.listTables();
+
+  // Options
+  db.getDatabaseAdmin().createKeyspace("ks2");
+  ListTablesOptions options = new ListTablesOptions()
+          .keyspace("ks2")
+          .timeout(Duration.ofSeconds(5));
+  List<TableDescriptor> tableList2 = db.listTables(options);
+  Table<Row> ts = db.getTable("table_simple", new TableOptions().keyspace("ks2"));
+  // Expecting an error as table does not exist in ks2
+ }
+}
diff --git a/examples/src/main/java/com/datastax/astra/client/database/ListTablesNames.java b/examples/src/main/java/com/datastax/astra/client/database/ListTablesNames.java
@@ -0,0 +1,32 @@
+package com.datastax.astra.client.database;
+
+import com.datastax.astra.client.DataAPIClients;
+import com.datastax.astra.client.databases.Database;
+import com.datastax.astra.client.tables.Table;
+import com.datastax.astra.client.tables.TableOptions;
+import com.datastax.astra.client.tables.commands.options.ListTablesOptions;
+import com.datastax.astra.client.tables.definition.TableDescriptor;
+import com.datastax.astra.client.tables.definition.rows.Row;
+
+import java.time.Duration;
+import java.util.List;
+
+public class ListTablesNames {
+
+ public static void main(String[] args) {
+  // Database astraDb =  new DataAPIClient(token).getDatabase(endpoint);
+  Database db =
+    DataAPIClients.localDbWithDefaultKeyspace();
+
+  // Default
+  List<String> tableNames = db.listTableNames();
+
+  // Options
+  db.getDatabaseAdmin().createKeyspace("ks2");
+  ListTablesOptions options = new ListTablesOptions()
+          .keyspace("ks2")
+          .timeout(Duration.ofSeconds(5));
+  List<String> tableList2 = db.listTableNames(options);
+
+ }
+}