Skip to content

Add string metadata support #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2020
Merged

Add string metadata support #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f056eb9
Support for reading strings
chris-allan Sep 28, 2020
3b6b5ad
Expand metadata test case to cover strings
chris-allan Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/io/tiledb/java/api/NativeArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,11 @@ private void createNativeArrayFromVoidPointer(SWIGTYPE_p_p_void pointer) throws
int64_tArray = PointerUtils.int64_tArrayFromVoid(pointer);
break;
}
case TILEDB_CHAR:
{
int8_tArray = PointerUtils.int8_tArrayFromVoid(pointer);
break;
}
default:
{
throw new TileDBError("Unsupported TileDB NativeArray Datatype enum: " + this.nativeType);
Expand Down
22 changes: 18 additions & 4 deletions src/test/java/io/tiledb/java/api/ArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,26 +424,34 @@ public void testArrayMetadata() throws Exception {
},
Double.class);

NativeArray metadataString = new NativeArray(ctx, "русский", String.class);

String byteKey = "md-byte";
String shortKey = "md-short";
String intKey = "md-int";
String floatKey = "md-float";
String doubleKey = "md-double";
String stringKey = "md-string";

// metadata keys sorted in a lexicographic ordering
String[] keys = new String[] {byteKey, doubleKey, floatKey, intKey, shortKey};
String[] keys = new String[] {byteKey, doubleKey, floatKey, intKey, shortKey, stringKey};
Datatype[] types =
new Datatype[] {TILEDB_INT8, TILEDB_FLOAT64, TILEDB_FLOAT32, TILEDB_INT32, TILEDB_INT16};
new Datatype[] {
TILEDB_INT8, TILEDB_FLOAT64, TILEDB_FLOAT32, TILEDB_INT32, TILEDB_INT16, TILEDB_CHAR
};
int keysNum = keys.length;
NativeArray[] nativeArrays =
new NativeArray[] {metadataByte, metadataDouble, metadataFloat, metadataInt, metadataShort};
new NativeArray[] {
metadataByte, metadataDouble, metadataFloat, metadataInt, metadataShort, metadataString
};
Object[] expectedArrays =
new Object[] {
metadataByte.toJavaArray(),
metadataDouble.toJavaArray(),
metadataFloat.toJavaArray(),
metadataInt.toJavaArray(),
metadataShort.toJavaArray()
metadataShort.toJavaArray(),
metadataString.toJavaArray()
};

for (int i = 0; i < keysNum; i++) {
Expand Down Expand Up @@ -474,12 +482,14 @@ public void testArrayMetadata() throws Exception {
NativeArray metadataIntActual = arrayn.getMetadata(intKey, TILEDB_INT32);
NativeArray metadataFloatActual = arrayn.getMetadata(floatKey, TILEDB_FLOAT32);
NativeArray metadataDoubleActual = arrayn.getMetadata(doubleKey, TILEDB_FLOAT64);
NativeArray metadataStringActual = arrayn.getMetadata(stringKey, TILEDB_CHAR);

Assert.assertNotNull(metadataByteActual);
Assert.assertNotNull(metadataShortActual);
Assert.assertNotNull(metadataIntActual);
Assert.assertNotNull(metadataFloatActual);
Assert.assertNotNull(metadataDoubleActual);
Assert.assertNotNull(metadataStringActual);

Assert.assertArrayEquals(
(byte[]) metadataByte.toJavaArray(), (byte[]) metadataByteActual.toJavaArray());
Expand All @@ -493,6 +503,10 @@ public void testArrayMetadata() throws Exception {
(double[]) metadataDouble.toJavaArray(),
(double[]) metadataDoubleActual.toJavaArray(),
1e-10d);
Assert.assertArrayEquals(
(byte[]) metadataString.toJavaArray(), (byte[]) metadataStringActual.toJavaArray());
Assert.assertEquals(
"русский", new String((byte[]) metadataString.toJavaArray(), StandardCharsets.UTF_8));

// exctracion of metadata without specifying the Datatype
for (int i = 0; i < keysNum; i++) {
Expand Down