fix memory leaks

Author: DimitrisStaratzis

build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'io.tiledb'
-version '0.19.1-SNAPSHOT'
+version '0.19.2-SNAPSHOT'
 
 repositories {
     jcenter()

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

@@ -171,32 +171,23 @@ private synchronized void openArray(
 
     if (timestamp_start != null) {
       Util.checkBigIntegerRange(timestamp_start);
-      try {
-        ctx.handleError(
-            tiledb.tiledb_array_set_open_timestamp_start(ctx.getCtxp(), _arrayp, timestamp_start));
-      } catch (TileDBError err) {
-        throw err;
-      }
+      ctx.handleError(
+          tiledb.tiledb_array_set_open_timestamp_start(ctx.getCtxp(), _arrayp, timestamp_start));
     }
 
     if (timestamp_end != null) {
       Util.checkBigIntegerRange(timestamp_end);
-      try {
-        ctx.handleError(
-            tiledb.tiledb_array_set_open_timestamp_end(ctx.getCtxp(), _arrayp, timestamp_end));
-      } catch (TileDBError err) {
-        throw err;
-      }
+      ctx.handleError(
+          tiledb.tiledb_array_set_open_timestamp_end(ctx.getCtxp(), _arrayp, timestamp_end));
     }
 
-    ArraySchema _schema;
     try {
       ctx.handleError(tiledb.tiledb_array_open(ctx.getCtxp(), _arrayp, query_type.toSwigEnum()));
     } catch (TileDBError err) {
       tiledb.delete_tiledb_array_tpp(_arraypp);
       throw err;
     }
-    _schema = new ArraySchema(ctx, uri);
+    ArraySchema _schema = new ArraySchema(ctx, uri);
 
     this.ctx = ctx;
     this.uri = uri;
@@ -514,12 +505,17 @@ public Pair<BigInteger, BigInteger> getNonEmptyDomainVarSizeFromIndex(long index
     SWIGTYPE_p_int emptyp = tiledb.new_intp();
     SWIGTYPE_p_unsigned_long_long startSize = tiledb.new_ullp();
     SWIGTYPE_p_unsigned_long_long endSize = tiledb.new_ullp();
+    try {
+      ctx.handleError(
+          tiledb.tiledb_array_get_non_empty_domain_var_size_from_index(
+              ctx.getCtxp(), arrayp, index, startSize, endSize, emptyp));
 
-    ctx.handleError(
-        tiledb.tiledb_array_get_non_empty_domain_var_size_from_index(
-            ctx.getCtxp(), arrayp, index, startSize, endSize, emptyp));
-
-    return new Pair(tiledb.ullp_value(startSize), tiledb.ullp_value(endSize));
+      return new Pair(tiledb.ullp_value(startSize), tiledb.ullp_value(endSize));
+    } finally {
+      tiledb.delete_ullp(startSize);
+      tiledb.delete_ullp(endSize);
+      tiledb.delete_intp(emptyp);
+    }
   }
 
   /**
@@ -558,11 +554,17 @@ public Pair<BigInteger, BigInteger> getNonEmptyDomainVarSizeFromName(String name
     SWIGTYPE_p_unsigned_long_long startSize = tiledb.new_ullp();
     SWIGTYPE_p_unsigned_long_long endSize = tiledb.new_ullp();
 
-    ctx.handleError(
-        tiledb.tiledb_array_get_non_empty_domain_var_size_from_name(
-            ctx.getCtxp(), arrayp, name, startSize, endSize, emptyp));
+    try {
+      ctx.handleError(
+          tiledb.tiledb_array_get_non_empty_domain_var_size_from_name(
+              ctx.getCtxp(), arrayp, name, startSize, endSize, emptyp));
 
-    return new Pair(tiledb.ullp_value(startSize), tiledb.ullp_value(endSize));
+      return new Pair(tiledb.ullp_value(startSize), tiledb.ullp_value(endSize));
+    } finally {
+      tiledb.delete_ullp(startSize);
+      tiledb.delete_ullp(endSize);
+      tiledb.delete_intp(emptyp);
+    }
   }
 
   /**
@@ -576,23 +578,23 @@ public Pair<BigInteger, BigInteger> getNonEmptyDomainVarSizeFromName(String name
    */
   public Pair<String, String> getNonEmptyDomainVarFromIndex(long index) throws TileDBError {
     SWIGTYPE_p_int emptyp = tiledb.new_intp();
-
     Dimension dim = this.schema.getDomain().getDimension(index);
     Pair<BigInteger, BigInteger> size = this.getNonEmptyDomainVarSizeFromIndex(index);
 
     Datatype dimType = dim.getType();
     int startSize = size.getFirst().intValue();
     int endSize = size.getSecond().intValue();
+    try (NativeArray start = new NativeArray(ctx, startSize, dimType);
+        NativeArray end = new NativeArray(ctx, endSize, dimType)) {
+      ctx.handleError(
+          tiledb.tiledb_array_get_non_empty_domain_var_from_index(
+              ctx.getCtxp(), arrayp, index, start.toVoidPointer(), end.toVoidPointer(), emptyp));
 
-    NativeArray start = new NativeArray(ctx, startSize, dimType);
-    NativeArray end = new NativeArray(ctx, endSize, dimType);
-
-    ctx.handleError(
-        tiledb.tiledb_array_get_non_empty_domain_var_from_index(
-            ctx.getCtxp(), arrayp, index, start.toVoidPointer(), end.toVoidPointer(), emptyp));
-
-    return new Pair(
-        new String((byte[]) start.toJavaArray()), new String((byte[]) end.toJavaArray()));
+      return new Pair(
+          new String((byte[]) start.toJavaArray()), new String((byte[]) end.toJavaArray()));
+    } finally {
+      tiledb.delete_intp(emptyp);
+    }
   }
 
   /**
@@ -615,15 +617,17 @@ public Pair<String, String> getNonEmptyDomainVarFromName(String name) throws Til
     int startSize = size.getFirst().intValue();
     int endSize = size.getSecond().intValue();
 
-    NativeArray start = new NativeArray(ctx, startSize, dimType);
-    NativeArray end = new NativeArray(ctx, endSize, dimType);
-
-    ctx.handleError(
-        tiledb.tiledb_array_get_non_empty_domain_var_from_name(
-            ctx.getCtxp(), arrayp, name, start.toVoidPointer(), end.toVoidPointer(), emptyp));
+    try (NativeArray start = new NativeArray(ctx, startSize, dimType);
+        NativeArray end = new NativeArray(ctx, endSize, dimType); ) {
+      ctx.handleError(
+          tiledb.tiledb_array_get_non_empty_domain_var_from_name(
+              ctx.getCtxp(), arrayp, name, start.toVoidPointer(), end.toVoidPointer(), emptyp));
 
-    return new Pair(
-        new String((byte[]) start.toJavaArray()), new String((byte[]) end.toJavaArray()));
+      return new Pair(
+          new String((byte[]) start.toJavaArray()), new String((byte[]) end.toJavaArray()));
+    } finally {
+      tiledb.delete_intp(emptyp);
+    }
   }
 
   /**
@@ -657,19 +661,22 @@ public NativeArray getMetadata(String key, Datatype nativeType) throws TileDBErr
             ? tiledb.new_tiledb_datatype_tp()
             : tiledb.copy_tiledb_datatype_tp(nativeType.toSwigEnum());
 
-    ctx.handleError(
-        tiledb.tiledb_array_get_metadata(
-            ctx.getCtxp(), arrayp, key, value_type, value_num, resultArrpp));
-
-    Datatype derivedNativeType = Datatype.fromSwigEnum(tiledb.tiledb_datatype_tp_value(value_type));
-
-    long value = tiledb.uintp_value(value_num);
-    NativeArray result = new NativeArray(ctx, derivedNativeType, resultArrpp, (int) value);
+    try {
+      ctx.handleError(
+          tiledb.tiledb_array_get_metadata(
+              ctx.getCtxp(), arrayp, key, value_type, value_num, resultArrpp));
 
-    tiledb.delete_uintp(value_num);
-    tiledb.delete_tiledb_datatype_tp(value_type);
+      Datatype derivedNativeType =
+          Datatype.fromSwigEnum(tiledb.tiledb_datatype_tp_value(value_type));
 
-    return result;
+      long value = tiledb.uintp_value(value_num);
+      NativeArray result = new NativeArray(ctx, derivedNativeType, resultArrpp, (int) value);
+      return result;
+    } finally {
+      tiledb.delete_uintp(value_num);
+      tiledb.delete_tiledb_datatype_tp(value_type);
+      tiledb.delete_voidpArray(resultArrpp);
+    }
   }
 
   /**
@@ -697,13 +704,13 @@ public BigInteger getMetadataNum() throws TileDBError {
 
     SWIGTYPE_p_unsigned_long_long value_num = tiledb.new_ullp();
 
-    ctx.handleError(tiledb.tiledb_array_get_metadata_num(ctx.getCtxp(), arrayp, value_num));
-
-    BigInteger value = tiledb.ullp_value(value_num);
-
-    tiledb.delete_ullp(value_num);
-
-    return value;
+    try {
+      ctx.handleError(tiledb.tiledb_array_get_metadata_num(ctx.getCtxp(), arrayp, value_num));
+      BigInteger value = tiledb.ullp_value(value_num);
+      return value;
+    } finally {
+      tiledb.delete_ullp(value_num);
+    }
   }
 
   /**
@@ -735,22 +742,25 @@ public Pair<String, NativeArray> getMetadataFromIndex(BigInteger index) throws T
     SWIGTYPE_p_unsigned_int value_num = tiledb.new_uintp();
     SWIGTYPE_p_p_void value = tiledb.new_voidpArray(0);
 
-    ctx.handleError(
-        tiledb.tiledb_array_get_metadata_from_index(
-            ctx.getCtxp(), arrayp, index, key, key_len, value_type, value_num, value));
-
-    String keyString = tiledb.charpp_value(key);
-    long valueLength = tiledb.uintp_value(value_num);
-    Datatype nativeType = Datatype.fromSwigEnum(tiledb.tiledb_datatype_tp_value(value_type));
+    try {
+      ctx.handleError(
+          tiledb.tiledb_array_get_metadata_from_index(
+              ctx.getCtxp(), arrayp, index, key, key_len, value_type, value_num, value));
 
-    NativeArray result = new NativeArray(ctx, nativeType, value, (int) valueLength);
+      String keyString = tiledb.charpp_value(key);
+      long valueLength = tiledb.uintp_value(value_num);
+      Datatype nativeType = Datatype.fromSwigEnum(tiledb.tiledb_datatype_tp_value(value_type));
 
-    tiledb.delete_uintp(value_num);
-    tiledb.delete_uintp(key_len);
-    tiledb.delete_charpp(key);
-    tiledb.delete_tiledb_datatype_tp(value_type);
+      NativeArray result = new NativeArray(ctx, nativeType, value, (int) valueLength);
+      return new Pair<String, NativeArray>(keyString, result);
 
-    return new Pair<String, NativeArray>(keyString, result);
+    } finally {
+      tiledb.delete_uintp(value_num);
+      tiledb.delete_uintp(key_len);
+      tiledb.delete_charpp(key);
+      tiledb.delete_tiledb_datatype_tp(value_type);
+      tiledb.delete_voidpArray(value);
+    }
   }
 
   /**
@@ -765,13 +775,9 @@ public void deleteFragments(BigInteger timestampStart, BigInteger timestampEnd)
       throws TileDBError {
     Util.checkBigIntegerRange(timestampStart);
     Util.checkBigIntegerRange(timestampEnd);
-    try {
-      ctx.handleError(
-          tiledb.tiledb_array_delete_fragments(
-              ctx.getCtxp(), getArrayp(), uri, timestampStart, timestampEnd));
-    } catch (TileDBError err) {
-      throw err;
-    }
+    ctx.handleError(
+        tiledb.tiledb_array_delete_fragments(
+            ctx.getCtxp(), getArrayp(), uri, timestampStart, timestampEnd));
   }
 
   /**
@@ -808,15 +814,16 @@ public Boolean hasMetadataKey(String key) throws TileDBError {
     SWIGTYPE_p_tiledb_datatype_t value_type = tiledb.new_tiledb_datatype_tp();
     SWIGTYPE_p_int has_key = tiledb.new_intp();
 
-    ctx.handleError(
-        tiledb.tiledb_array_has_metadata_key(ctx.getCtxp(), arrayp, key, value_type, has_key));
-
-    Boolean result = tiledb.intp_value(has_key) > 0;
-
-    tiledb.delete_intp(has_key);
-    tiledb.delete_tiledb_datatype_tp(value_type);
+    try {
+      ctx.handleError(
+          tiledb.tiledb_array_has_metadata_key(ctx.getCtxp(), arrayp, key, value_type, has_key));
 
-    return result;
+      Boolean result = tiledb.intp_value(has_key) > 0;
+      return result;
+    } finally {
+      tiledb.delete_intp(has_key);
+      tiledb.delete_tiledb_datatype_tp(value_type);
+    }
   }
 
   /**
@@ -887,11 +894,10 @@ public long getOpenTimestampStart() throws TileDBError {
     try {
       ctx.handleError(
           tiledb.tiledb_array_get_open_timestamp_start(ctx.getCtxp(), getArrayp(), start_t));
-    } catch (TileDBError err) {
+      return tiledb.ullp_value(start_t).longValue();
+    } finally {
       tiledb.delete_ullp(start_t);
-      throw err;
     }
-    return tiledb.ullp_value(start_t).longValue();
   }
 
   /**
@@ -904,21 +910,16 @@ public long getOpenTimestampEnd() throws TileDBError {
     try {
       ctx.handleError(
           tiledb.tiledb_array_get_open_timestamp_end(ctx.getCtxp(), getArrayp(), end_t));
-    } catch (TileDBError err) {
+      return tiledb.ullp_value(end_t).longValue();
+    } finally {
       tiledb.delete_ullp(end_t);
-      throw err;
     }
-    return tiledb.ullp_value(end_t).longValue();
   }
 
   /** Sets the array config. */
   public void setConfig(Config config) throws TileDBError {
-    try {
-      ctx.handleError(
-          tiledb.tiledb_array_set_config(ctx.getCtxp(), getArrayp(), config.getConfigp()));
-    } catch (TileDBError err) {
-      throw err;
-    }
+    ctx.handleError(
+        tiledb.tiledb_array_set_config(ctx.getCtxp(), getArrayp(), config.getConfigp()));
   }
 
   /**
@@ -963,14 +964,14 @@ protected SWIGTYPE_p_tiledb_array_t getArrayp() {
 
   /** Free's the native objects and closes the Array. */
   public synchronized void close() {
+    if (schema != null) {
+      schema.close();
+    }
     if (arrayp != null && arraypp != null) {
       tiledb.tiledb_array_close(ctx.getCtxp(), arrayp);
       tiledb.tiledb_array_free(arraypp);
       arrayp = null;
       arraypp = null;
-      if (schema != null) {
-        schema.close();
-      }
     }
   }
 }