Moved NIO functions to tiledb_custom.cxx bindings

Author: gsvic

src/main/c/custom/tiledb_custom.cxx

@@ -1132,6 +1132,86 @@ extern "C" {
     return jresult;
   }
 
+  SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1subarray_1nio(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jobject jarg3) {
+    void* buffer = (void *)jenv->GetDirectBufferAddress(jarg3);
+
+    jint jresult = 0 ;
+    tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;
+    tiledb_query_t *arg2 = (tiledb_query_t *) 0 ;
+    void *arg3 = (void *) 0 ;
+    int32_t result;
+
+    (void)jenv;
+    (void)jcls;
+    arg1 = *(tiledb_ctx_t **)&jarg1;
+    arg2 = *(tiledb_query_t **)&jarg2;
+    arg3 = *(void **)&jarg3;
+    result = (int32_t)tiledb_query_set_subarray(arg1,arg2,buffer);
+    jresult = (jint)result;
+    return jresult;
+  }
+
+  SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1buffer_1nio(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jobject jarg4, jlong jarg5) {
+    void* buffer = (void *)jenv->GetDirectBufferAddress(jarg4);
+
+    jint jresult = 0 ;
+    tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;
+    tiledb_query_t *arg2 = (tiledb_query_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    void *arg4 = (void *) 0 ;
+    uint64_t *arg5 = (uint64_t *) 0 ;
+    int32_t result;
+
+    (void)jenv;
+    (void)jcls;
+    arg1 = *(tiledb_ctx_t **)&jarg1;
+    arg2 = *(tiledb_query_t **)&jarg2;
+    arg3 = 0;
+    if (jarg3) {
+      arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
+      if (!arg3) return 0;
+    }
+    arg4 = *(void **)&jarg4;
+    arg5 = *(uint64_t **)&jarg5;
+    result = (int32_t)tiledb_query_set_buffer(arg1,arg2,(char const *)arg3, buffer,arg5);
+    jresult = (jint)result;
+    if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
+    return jresult;
+  }
+
+  SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1buffer_1var_1nio(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jobject jarg4, jlong jarg5, jobject jarg6, jlong jarg7) {
+    void* offsets = (void *)jenv->GetDirectBufferAddress(jarg4);
+    void* buffer = (void *)jenv->GetDirectBufferAddress(jarg6);
+
+    jint jresult = 0 ;
+    tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;
+    tiledb_query_t *arg2 = (tiledb_query_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    uint64_t *arg4 = (uint64_t *) 0 ;
+    uint64_t *arg5 = (uint64_t *) 0 ;
+    void *arg6 = (void *) 0 ;
+    uint64_t *arg7 = (uint64_t *) 0 ;
+    int32_t result;
+
+    (void)jenv;
+    (void)jcls;
+    arg1 = *(tiledb_ctx_t **)&jarg1;
+    arg2 = *(tiledb_query_t **)&jarg2;
+    arg3 = 0;
+    if (jarg3) {
+      arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
+      if (!arg3) return 0;
+    }
+    arg4 = *(uint64_t **)&jarg4;
+    arg5 = *(uint64_t **)&jarg5;
+    arg6 = *(void **)&jarg6;
+    arg7 = *(uint64_t **)&jarg7;
+    result = (int32_t)tiledb_query_set_buffer_var(arg1,arg2,(char const *)arg3,(uint64_t *)offsets,arg5,buffer,arg7);
+    jresult = (jint)result;
+    if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
+    return jresult;
+  }
+
 
 #ifdef __cplusplus
 }

src/main/c/generated/tiledb_wrap.cxx

@@ -7108,24 +7108,6 @@ SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1s
   return jresult;
 }
 
-SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1subarray_1nio(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jobject jarg3) {
-  void* buffer = (void *)jenv->GetDirectBufferAddress(jarg3);
-
-  jint jresult = 0 ;
-  tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;
-  tiledb_query_t *arg2 = (tiledb_query_t *) 0 ;
-  void *arg3 = (void *) 0 ;
-  int32_t result;
-
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(tiledb_ctx_t **)&jarg1;
-  arg2 = *(tiledb_query_t **)&jarg2;
-  arg3 = *(void **)&jarg3;
-  result = (int32_t)tiledb_query_set_subarray(arg1,arg2,buffer);
-  jresult = (jint)result;
-  return jresult;
-}
 
 SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1buffer(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jlong jarg4, jlong jarg5) {
   jint jresult = 0 ;
@@ -7184,33 +7166,6 @@ SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1b
   return jresult;
 }
 
-SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1buffer_1nio(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jobject jarg4, jlong jarg5) {
-  void* buffer = (void *)jenv->GetDirectBufferAddress(jarg4);
-
-  jint jresult = 0 ;
-  tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;
-  tiledb_query_t *arg2 = (tiledb_query_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  void *arg4 = (void *) 0 ;
-  uint64_t *arg5 = (uint64_t *) 0 ;
-  int32_t result;
-
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(tiledb_ctx_t **)&jarg1;
-  arg2 = *(tiledb_query_t **)&jarg2;
-  arg3 = 0;
-  if (jarg3) {
-    arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
-    if (!arg3) return 0;
-  }
-  arg4 = *(void **)&jarg4;
-  arg5 = *(uint64_t **)&jarg5;
-  result = (int32_t)tiledb_query_set_buffer(arg1,arg2,(char const *)arg3, buffer,arg5);
-  jresult = (jint)result;
-  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
-  return jresult;
-}
 
 SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1buffer_1nullable(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jlong jarg4, jlong jarg5, jlong jarg6, jlong jarg7) {
   jint jresult = 0 ;
@@ -7304,38 +7259,6 @@ SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1get_1b
   return jresult;
 }
 
-SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1buffer_1var_1nio(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jobject jarg4, jlong jarg5, jobject jarg6, jlong jarg7) {
-  void* offsets = (void *)jenv->GetDirectBufferAddress(jarg4);
-  void* buffer = (void *)jenv->GetDirectBufferAddress(jarg6);
-
-  jint jresult = 0 ;
-  tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;
-  tiledb_query_t *arg2 = (tiledb_query_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  uint64_t *arg4 = (uint64_t *) 0 ;
-  uint64_t *arg5 = (uint64_t *) 0 ;
-  void *arg6 = (void *) 0 ;
-  uint64_t *arg7 = (uint64_t *) 0 ;
-  int32_t result;
-
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(tiledb_ctx_t **)&jarg1;
-  arg2 = *(tiledb_query_t **)&jarg2;
-  arg3 = 0;
-  if (jarg3) {
-    arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
-    if (!arg3) return 0;
-  }
-  arg4 = *(uint64_t **)&jarg4;
-  arg5 = *(uint64_t **)&jarg5;
-  arg6 = *(void **)&jarg6;
-  arg7 = *(uint64_t **)&jarg7;
-  result = (int32_t)tiledb_query_set_buffer_var(arg1,arg2,(char const *)arg3,(uint64_t *)offsets,arg5,buffer,arg7);
-  jresult = (jint)result;
-  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
-  return jresult;
-}
 
 SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1get_1buffer_1var(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jlong jarg4, jlong jarg5, jlong jarg6, jlong jarg7) {
   jint jresult = 0 ;

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

@@ -198,7 +198,7 @@ public synchronized Query setSubarray(NativeArray subarray) throws TileDBError {
    * @exception TileDBError A TileDB exception
    */
   public synchronized Query setSubarray(ByteBuffer subarray) throws TileDBError {
-    ctx.handleError(tiledb.tiledb_query_set_subarray_nio(ctx.getCtxp(), queryp, subarray));
+    ctx.handleError(Utils.tiledb_query_set_subarray_nio(ctx.getCtxp(), queryp, subarray));
     return this;
   }
 
@@ -740,7 +740,7 @@ public synchronized Query setBuffer(String attr, ByteBuffer buffer) throws TileD
     buffer_sizes_.put(attr, new Pair<>(offsets_array_size, values_array_size));
 
     ctx.handleError(
-        tiledb.tiledb_query_set_buffer_nio(
+        Utils.tiledb_query_set_buffer_nio(
             ctx.getCtxp(), queryp, attr, buffer, values_array_size.cast()));
 
     return this;
@@ -863,7 +863,7 @@ public synchronized Query setBuffer(String attr, ByteBuffer offsets, ByteBuffer
     this.byteBuffers_.put(attr, new Pair(offsets, buffer));
 
     ctx.handleError(
-        tiledb.tiledb_query_set_buffer_var_nio(
+        Utils.tiledb_query_set_buffer_var_nio(
             ctx.getCtxp(),
             queryp,
             attr,

src/main/java/io/tiledb/libtiledb/NativeLibLoader.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;
+    String libDir = LIB_RESOURCE_DIR + "/" + getOSClassifier();
     String libPath = libDir + "/" + mappedLibraryName;
 
     boolean hasNativeLib = hasResource(libPath);

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

@@ -1,5 +1,7 @@
 package io.tiledb.libtiledb;
 
+import java.nio.ByteBuffer;
+
 public class Utils {
 
   public static int32_tArray newInt32_tArray(int[] array) {
@@ -180,6 +182,44 @@ public static int tiledb_query_submit_async(
         callback);
   }
 
+  public static int tiledb_query_set_subarray_nio(
+      SWIGTYPE_p_tiledb_ctx_t ctx, SWIGTYPE_p_tiledb_query_t query, ByteBuffer subarray) {
+    return tiledbJNI.tiledb_query_set_subarray_nio(
+        SWIGTYPE_p_tiledb_ctx_t.getCPtr(ctx), SWIGTYPE_p_tiledb_query_t.getCPtr(query), subarray);
+  }
+
+  public static int tiledb_query_set_buffer_nio(
+      SWIGTYPE_p_tiledb_ctx_t ctx,
+      SWIGTYPE_p_tiledb_query_t query,
+      String name,
+      ByteBuffer buffer,
+      SWIGTYPE_p_unsigned_long_long buffer_size) {
+    return tiledbJNI.tiledb_query_set_buffer_nio(
+        SWIGTYPE_p_tiledb_ctx_t.getCPtr(ctx),
+        SWIGTYPE_p_tiledb_query_t.getCPtr(query),
+        name,
+        buffer,
+        SWIGTYPE_p_unsigned_long_long.getCPtr(buffer_size));
+  }
+
+  public static int tiledb_query_set_buffer_var_nio(
+      SWIGTYPE_p_tiledb_ctx_t ctx,
+      SWIGTYPE_p_tiledb_query_t query,
+      String name,
+      ByteBuffer buffer_off,
+      SWIGTYPE_p_unsigned_long_long buffer_off_size,
+      ByteBuffer buffer_val,
+      SWIGTYPE_p_unsigned_long_long buffer_val_size) {
+    return tiledbJNI.tiledb_query_set_buffer_var_nio(
+        SWIGTYPE_p_tiledb_ctx_t.getCPtr(ctx),
+        SWIGTYPE_p_tiledb_query_t.getCPtr(query),
+        name,
+        buffer_off,
+        SWIGTYPE_p_unsigned_long_long.getCPtr(buffer_off_size),
+        buffer_val,
+        SWIGTYPE_p_unsigned_long_long.getCPtr(buffer_val_size));
+  }
+
   public static int tiledb_object_ls(
       SWIGTYPE_p_tiledb_ctx_t ctx, String path, PathCallback callback) {
     return tiledbJNI.tiledb_object_ls_java(

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

@@ -8,8 +8,6 @@
 
 package io.tiledb.libtiledb;
 
-import java.nio.ByteBuffer;
-
 public class tiledb implements tiledbConstants {
   public static SWIGTYPE_p_p_char new_charpArray(int nelements) {
     long cPtr = tiledbJNI.new_charpArray(nelements);
@@ -2171,12 +2169,6 @@ public static int tiledb_query_set_subarray(
         SWIGTYPE_p_void.getCPtr(subarray));
   }
 
-  public static int tiledb_query_set_subarray_nio(
-      SWIGTYPE_p_tiledb_ctx_t ctx, SWIGTYPE_p_tiledb_query_t query, ByteBuffer subarray) {
-    return tiledbJNI.tiledb_query_set_subarray_nio(
-        SWIGTYPE_p_tiledb_ctx_t.getCPtr(ctx), SWIGTYPE_p_tiledb_query_t.getCPtr(query), subarray);
-  }
-
   public static int tiledb_query_set_buffer(
       SWIGTYPE_p_tiledb_ctx_t ctx,
       SWIGTYPE_p_tiledb_query_t query,
@@ -2191,20 +2183,6 @@ public static int tiledb_query_set_buffer(
         SWIGTYPE_p_unsigned_long_long.getCPtr(buffer_size));
   }
 
-  public static int tiledb_query_set_buffer_nio(
-      SWIGTYPE_p_tiledb_ctx_t ctx,
-      SWIGTYPE_p_tiledb_query_t query,
-      String name,
-      ByteBuffer buffer,
-      SWIGTYPE_p_unsigned_long_long buffer_size) {
-    return tiledbJNI.tiledb_query_set_buffer_nio(
-        SWIGTYPE_p_tiledb_ctx_t.getCPtr(ctx),
-        SWIGTYPE_p_tiledb_query_t.getCPtr(query),
-        name,
-        buffer,
-        SWIGTYPE_p_unsigned_long_long.getCPtr(buffer_size));
-  }
-
   public static int tiledb_query_set_buffer_var(
       SWIGTYPE_p_tiledb_ctx_t ctx,
       SWIGTYPE_p_tiledb_query_t query,
@@ -2223,24 +2201,6 @@ public static int tiledb_query_set_buffer_var(
         SWIGTYPE_p_unsigned_long_long.getCPtr(buffer_val_size));
   }
 
-  public static int tiledb_query_set_buffer_var_nio(
-      SWIGTYPE_p_tiledb_ctx_t ctx,
-      SWIGTYPE_p_tiledb_query_t query,
-      String name,
-      ByteBuffer buffer_off,
-      SWIGTYPE_p_unsigned_long_long buffer_off_size,
-      ByteBuffer buffer_val,
-      SWIGTYPE_p_unsigned_long_long buffer_val_size) {
-    return tiledbJNI.tiledb_query_set_buffer_var_nio(
-        SWIGTYPE_p_tiledb_ctx_t.getCPtr(ctx),
-        SWIGTYPE_p_tiledb_query_t.getCPtr(query),
-        name,
-        buffer_off,
-        SWIGTYPE_p_unsigned_long_long.getCPtr(buffer_off_size),
-        buffer_val,
-        SWIGTYPE_p_unsigned_long_long.getCPtr(buffer_val_size));
-  }
-
   public static int tiledb_query_set_buffer_nullable(
       SWIGTYPE_p_tiledb_ctx_t ctx,
       SWIGTYPE_p_tiledb_query_t query,

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

@@ -24,6 +24,21 @@ public class tiledbJNI {
     }
   }
 
+  public static final native int tiledb_query_set_subarray_nio(
+      long jarg1, long jarg2, ByteBuffer jarg3);
+
+  public static final native int tiledb_query_set_buffer_nio(
+      long jarg1, long jarg2, String jarg3, ByteBuffer jarg4, long jarg5);
+
+  public static final native int tiledb_query_set_buffer_var_nio(
+      long jarg1,
+      long jarg2,
+      String jarg3,
+      ByteBuffer jarg4,
+      long jarg5,
+      ByteBuffer jarg6,
+      long jarg7);
+
   public static final native int tiledb_query_submit_async_java(
       long jarg1,
       SWIGTYPE_p_tiledb_ctx_t jarg1_,
@@ -931,27 +946,12 @@ public static final native int tiledb_array_schema_has_attribute(
 
   public static final native int tiledb_query_set_subarray(long jarg1, long jarg2, long jarg3);
 
-  public static final native int tiledb_query_set_subarray_nio(
-      long jarg1, long jarg2, ByteBuffer jarg3);
-
   public static final native int tiledb_query_set_buffer(
       long jarg1, long jarg2, String jarg3, long jarg4, long jarg5);
 
-  public static final native int tiledb_query_set_buffer_nio(
-      long jarg1, long jarg2, String jarg3, ByteBuffer jarg4, long jarg5);
-
   public static final native int tiledb_query_set_buffer_var(
       long jarg1, long jarg2, String jarg3, long jarg4, long jarg5, long jarg6, long jarg7);
 
-  public static final native int tiledb_query_set_buffer_var_nio(
-      long jarg1,
-      long jarg2,
-      String jarg3,
-      ByteBuffer jarg4,
-      long jarg5,
-      ByteBuffer jarg6,
-      long jarg7);
-
   public static final native int tiledb_query_set_buffer_nullable(
       long jarg1, long jarg2, String jarg3, long jarg4, long jarg5, long jarg6, long jarg7);