Skip to content

Commit 46d0ca8

Browse files
update to TileDB-2.18.3 (#334)
* update to TileDB-2.18.3 * add missing UTF-8 in NativeArray.allocateEmptyArray() * add test
1 parent 89f8b13 commit 46d0ca8

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ test {
144144

145145
testLogging {
146146
showStandardStreams = true
147-
exceptionFormat = 'full'
148147
}
149148
}
150149

cmake/Modules/FindTileDB_EP.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,29 @@ if (NOT TILEDB_FOUND)
4848
# Try to download prebuilt artifacts unless the user specifies to build from source
4949
if(DOWNLOAD_TILEDB_PREBUILT)
5050
if (WIN32) # Windows
51-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-windows-x86_64-2.18.2-9ae6e1a.zip")
52-
SET(DOWNLOAD_SHA1 "c440403fde701e5014a7ffa046d38bb49b141e55")
51+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.3/tiledb-windows-x86_64-2.18.3-8f8b766.zip")
52+
SET(DOWNLOAD_SHA1 "313cc237c8cab22edaf2745014471d231f185926")
5353
elseif(APPLE) # macOS
5454

5555
if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
5656
message(STATUS "Building for intel mac")
57-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-macos-x86_64-2.18.2-9ae6e1a.tar.gz")
58-
SET(DOWNLOAD_SHA1 "6ba986407b2d0e25fb5df19d08ed22fefeac1c2a")
57+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.3/tiledb-macos-x86_64-2.18.3-8f8b766.tar.gz")
58+
SET(DOWNLOAD_SHA1 "fbd7515172de977c8ebd553427b7c136a73df299")
5959

6060
elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
6161
message(STATUS "Building for apple silicon mac")
62-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-macos-arm64-2.18.2-9ae6e1a.tar.gz")
63-
SET(DOWNLOAD_SHA1 "4395a283db57844a944f02dab5bd0f0001eb7e30")
62+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.3/tiledb-macos-arm64-2.18.3-8f8b766.tar.gz")
63+
SET(DOWNLOAD_SHA1 "8109bbac66824ee5806cbea93386d66f5b874bc2")
6464
endif()
6565
else() # Linux
6666
if (USE_AVX2)
6767
message(STATUS "Using Linux binaries with AVX2")
68-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-linux-x86_64-2.18.2-9ae6e1a.tar.gz")
69-
SET(DOWNLOAD_SHA1 "6386504a58d52330f41fa688a2b259b67824e2c8")
68+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.3/tiledb-linux-x86_64-2.18.3-8f8b766.tar.gz")
69+
SET(DOWNLOAD_SHA1 "22ccf17c67532ca80fe2c6f06350a267bc839e81")
7070
else()
7171
message(STATUS "Using Linux binaries without AVX2")
72-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-linux-x86_64-noavx2-2.18.2-9ae6e1a.tar.gz")
73-
SET(DOWNLOAD_SHA1 "96d558aae525c4a665a0b1e9cdcce75a97e3d966")
72+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.3/tiledb-linux-x86_64-noavx2-2.18.3-8f8b766.tar.gz")
73+
SET(DOWNLOAD_SHA1 "8ea35a77f01ec33304b42275e71c6ccb1f340965")
7474
endif()
7575
endif()
7676

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
2-
TILEDB_GIT_TAG=2.18.2
2+
TILEDB_GIT_TAG=2.18.3
33
TILEDB_VERBOSE=ON
44
TILEDB_S3=ON
55
TILEDB_AZURE=OFF

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ private void allocateEmptyArray() throws TileDBError {
386386
}
387387
case TILEDB_STRING_ASCII:
388388
case TILEDB_CHAR:
389+
case TILEDB_STRING_UTF8:
389390
{
390391
int8_tArray = new int8_tArray(size);
391392
break;

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public void arrayCreate() throws Exception {
5858
Attribute a1 = new Attribute(ctx, "a1", String.class);
5959
Attribute a2 = new Attribute(ctx, "a2", Float.class);
6060
Attribute a3 = new Attribute(ctx, "a3", Boolean.class);
61+
Attribute a4 = new Attribute(ctx, "a4", Datatype.TILEDB_STRING_UTF8);
6162
a1.setFilterList(
6263
new FilterList(ctx)
6364
.addFilter(new CheckSumMD5Filter(ctx))
@@ -76,6 +77,7 @@ public void arrayCreate() throws Exception {
7677
schema.addAttribute(a1);
7778
schema.addAttribute(a2);
7879
schema.addAttribute(a3);
80+
schema.addAttribute(a4);
7981

8082
Array.create(arrayURI, schema);
8183
}
@@ -101,13 +103,15 @@ public void arrayWrite() throws Exception {
101103
},
102104
Datatype.TILEDB_BOOL);
103105

106+
NativeArray a4 = new NativeArray(ctx, "aBCDefghijklmnop", Datatype.TILEDB_STRING_UTF8);
104107
// Create query
105108
try (Array array = new Array(ctx, arrayURI, TILEDB_WRITE);
106109
Query query = new Query(array)) {
107110
query.setLayout(TILEDB_ROW_MAJOR);
108111
query.setDataBuffer("a1", a1);
109112
query.setDataBuffer("a2", a2);
110113
query.setDataBuffer("a3", a3);
114+
query.setDataBuffer("a4", a4);
111115
// Submit query
112116
query.submit();
113117

@@ -184,12 +188,14 @@ public void arrayReadTest() throws Exception {
184188
NativeArray a1Array = new NativeArray(ctx, 12, String.class);
185189
NativeArray a2Array = new NativeArray(ctx, 6, Float.class);
186190
NativeArray a3Array = new NativeArray(ctx, 6, Boolean.class);
191+
NativeArray a4Array = new NativeArray(ctx, 6, Datatype.TILEDB_STRING_UTF8);
187192

188193
query.setDataBuffer("rows", dim1Array);
189194
query.setDataBuffer("cols", dim2Array);
190195
query.setDataBuffer("a1", a1Array);
191196
query.setDataBuffer("a2", a2Array);
192197
query.setDataBuffer("a3", a3Array);
198+
query.setDataBuffer("a4", a4Array);
193199

194200
// Submit query
195201
query.submit();
@@ -210,12 +216,14 @@ public void arrayReadTest() throws Exception {
210216
byte[] a1 = (byte[]) query.getBuffer("a1");
211217
float[] a2 = (float[]) query.getBuffer("a2");
212218
short[] a3 = (short[]) query.getBuffer("a3");
219+
byte[] a4 = (byte[]) query.getBuffer("a4");
213220

214221
Assert.assertArrayEquals(new int[] {1, 1, 1}, dim1);
215222
Assert.assertArrayEquals(new int[] {2, 3, 4}, dim2);
216223
Assert.assertArrayEquals(new byte[] {'b', 'c', 'd'}, a1);
217224
Assert.assertArrayEquals(new float[] {1.1f, 1.2f, 2.1f, 2.2f, 3.1f, 3.2f}, a2, 0.01f);
218225
Assert.assertArrayEquals(new short[] {0, 1, 0}, a3);
226+
Assert.assertArrayEquals(new byte[] {'B', 'C', 'D'}, a4);
219227
}
220228
}
221229

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ public void testVersion() {
3535
System.out.println(version);
3636
Assert.assertTrue(version.getMajor() == 2);
3737
Assert.assertTrue(version.getMinor() == 18);
38-
Assert.assertTrue(version.getRevision() == 2);
38+
Assert.assertTrue(version.getRevision() == 3);
3939
}
4040
}

0 commit comments

Comments
 (0)