improvements in the SQL API

Author: DimitrisStaratzis

src/main/java/examples/Examples.java

@@ -1,13 +1,12 @@
 package examples;
 
 // Import classes:
-import io.tiledb.cloud.TileDBClient;
-import io.tiledb.cloud.TileDBUDF;
+import io.tiledb.cloud.*;
 import io.tiledb.cloud.rest_api.ApiException;
-import io.tiledb.cloud.TileDBLogin;
 import io.tiledb.cloud.rest_api.api.GroupsApi;
 import io.tiledb.cloud.rest_api.api.ArrayApi;
 import io.tiledb.cloud.rest_api.model.*;
+import org.apache.arrow.vector.ValueVector;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -46,6 +45,23 @@ public static void main(String[] args) {
 //        listGroups(tileDBClient);
 //        deleteArray(tileDBClient);
 //        deregisterArray(tileDBClient);
+//        runSQL(tileDBClient);
+//        runSQLArrow(tileDBClient);
+
+    }
+
+    private static void runSQL(TileDBClient tileDBClient) {
+        SQLParameters sqlParameters = new SQLParameters();
+        sqlParameters.setQuery("SELECT * FROM `tiledb://TileDB-Inc/quickstart_sparse`");
+        TileDBSQL tileDBSQL = new TileDBSQL(tileDBClient, "TileDB-Inc", sqlParameters);
+        System.out.println(tileDBSQL.exec());
+    }
+
+    private static void runSQLArrow(TileDBClient tileDBClient) {
+        SQLParameters sqlParameters = new SQLParameters();
+        sqlParameters.setQuery("SELECT * FROM `tiledb://TileDB-Inc/quickstart_sparse`");
+        TileDBSQL tileDBSQL = new TileDBSQL(tileDBClient, "TileDB-Inc", sqlParameters);
+        Pair<ArrayList<ValueVector>, Integer> a = tileDBSQL.execArrow();
     }
 
     /**

src/main/java/io/tiledb/cloud/TileDBSQL.java

@@ -2,6 +2,7 @@
 
 import io.tiledb.cloud.rest_api.ApiException;
 import io.tiledb.cloud.rest_api.api.SqlApi;
+import io.tiledb.cloud.rest_api.model.ResultFormat;
 import io.tiledb.cloud.rest_api.model.SQLParameters;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.UnsafeAllocationManager;
@@ -56,7 +57,11 @@ public TileDBSQL(TileDBClient tileDBClient, String namespace, SQLParameters sql)
      */
     public Pair<ArrayList<ValueVector>, Integer> execArrow(){
         try {
-            assert sql.getResultFormat() != null;
+            if (sql.getResultFormat() != ResultFormat.ARROW && sql.getResultFormat() != null){
+                throw new ApiException("The ResultFormat you specified is not 'ARROW'. Since you are calling " +
+                        "'execArrow()' you can not specify a different ResultFormat. ");
+            }
+            sql.setResultFormat(ResultFormat.ARROW);
             byte[] bytes =  apiInstance.runSQLBytes(namespace, sql, "none");
             ArrayList<ValueVector> valueVectors = null;
             int readBatchesCount = 0;
@@ -95,8 +100,11 @@ public Pair<ArrayList<ValueVector>, Integer> execArrow(){
      */
     public List<Object> exec(){
         try {
-            assert sql.getResultFormat() != null;
-            return apiInstance.runSQL(namespace, sql, sql.getResultFormat().toString());
+            if (sql.getResultFormat() == null ){
+                return apiInstance.runSQL(namespace, sql, ResultFormat.TILEDB_JSON.toString());
+            } else {
+                return apiInstance.runSQL(namespace, sql, sql.getResultFormat().toString());
+            }
         } catch (ApiException e) {
             System.err.println("Exception when calling SqlApi#runSQL/runSQLBytes");
             System.err.println("Status code: " + e.getCode());