Skip to content

update to TileDB-2.21 #347

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
DimitrisStaratzis merged 5 commits into from
Mar 21, 2024
Merged

update to TileDB-2.21 #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96fedb4
update to TileDB-2.21.0-rc1
DimitrisStaratzis Mar 15, 2024
019e3fd
add support for the GEOM types
DimitrisStaratzis Mar 15, 2024
287b43c
remove ```rc1```
DimitrisStaratzis Mar 20, 2024
0604c6a
update sha1sums
DimitrisStaratzis Mar 20, 2024
e85c691
bump version to 0.23.0
DimitrisStaratzis Mar 20, 2024
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

group 'io.tiledb'
version '0.22.0-SNAPSHOT'
version '0.23.0-SNAPSHOT'

repositories {
jcenter()
Expand Down
20 changes: 10 additions & 10 deletions cmake/Modules/FindTileDB_EP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,30 +48,30 @@ if (NOT TILEDB_FOUND)
# Try to download prebuilt artifacts unless the user specifies to build from source
if(DOWNLOAD_TILEDB_PREBUILT)
if (WIN32) # Windows
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-windows-x86_64-2.20.1-249c024.zip")
SET(DOWNLOAD_SHA1 "988fdb6f9cf26ae4b9c06951dda6abfb288f51d8")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.21.0/tiledb-windows-x86_64-2.21.0-0ea9c13.zip")
SET(DOWNLOAD_SHA1 "a28c71d3ce36bb663957ce5f60a04054904529e4")
elseif(APPLE) # macOS

if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
message(STATUS "Building for intel mac")

SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-macos-x86_64-2.20.1-249c024.tar.gz")
SET(DOWNLOAD_SHA1 "d347916ae4b6f2c01adddf9f80a5cfbbb47dfb68")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.21.0/tiledb-macos-x86_64-2.21.0-0ea9c13.tar.gz")
SET(DOWNLOAD_SHA1 "9c824c256a18ac8ff7e015fd0053c8a96d77487a")

elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
message(STATUS "Building for apple silicon mac")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-macos-arm64-2.20.1-249c024.tar.gz")
SET(DOWNLOAD_SHA1 "d236d781328782d96b95c7cccbd2de07d91ef115")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.21.0/tiledb-macos-arm64-2.21.0-0ea9c13.tar.gz")
SET(DOWNLOAD_SHA1 "61ac4017db8d3005f39820bb10ed042f5543b723")
endif()
else() # Linux
if (USE_AVX2)
message(STATUS "Using Linux binaries with AVX2")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-linux-x86_64-2.20.1-249c024.tar.gz")
SET(DOWNLOAD_SHA1 "53ab76f43e0c61389e5b2910c8c15cfbb483a0b7")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.21.0/tiledb-linux-x86_64-2.21.0-0ea9c13.tar.gz")
SET(DOWNLOAD_SHA1 "2fbfe4dbf81a5ae01e7efb85738ed39a60c07f98")
else()
message(STATUS "Using Linux binaries without AVX2")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-linux-x86_64-noavx2-2.20.1-249c024.tar.gz")
SET(DOWNLOAD_SHA1 "d68eabe87af3dd59a392ef7e67e44287f08a457d")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.21.0/tiledb-linux-x86_64-noavx2-2.21.0-0ea9c13.tar.gz")
SET(DOWNLOAD_SHA1 "2a9c2e1c2ce3e6437a70bcf8270d9419306385b5")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
TILEDB_GIT_TAG=2.20.1
TILEDB_GIT_TAG=2.21.0
TILEDB_VERBOSE=ON
TILEDB_S3=ON
TILEDB_AZURE=OFF
Expand Down
27 changes: 27 additions & 0 deletions src/main/c/generated/tiledb_wrap.cxx
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion src/main/java/io/tiledb/java/api/Datatype.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ public enum Datatype {
TILEDB_TIME_FS,
TILEDB_TIME_AS,
TILEDB_BLOB,
TILEDB_BOOL;
TILEDB_BOOL,
TILEDB_GEOM_WKB,
TILEDB_GEOM_WKT;

/** @return Returns the TileDB Datatype size in Bytes * */
public int getNativeSize() throws TileDBError {
Expand Down Expand Up @@ -159,6 +161,8 @@ public Class javaClass() throws TileDBError {
return Byte.class;
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
return Byte.class;
case TILEDB_UINT8:
case TILEDB_BOOL:
Expand Down Expand Up @@ -294,6 +298,10 @@ protected tiledb_datatype_t toSwigEnum() throws TileDBError {
return tiledb_datatype_t.TILEDB_TIME_FS;
case TILEDB_TIME_AS:
return tiledb_datatype_t.TILEDB_TIME_AS;
case TILEDB_GEOM_WKB:
return tiledb_datatype_t.TILEDB_GEOM_WKB;
case TILEDB_GEOM_WKT:
return tiledb_datatype_t.TILEDB_GEOM_WKT;
case TILEDB_BLOB:
return tiledb_datatype_t.TILEDB_BLOB;
case TILEDB_BOOL:
Expand Down Expand Up @@ -389,6 +397,10 @@ protected static Datatype fromSwigEnum(tiledb_datatype_t e) throws TileDBError {
return TILEDB_BLOB;
case TILEDB_BOOL:
return TILEDB_BOOL;
case TILEDB_GEOM_WKB:
return TILEDB_GEOM_WKB;
case TILEDB_GEOM_WKT:
return TILEDB_GEOM_WKT;
default:
throw new TileDBError("No such enum value " + e.name());
}
Expand Down
20 changes: 20 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 @@ -167,6 +167,8 @@ private int getSize(Object buffer) throws TileDBError {
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
return ((byte[]) buffer).length;
}
Expand Down Expand Up @@ -244,6 +246,8 @@ private void createNativeArrayFromBuffer(Object buffer) throws TileDBError {
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
int8_tArray = Utils.newInt8_tArray((byte[]) buffer);
break;
Expand Down Expand Up @@ -344,6 +348,8 @@ private void allocateEmptyArray() throws TileDBError {
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
int8_tArray = new int8_tArray(size);
break;
Expand Down Expand Up @@ -446,6 +452,8 @@ public Object getItem(int index) throws ArrayIndexOutOfBoundsException, TileDBEr
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
return int8_tArray.getitem(index);
}
Expand Down Expand Up @@ -539,6 +547,8 @@ public void setItem(int index, Object value) throws ArrayIndexOutOfBoundsExcepti
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
int8_tArray.setitem(index, (byte) value);
break;
Expand Down Expand Up @@ -643,6 +653,8 @@ public SWIGTYPE_p_void toVoidPointer() throws TileDBError {
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
return PointerUtils.toVoid(int8_tArray);
}
Expand Down Expand Up @@ -724,6 +736,8 @@ public long toCPointer() throws TileDBError {
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
return PointerUtils.toCPtr(int8_tArray);
}
Expand Down Expand Up @@ -837,6 +851,8 @@ public Object toJavaArray(int position, int elements) throws TileDBError {
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
return Utils.int8ArrayGet(int8_tArray, position, elements);
}
Expand Down Expand Up @@ -920,6 +936,8 @@ private void createNativeArrayFromVoidPointer(SWIGTYPE_p_p_void pointer) throws
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
int8_tArray = PointerUtils.int8_tArrayFromVoid(pointer);
break;
Expand Down Expand Up @@ -1013,6 +1031,8 @@ private void createNativeArrayFromVoidPointer(SWIGTYPE_p_void pointer) throws Ti
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
int8_tArray = PointerUtils.int8_tArrayFromVoid(pointer);
break;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/io/tiledb/java/api/Types.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ public static Class getJavaType(Datatype type) throws TileDBError {
}
case TILEDB_INT8:
case TILEDB_BLOB:
case TILEDB_GEOM_WKB:
case TILEDB_GEOM_WKT:
{
return Byte.class;
}
Expand Down
32 changes: 32 additions & 0 deletions .../libtiledb/SWIGTYPE_p_f_p_q_const__char_unsigned_long_unsigned_long_long_p_void__int.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions src/main/java/io/tiledb/libtiledb/tiledb.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/main/java/io/tiledb/libtiledb/tiledbConstants.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/main/java/io/tiledb/libtiledb/tiledbJNI.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/main/java/io/tiledb/libtiledb/tiledb_datatype_t.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/test/java/io/tiledb/java/api/VersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void testVersion() {
Version version = new Version();
System.out.println(version);
Assert.assertTrue(version.getMajor() == 2);
Assert.assertTrue(version.getMinor() == 20);
Assert.assertTrue(version.getRevision() == 1);
Assert.assertTrue(version.getMinor() == 21);
Assert.assertTrue(version.getRevision() == 0);
}
}