Fixed issues in set fill values for var-sized attributes

Author: gsvic

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

@@ -295,16 +295,18 @@ public void setFillValue(NativeArray value, BigInteger size) throws TileDBError
    * @throws TileDBError
    */
   public void setFillValue(Object value) throws TileDBError {
-    NativeArray array = new NativeArray(ctx, this.type.getNativeSize(), this.type.javaClass());
+    int size;
+
+    if (value instanceof String) size = ((String) value).length();
+    else size = this.type.getNativeSize();
+
+    NativeArray array = new NativeArray(ctx, size, this.type.javaClass());
     array.setItem(0, value);
 
     try {
       ctx.handleError(
           tiledb.tiledb_attribute_set_fill_value(
-              ctx.getCtxp(),
-              attributep,
-              array.toVoidPointer(),
-              BigInteger.valueOf(this.type.getNativeSize())));
+              ctx.getCtxp(), attributep, array.toVoidPointer(), BigInteger.valueOf((long) size)));
     } catch (TileDBError err) {
       throw err;
     }
@@ -328,10 +330,12 @@ public Pair<Object, Long> getFillValue() throws TileDBError {
       SWIGTYPE_p_p_void v = tiledb.new_voidpArray(1);
 
       ctx.handleError(tiledb.tiledb_attribute_get_fill_value(ctx.getCtxp(), attributep, v, size));
+      int extractedSize = tiledb.ullp_value(size).intValue();
 
       Object fillValue;
-      try (NativeArray fillValueArray = new NativeArray(ctx, getType(), v, 1)) {
-        fillValue = fillValueArray.getItem(0);
+      try (NativeArray fillValueArray = new NativeArray(ctx, getType(), v, extractedSize)) {
+        if (this.isVar()) fillValue = fillValueArray.toJavaArray(extractedSize);
+        else fillValue = fillValueArray.getItem(0);
       }
 
       return new Pair(fillValue, tiledb.ullp_value(size));
@@ -378,8 +382,12 @@ public void setFillValueNullable(NativeArray value, BigInteger size, boolean val
    * @throws TileDBError
    */
   public void setFillValueNullable(Object value, boolean valid) throws TileDBError {
+    int size;
+
+    if (value instanceof String) size = ((String) value).length();
+    else size = this.type.getNativeSize();
 
-    NativeArray valueArray = new NativeArray(ctx, this.type.getNativeSize(), this.type.javaClass());
+    NativeArray valueArray = new NativeArray(ctx, size, this.type.javaClass());
     valueArray.setItem(0, value);
 
     try {
@@ -388,7 +396,7 @@ public void setFillValueNullable(Object value, boolean valid) throws TileDBError
               ctx.getCtxp(),
               attributep,
               valueArray.toVoidPointer(),
-              BigInteger.valueOf(this.type.getNativeSize()),
+              BigInteger.valueOf(size),
               valid ? (short) 1 : (short) 0));
     } catch (TileDBError err) {
       throw err;
@@ -419,9 +427,12 @@ public Pair<Object, Pair<Long, Boolean>> getFillValueNullable() throws TileDBErr
           tiledb.tiledb_attribute_get_fill_value_nullable(
               ctx.getCtxp(), attributep, v, size, valid));
 
+      int extractedSize = tiledb.ullp_value(size).intValue();
+
       Object fillValue;
-      try (NativeArray fillValueArray = new NativeArray(ctx, getType(), v, 1)) {
-        fillValue = fillValueArray.getItem(0);
+      try (NativeArray fillValueArray = new NativeArray(ctx, getType(), v, extractedSize)) {
+        if (this.isVar()) fillValue = fillValueArray.toJavaArray(extractedSize);
+        else fillValue = fillValueArray.getItem(0);
       }
 
       boolean validBoolean = validArr.getUint8_tArray().getitem(0) == 0 ? false : true;

src/test/java/io/tiledb/java/api/AttributeTest.java

@@ -92,6 +92,27 @@ public void testAttributeSetFillValue() throws Exception {
       Assert.assertEquals(
           BigInteger.valueOf(a.getType().getNativeSize()), a.getFillValue().getSecond());
     }
+
+    try (Context ctx = new Context();
+        Attribute a = new Attribute(ctx, "a2", Datatype.TILEDB_CHAR)) {
+
+      a.setFillValue((byte) 'c');
+
+      Assert.assertEquals((byte) 'c', a.getFillValue().getFirst());
+      Assert.assertEquals(
+          BigInteger.valueOf(a.getType().getNativeSize()), a.getFillValue().getSecond());
+    }
+
+    try (Context ctx = new Context();
+        Attribute a = new Attribute(ctx, "a2", Datatype.TILEDB_STRING_ASCII)) {
+      a.setCellVar();
+
+      String str = "abcdef";
+      a.setFillValue(str);
+
+      Assert.assertEquals(str, new String((byte[]) a.getFillValue().getFirst()));
+      Assert.assertEquals(BigInteger.valueOf(str.length()), a.getFillValue().getSecond());
+    }
   }
 
   @Test
@@ -140,6 +161,19 @@ public void testAttributeSetFillValueNullable() throws Exception {
 
       Assert.assertEquals(false, a.getFillValueNullable().getSecond().getSecond());
     }
+
+    try (Context ctx = new Context();
+        Attribute a = new Attribute(ctx, "a2", Datatype.TILEDB_STRING_ASCII)) {
+      a.setNullable(true);
+      a.setCellVar();
+
+      String str = "abcdef";
+      a.setFillValueNullable(str, true);
+
+      Assert.assertEquals(str, new String((byte[]) a.getFillValueNullable().getFirst()));
+      Assert.assertEquals(
+          BigInteger.valueOf(str.length()), a.getFillValueNullable().getSecond().getFirst());
+    }
   }
 
   @Test