deal with arrays with the same name in BI tools

Author: DimitrisStaratzis

build.gradle

@@ -28,7 +28,7 @@ apply plugin: 'project-report'
 
 
 group 'io.tiledb'
-version '0.3.3-SNAPSHOT'
+version '0.3.4-SNAPSHOT'
 
 repositories {
     mavenCentral()

src/main/java/io/tiledb/TileDBCloudColumnsResultSet.java

@@ -6,6 +6,7 @@
 import io.tiledb.cloud.rest_api.ApiException;
 import io.tiledb.cloud.rest_api.api.ArrayApi;
 import io.tiledb.cloud.rest_api.model.*;
+import io.tiledb.util.Util;
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
@@ -31,11 +32,11 @@ public class TileDBCloudColumnsResultSet implements ResultSet {
 
   public TileDBCloudColumnsResultSet(String completeURI, ArrayApi arrayApi) {
     this.columnCounter = -1;
-    // the complete URI contains both the name and the UUID
+    // the complete URI contains both the name and the short-UUID
     this.completeURI = completeURI;
     this.nullable = columnNoNulls;
-
-    String[] split = completeURI.split("/");
+    String withoutUUID = Util.removeUUID(completeURI);
+    String[] split = withoutUUID.split("/");
     String arrayUUIDClean = split[split.length - 1];
     String arrayNamespaceClean = split[split.length - 2];
 

src/main/java/io/tiledb/TileDBCloudStatement.java

@@ -6,6 +6,7 @@
 import io.tiledb.cloud.rest_api.model.ResultFormat;
 import io.tiledb.cloud.rest_api.model.SQLParameters;
 import io.tiledb.java.api.Pair;
+import io.tiledb.util.Util;
 import java.sql.*;
 import java.util.ArrayList;
 import org.apache.arrow.vector.ValueVector;
@@ -38,7 +39,8 @@ public class TileDBCloudStatement implements Statement {
   public ResultSet executeQuery(String s) throws SQLException {
     // create SQL parameters
     SQLParameters sqlParameters = new SQLParameters();
-    sqlParameters.setQuery(s);
+    String query = Util.useTileDBUris(s);
+    sqlParameters.setQuery(query);
     // get results in arrow format
     sqlParameters.setResultFormat(ResultFormat.ARROW);
 

src/main/java/io/tiledb/TileDBCloudTablesResultSet.java

@@ -13,6 +13,7 @@
 import java.util.logging.Logger;
 
 public class TileDBCloudTablesResultSet implements ResultSet {
+  public static HashMap<String, String> uris = new HashMap<>();
   private List<ArrayInfo> arraysOwned = new ArrayList<ArrayInfo>();
   private List<ArrayInfo> arraysShared = new ArrayList<ArrayInfo>();
   private List<ArrayInfo> arraysPublic = new ArrayList<ArrayInfo>();
@@ -37,6 +38,31 @@ public TileDBCloudTablesResultSet(
 
     this.numberOfArrays =
         this.arraysOwned.size() + this.arraysShared.size() + this.arraysPublic.size();
+    populateURIs();
+  }
+
+  private void populateURIs() {
+
+    // Iterate through arraysOwned and add entries to the HashMap
+    for (ArrayInfo arrayInfo : arraysOwned) {
+      String key = Util.getUUIDStart(arrayInfo.getTiledbUri());
+      String value = arrayInfo.getTiledbUri();
+      uris.put(key, value);
+    }
+
+    // Iterate through arraysShared and add entries to the HashMap
+    for (ArrayInfo arrayInfo : arraysShared) {
+      String key = Util.getUUIDStart(arrayInfo.getTiledbUri());
+      String value = arrayInfo.getTiledbUri();
+      uris.put(key, value);
+    }
+
+    // Iterate through arraysPublic and add entries to the HashMap
+    for (ArrayInfo arrayInfo : arraysPublic) {
+      String key = Util.getUUIDStart(arrayInfo.getTiledbUri());
+      String value = arrayInfo.getTiledbUri();
+      uris.put(key, value);
+    }
   }
 
   public TileDBCloudTablesResultSet() {
@@ -78,7 +104,13 @@ public boolean wasNull() throws SQLException {
 
   @Override
   public String getString(int columnIndex) throws SQLException {
-    return "tiledb://" + currentArray.getNamespace() + "/" + currentArray.getName();
+    return "[tiledb://"
+        + currentArray.getNamespace()
+        + "/"
+        + currentArray.getName()
+        + "]["
+        + Util.getUUIDStart(currentArray.getTiledbUri())
+        + "]";
   }
 
   @Override
@@ -176,7 +208,13 @@ public String getString(String columnLabel) throws SQLException {
 
     switch (columnLabel) {
       case "TABLE_NAME":
-        return "tiledb://" + currentArray.getNamespace() + "/" + currentArray.getName();
+        return "[tiledb://"
+            + currentArray.getNamespace()
+            + "/"
+            + currentArray.getName()
+            + "]["
+            + Util.getUUIDStart(currentArray.getTiledbUri())
+            + "]";
       case "REMARKS":
         return ownership + " TileDB URI: " + currentArray.getTiledbUri();
       case "TABLE_TYPE":

src/main/java/io/tiledb/util/Util.java

@@ -1,5 +1,6 @@
 package io.tiledb.util;
 
+import io.tiledb.TileDBCloudTablesResultSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -15,41 +16,71 @@ public class Util {
   public static String SCHEMA_NAME = "All TileDB arrays";
 
   /**
-   * Replaces all array names with the corresponding UUID if the input string is of a specific
-   * pattern
+   * Takes as input a complete query that might or might not contain references to arrays of the
+   * form [tiledb://../..][a09uhugr] and returns a query in which all these references which are
+   * specific to this JDBC driver are translated to queries that contain the tiledbURis. This method
+   * is mainly used when the query is created by a BI tool rather than a pure Java user. BI tools
+   * display the arrays and when selected use their names to query them. Since the array names are
+   * not unique in TileDB-Cloud we display the names accompanied with one small part of the original
+   * UUID. We then map this UUID to the tileDBURI and modify the query so that it only uses
+   * tileDBURIs. If no array references of the above-mentioned form are found the query is returned
+   * intact.
    *
-   * @param completeURI If the input string is of the form "tiledb://TileDB-Inc/orders ~
-   *     tiledb://TileDB-Inc/120f0518-dd8d-467f-8c1b-23aa49929465" this method will modify the input
-   *     string to only use the TileDB URI with the UUID. If an input string does not match the
-   *     regex pattern specified in the Pattern.compile method, the Matcher will not find any
-   *     matches, and the code will simply return the original input string as it is without making
-   *     any modifications.
+   * @param query The complete query
    * @return
    */
-  public static String replaceArrayNamesWithUUIDs(String completeURI) {
-    // Define the regular expression pattern for the TileDB URI pattern with spaces around "~"
-    String regex = "(tiledb://[^~]+) ~ ([^\\s]+)";
-    Pattern pattern = Pattern.compile(regex);
+  public static String useTileDBUris(String query) {
+    // Regular expression pattern to match the specified format
+    Pattern pattern = Pattern.compile("\\[tiledb://([^/]+)/([^\\]]+)\\]\\[(\\w+)\\]");
 
-    Matcher matcher = pattern.matcher(completeURI);
-    StringBuilder modifiedText = new StringBuilder();
+    // Matcher to find and replace occurrences of the pattern in the input string
+    Matcher matcher = pattern.matcher(query);
 
-    // Find and remove the first part in TileDB URIs
-    int lastEnd = 0;
-    while (matcher.find()) {
-      // Append the text before the match and a space
-      modifiedText.append(completeURI.substring(lastEnd, matcher.start(1)));
+    // StringBuffer to hold the modified input string
+    StringBuffer result = new StringBuffer();
 
-      // Append the text after "~" and a space
-      modifiedText.append(matcher.group(2));
+    // Find and replace occurrences of the pattern in the input string
+    while (matcher.find()) {
+      String key = matcher.group(3);
 
-      // Update the lastEnd to the end of this match
-      lastEnd = matcher.end();
+      String replacement =
+          TileDBCloudTablesResultSet.uris.getOrDefault(key, ""); // Get replacement from the map
+      if (!replacement.equals(""))
+        matcher.appendReplacement(
+            result, replacement); // Replace the match with the corresponding value
     }
+    matcher.appendTail(result); // Append the remaining part of the input string
+    // Output the modified string
+    return result.toString();
+  }
 
-    // Append any remaining text after the last match
-    modifiedText.append(completeURI.substring(lastEnd));
+  /**
+   * Takes as input a TileDBURI and returns the first 8 characters of the UUID.
+   *
+   * @param tiledbUri the TileDBURI
+   * @return the first 8 chars of the UUID
+   */
+  public static String getUUIDStart(String tiledbUri) {
+    // Split the input URI by '/'
+    String[] uriParts = tiledbUri.split("/");
 
-    return modifiedText.toString().trim();
+    // Extract the desired string and return its first 8 characters
+    String targetString = uriParts[3];
+    return targetString.substring(0, Math.min(targetString.length(), 8));
+  }
+
+  public static String removeUUID(String arrayName) {
+    // Regular expression pattern to match the specified format
+    Pattern pattern = Pattern.compile("\\[tiledb://([^\\]]+)\\].*");
+
+    // Matcher to find the pattern in the input string
+    Matcher matcher = pattern.matcher(arrayName);
+
+    // Check if the pattern is found and extract the desired part
+    if (matcher.matches()) {
+      return "tiledb://" + matcher.group(1);
+    } else {
+      return arrayName;
+    }
   }
 }