Added QueryCondition class and functionality

Author: DimitrisStaratzis

src/main/c/generated/tiledb_wrap.cxx

@@ -1220,6 +1220,27 @@ static tiledb_fragment_info_t* tiledb_fragment_info_tpp_value(tiledb_fragment_in
 }
 
 
+static tiledb_query_condition_t* *new_tiledb_query_condition_tpp() { 
+  return new tiledb_query_condition_t*(); 
+}
+
+static tiledb_query_condition_t* *copy_tiledb_query_condition_tpp(tiledb_query_condition_t* value) { 
+  return new tiledb_query_condition_t*(value); 
+}
+
+static void delete_tiledb_query_condition_tpp(tiledb_query_condition_t* *obj) { 
+  if (obj) delete obj; 
+}
+
+static void tiledb_query_condition_tpp_assign(tiledb_query_condition_t* *obj, tiledb_query_condition_t* value) {
+  *obj = value;
+}
+
+static tiledb_query_condition_t* tiledb_query_condition_tpp_value(tiledb_query_condition_t* *obj) {
+  return *obj;
+}
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -4504,6 +4525,68 @@ SWIGEXPORT jlong JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1fragment_1in
 }
 
 
+SWIGEXPORT jlong JNICALL Java_io_tiledb_libtiledb_tiledbJNI_new_1tiledb_1query_1condition_1tpp(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  tiledb_query_condition_t **result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  result = (tiledb_query_condition_t **)new_tiledb_query_condition_tpp();
+  *(tiledb_query_condition_t ***)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_io_tiledb_libtiledb_tiledbJNI_copy_1tiledb_1query_1condition_1tpp(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jlong jresult = 0 ;
+  tiledb_query_condition_t *arg1 = (tiledb_query_condition_t *) 0 ;
+  tiledb_query_condition_t **result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(tiledb_query_condition_t **)&jarg1; 
+  result = (tiledb_query_condition_t **)copy_tiledb_query_condition_tpp(arg1);
+  *(tiledb_query_condition_t ***)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_io_tiledb_libtiledb_tiledbJNI_delete_1tiledb_1query_1condition_1tpp(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  tiledb_query_condition_t **arg1 = (tiledb_query_condition_t **) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(tiledb_query_condition_t ***)&jarg1; 
+  delete_tiledb_query_condition_tpp(arg1);
+}
+
+
+SWIGEXPORT void JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1condition_1tpp_1assign(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
+  tiledb_query_condition_t **arg1 = (tiledb_query_condition_t **) 0 ;
+  tiledb_query_condition_t *arg2 = (tiledb_query_condition_t *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(tiledb_query_condition_t ***)&jarg1; 
+  arg2 = *(tiledb_query_condition_t **)&jarg2; 
+  tiledb_query_condition_tpp_assign(arg1,arg2);
+}
+
+
+SWIGEXPORT jlong JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1condition_1tpp_1value(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jlong jresult = 0 ;
+  tiledb_query_condition_t **arg1 = (tiledb_query_condition_t **) 0 ;
+  tiledb_query_condition_t *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(tiledb_query_condition_t ***)&jarg1; 
+  result = (tiledb_query_condition_t *)tiledb_query_condition_tpp_value(arg1);
+  *(tiledb_query_condition_t **)&jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1type_1to_1str(JNIEnv *jenv, jclass jcls, jint jarg1, jlong jarg2) {
   jint jresult = 0 ;
   tiledb_query_type_t arg1 ;

src/main/java/io/tiledb/java/api/Condition.java

@@ -1761,8 +1761,19 @@ public String getStats() throws TileDBError {
     return stats;
   }
 
-  public void setCondition(Condition condition) {
-    //    SWIGTYPE_p_p_tiledb_query_condition_t condition_t = tiledb.new_tiledb_quer
+  /**
+   * TODO
+   *
+   * @param queryCondition
+   * @throws TileDBError
+   */
+  public void setCondition(QueryCondition queryCondition) throws TileDBError {
+    SWIGTYPE_p_tiledb_query_condition_t condition_t = queryCondition.getConditionp();
+    try {
+      ctx.handleError(tiledb.tiledb_query_set_condition(ctx.getCtxp(), getQueryp(), condition_t));
+    } catch (TileDBError err) {
+      throw err;
+    }
   }
 
   /**

src/main/java/io/tiledb/java/api/Query.java

@@ -0,0 +1,94 @@
+package io.tiledb.java.api;
+
+import io.tiledb.libtiledb.*;
+import java.math.BigInteger;
+
+public class QueryCondition implements AutoCloseable {
+  private Context ctx;
+  private SWIGTYPE_p_tiledb_query_condition_t conditionp;
+  private SWIGTYPE_p_p_tiledb_query_condition_t conditionpp;
+  private Datatype type;
+
+  protected QueryCondition(Context ctx, SWIGTYPE_p_p_tiledb_query_condition_t conditionpp) {
+    this.ctx = ctx;
+    this.conditionp = tiledb.tiledb_query_condition_tpp_value(conditionpp);
+    this.conditionpp = conditionpp;
+  }
+
+  protected QueryCondition(
+      Context ctx,
+      String attributeName,
+      Object value,
+      Class conditionType,
+      tiledb_query_condition_op_t OP)
+      throws TileDBError {
+    try {
+      if (conditionType != null) {
+        this.type = Types.getNativeType(conditionType);
+      }
+      conditionpp = tiledb.new_tiledb_query_condition_tpp();
+      ctx.handleError(tiledb.tiledb_query_condition_alloc(ctx.getCtxp(), conditionpp));
+      NativeArray array = null;
+      if (value.getClass().isArray()) {
+        array = new NativeArray(ctx, value, this.type.javaClass());
+      } else {
+        if (this.type != null) {
+          int byteSize = this.type.getNativeSize();
+          array = new NativeArray(ctx, byteSize, this.type.javaClass());
+          array.setItem(0, value);
+        }
+      }
+      conditionp = tiledb.tiledb_query_condition_tpp_value(conditionpp);
+      if (this.type == null) {
+        ctx.handleError(
+            tiledb.tiledb_query_condition_init(
+                ctx.getCtxp(), conditionp, attributeName, null, BigInteger.valueOf(4), OP));
+      } else {
+        ctx.handleError(
+            tiledb.tiledb_query_condition_init(
+                ctx.getCtxp(),
+                conditionp,
+                attributeName,
+                array.toVoidPointer(),
+                BigInteger.valueOf(array.getSize()),
+                OP));
+      }
+    } catch (TileDBError err) {
+      tiledb.delete_tiledb_query_condition_tpp(conditionpp);
+      throw err;
+    }
+    this.ctx = ctx;
+  }
+
+  protected SWIGTYPE_p_tiledb_query_condition_t getConditionp() {
+    return this.conditionp;
+  }
+
+  protected Context getCtx() {
+    return this.ctx;
+  }
+
+  public void close() {
+    if (conditionp != null && conditionpp != null) {
+      tiledb.tiledb_query_condition_free(conditionpp);
+      conditionpp = null;
+      conditionp = null;
+    }
+  }
+
+  public QueryCondition combine(QueryCondition con2, tiledb_query_condition_combination_op_t OP)
+      throws TileDBError {
+    SWIGTYPE_p_p_tiledb_query_condition_t combinedCondition;
+    try {
+      combinedCondition = tiledb.new_tiledb_query_condition_tpp();
+      ctx.handleError(tiledb.tiledb_query_condition_alloc(ctx.getCtxp(), conditionpp));
+      ctx.handleError(
+          tiledb.tiledb_query_condition_combine(
+              ctx.getCtxp(), conditionp, con2.getConditionp(), OP, combinedCondition));
+    } catch (TileDBError err) {
+      tiledb.delete_tiledb_query_condition_tpp(conditionpp);
+      throw err;
+    }
+    return new QueryCondition(ctx, combinedCondition);
+  }
+}

src/main/java/io/tiledb/java/api/QueryCondition.java

@@ -317,7 +317,7 @@ private static Path extractLibraryFile(
    */
   private static Path findNativeLibrary(String libraryName, boolean mapLibraryName) {
     String mappedLibraryName = mapLibraryName ? System.mapLibraryName(libraryName) : libraryName;
-    String libDir = LIB_RESOURCE_DIR + "/" + getOSClassifier();
+    String libDir = LIB_RESOURCE_DIR;
     String libPath = libDir + "/" + mappedLibraryName;
 
     boolean hasNativeLib = hasResource(libPath);

src/main/java/io/tiledb/libtiledb/NativeLibLoader.java

@@ -919,6 +919,38 @@ public static SWIGTYPE_p_tiledb_fragment_info_t tiledb_fragment_info_tpp_value(
     return (cPtr == 0) ? null : new SWIGTYPE_p_tiledb_fragment_info_t(cPtr, false);
   }
 
+  public static SWIGTYPE_p_p_tiledb_query_condition_t new_tiledb_query_condition_tpp() {
+    long cPtr = tiledbJNI.new_tiledb_query_condition_tpp();
+    return (cPtr == 0) ? null : new SWIGTYPE_p_p_tiledb_query_condition_t(cPtr, false);
+  }
+
+  public static SWIGTYPE_p_p_tiledb_query_condition_t copy_tiledb_query_condition_tpp(
+      SWIGTYPE_p_tiledb_query_condition_t value) {
+    long cPtr =
+        tiledbJNI.copy_tiledb_query_condition_tpp(
+            SWIGTYPE_p_tiledb_query_condition_t.getCPtr(value));
+    return (cPtr == 0) ? null : new SWIGTYPE_p_p_tiledb_query_condition_t(cPtr, false);
+  }
+
+  public static void delete_tiledb_query_condition_tpp(SWIGTYPE_p_p_tiledb_query_condition_t obj) {
+    tiledbJNI.delete_tiledb_query_condition_tpp(SWIGTYPE_p_p_tiledb_query_condition_t.getCPtr(obj));
+  }
+
+  public static void tiledb_query_condition_tpp_assign(
+      SWIGTYPE_p_p_tiledb_query_condition_t obj, SWIGTYPE_p_tiledb_query_condition_t value) {
+    tiledbJNI.tiledb_query_condition_tpp_assign(
+        SWIGTYPE_p_p_tiledb_query_condition_t.getCPtr(obj),
+        SWIGTYPE_p_tiledb_query_condition_t.getCPtr(value));
+  }
+
+  public static SWIGTYPE_p_tiledb_query_condition_t tiledb_query_condition_tpp_value(
+      SWIGTYPE_p_p_tiledb_query_condition_t obj) {
+    long cPtr =
+        tiledbJNI.tiledb_query_condition_tpp_value(
+            SWIGTYPE_p_p_tiledb_query_condition_t.getCPtr(obj));
+    return (cPtr == 0) ? null : new SWIGTYPE_p_tiledb_query_condition_t(cPtr, false);
+  }
+
   public static int sizeOfInt32() {
     return tiledbJNI.sizeOfInt32();
   }

src/main/java/io/tiledb/libtiledb/tiledb.java

@@ -577,6 +577,16 @@ public static final native void uint64_tArray_setitem(
 
   public static final native long tiledb_fragment_info_tpp_value(long jarg1);
 
+  public static final native long new_tiledb_query_condition_tpp();
+
+  public static final native long copy_tiledb_query_condition_tpp(long jarg1);
+
+  public static final native void delete_tiledb_query_condition_tpp(long jarg1);
+
+  public static final native void tiledb_query_condition_tpp_assign(long jarg1, long jarg2);
+
+  public static final native long tiledb_query_condition_tpp_value(long jarg1);
+
   public static final native int sizeOfInt32();
 
   public static final native int sizeOfInt64();