Skip to content

Commit 195ef84

Browse files
update to TileDB-2.26.0 (#371)
* update to TileDB-2.26.0 * implement dump methods as ```toString()``` Overrides
1 parent e440d07 commit 195ef84

27 files changed

+468
-480
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group 'io.tiledb'
12-
version '0.27.0-SNAPSHOT'
12+
version '0.28.0-SNAPSHOT'
1313

1414
repositories {
1515
mavenCentral()

cmake/Modules/FindTileDB_EP.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,30 +48,30 @@ 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.25.0/tiledb-windows-x86_64-2.25.0-bbcbd3f.zip")
52-
SET(DOWNLOAD_SHA1 "b2b8cdfefbcbb07296c86e52cb9a2979ef455d2a")
51+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.26.0/tiledb-windows-x86_64-2.26.0-983b716.zip")
52+
SET(DOWNLOAD_SHA1 "ee66c3f86d32aa1c88e233c25455141d764eff47")
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")
5757

58-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0/tiledb-macos-x86_64-2.25.0-bbcbd3f.tar.gz")
59-
SET(DOWNLOAD_SHA1 "9c799d7de64e78d9e95cfa7db95b569cd3d3c8b0")
58+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.26.0/tiledb-macos-x86_64-2.26.0-983b716.tar.gz")
59+
SET(DOWNLOAD_SHA1 "e218ef0c5c6bc7ce55e423f6ad63ca8dd0b7719e")
6060

6161
elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
6262
message(STATUS "Building for apple silicon mac")
63-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0/tiledb-macos-arm64-2.25.0-bbcbd3f.tar.gz")
64-
SET(DOWNLOAD_SHA1 "c6a1ab5213c36e53dd8e6da87c18b8bc695c532d")
63+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.26.0/tiledb-macos-arm64-2.26.0-983b716.tar.gz")
64+
SET(DOWNLOAD_SHA1 "9372924a4e8945bdfddb5c9b1741233aa8ff504e")
6565
endif()
6666
else() # Linux
6767
if (USE_AVX2)
6868
message(STATUS "Using Linux binaries with AVX2")
69-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0/tiledb-linux-x86_64-2.25.0-bbcbd3f.tar.gz")
70-
SET(DOWNLOAD_SHA1 "1d789af5d88ce09edf60d16ea3988631e780252a")
69+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.26.0/tiledb-linux-x86_64-2.26.0-983b716.tar.gz")
70+
SET(DOWNLOAD_SHA1 "b2abfc91285653050a4cb743a71d7c2f2f9a89c4")
7171
else()
7272
message(STATUS "Using Linux binaries without AVX2")
73-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0/tiledb-linux-x86_64-noavx2-2.25.0-bbcbd3f.tar.gz")
74-
SET(DOWNLOAD_SHA1 "02f3b9951e5d21614ea0d577190161aed2b04240")
73+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.26.0/tiledb-linux-x86_64-noavx2-2.26.0-983b716.tar.gz")
74+
SET(DOWNLOAD_SHA1 "337da10f222afe3727166d92de66e480304179bb")
7575
endif()
7676
endif()
7777

generate_tiledb_jni

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ fi
9797

9898
# define the necessary macro constants
9999
# (removed during preprocessor macro expansion)
100-
g++ -dM -I ${prefix_dir}/include -x c++-header -E ${tiledb_header} ${tiledb_experimental_header} | grep "#define TILEDB" > swig/tiledb_generated.h ||
101-
die "could not write ./swig/tiledb_generated.h tmp file"
102-
103-
## remove system headers
104-
awk '!/#\s*include/ || /tiledb_/ || /tiledb\/api/ {print}' ${tiledb_header} ${tiledb_experimental_header} |
105-
g++ -E -P -nostdinc++ -I "${prefix_dir}/include/tiledb" -I "${prefix_dir}/include/" -x c++ - >> swig/tiledb_generated.h ||
106-
die "error generating temp combined swig/tiledb_generated.h header for swig generation"
100+
#g++ -dM -I ${prefix_dir}/include -x c++-header -E ${tiledb_header} ${tiledb_experimental_header} | grep "#define TILEDB" > swig/tiledb_generated.h ||
101+
# die "could not write ./swig/tiledb_generated.h tmp file"
102+
#
103+
### remove system headers
104+
#awk '!/#\s*include/ || /tiledb_/ || /tiledb\/api/ {print}' ${tiledb_header} ${tiledb_experimental_header} |
105+
# g++ -E -P -nostdinc++ -I "${prefix_dir}/include/tiledb" -I "${prefix_dir}/include/" -x c++ - >> swig/tiledb_generated.h ||
106+
# die "error generating temp combined swig/tiledb_generated.h header for swig generation"
107107

108108
# if existing libtiledb generated source exists, delete it
109109
cleanup_java() {

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.25.0
2+
TILEDB_GIT_TAG=2.26.0
33
TILEDB_VERBOSE=ON
44
TILEDB_S3=ON
55
TILEDB_AZURE=OFF

src/main/c/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ The `tiledb_wrap.cxx` file under this directory contains the auto-generated JNI
1010
The `tiledb_custom.cxx` file under this directory contains custom methods defined by the developer that are not
1111
auto-generated. Any custom method that needs to be added should be put in this file. Also, the signature of the
1212
new custom method should be also put in the `tiledb.i` file under the `TileDB-Java/swig` dir. For implementation details,
13-
all `*_nio` methods (e.g. `tiledb_query_set_subarray_nio`) are good examples.
13+
all `*_nio` methods (e.g. `tiledb_query_set_offsets_buffer_nio`) are good examples.

src/main/c/custom/tiledb_custom.cxx

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,25 +1110,6 @@ extern "C" {
11101110
return jresult;
11111111
}
11121112

1113-
SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1subarray_1nio(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jobject jarg3) {
1114-
void* buffer = (void *)jenv->GetDirectBufferAddress(jarg3);
1115-
1116-
jint jresult = 0 ;
1117-
tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;
1118-
tiledb_query_t *arg2 = (tiledb_query_t *) 0 ;
1119-
void *arg3 = (void *) 0 ;
1120-
int32_t result;
1121-
1122-
(void)jenv;
1123-
(void)jcls;
1124-
arg1 = *(tiledb_ctx_t **)&jarg1;
1125-
arg2 = *(tiledb_query_t **)&jarg2;
1126-
arg3 = *(void **)&jarg3;
1127-
result = (int32_t)tiledb_query_set_subarray(arg1,arg2,buffer);
1128-
jresult = (jint)result;
1129-
return jresult;
1130-
}
1131-
11321113
SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1query_1set_1data_1buffer_1nio(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jobject jarg4, jlong jarg5) {
11331114
void* buffer = (void *)jenv->GetDirectBufferAddress(jarg4);
11341115

0 commit comments

Comments
 (0)