Skip to content

Commit 190712d

Browse files
update to TileDB-2.16.2
1 parent 1de8c6e commit 190712d

File tree

8 files changed

+13
-49
lines changed

8 files changed

+13
-49
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,5 @@ The below table references which versions of TileDB-Java are compatible with whi
6060
| 0.15.X | 2.13.X |
6161
| 0.16.X | 2.14.X |
6262
| 0.17.X | 2.15.X |
63+
| 0.18.X | 2.16.X |
6364

cmake/Modules/FindTileDB_EP.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ 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.16.0-rc0/tiledb-windows-x86_64-2.16.0-rc0-d4a37a6.zip")
52-
SET(DOWNLOAD_SHA1 "5237ce7dcfa07d629e00a32c41f366e4a52a11f2")
51+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.2/tiledb-windows-x86_64-2.16.2-07b65de.zip")
52+
SET(DOWNLOAD_SHA1 "1cda23235ceeff70cb2b30e0c0e22fcd9fd83b51")
5353
elseif(APPLE) # macOS
54-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.0-rc0/tiledb-macos-x86_64-2.16.0-rc0-d4a37a6.tar.gz")
55-
SET(DOWNLOAD_SHA1 "619741d8a8936e0fb6bc19ace9c111c29dfe226a")
54+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.2/tiledb-macos-x86_64-2.16.2-07b65de.tar.gz")
55+
SET(DOWNLOAD_SHA1 "355233cee1515857c91b2f12fe4f7bbc1ac02465")
5656
else() # Linux
57-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.0-rc0/tiledb-linux-x86_64-2.16.0-rc0-d4a37a6.tar.gz")
58-
SET(DOWNLOAD_SHA1 "c8ddba2c0f7bfecbb8df62d67ba1b7d98b79d000")
57+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.2/tiledb-linux-x86_64-2.16.2-07b65de.tar.gz")
58+
SET(DOWNLOAD_SHA1 "b9fc44a104f31a9348a399e55ef9e32903b99590")
5959
endif()
6060

6161
ExternalProject_Add(ep_tiledb

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
2-
TILEDB_GIT_TAG=2.16.0-rc0
2+
TILEDB_GIT_TAG=2.16.2
33
TILEDB_VERBOSE=ON
44
TILEDB_S3=ON
55
TILEDB_AZURE=OFF
66
TILEDB_HDFS=OFF
77
TILEDB_SERIALIZATION=OFF
8-
FORCE_BUILD_TILEDB=ON
8+
FORCE_BUILD_TILEDB=OFF
99
DOWNLOAD_TILEDB_PREBUILT=ON
1010
TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK=ON

src/main/c/generated/tiledb_wrap.cxx

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6770,30 +6770,6 @@ SWIGEXPORT jlong JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1filter_1list
67706770
}
67716771

67726772

6773-
SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_sys_1nerr_1get(JNIEnv *jenv, jclass jcls) {
6774-
jint jresult = 0 ;
6775-
int result;
6776-
6777-
(void)jenv;
6778-
(void)jcls;
6779-
result = (int)(int)sys_nerr;
6780-
jresult = (jint)result;
6781-
return jresult;
6782-
}
6783-
6784-
6785-
SWIGEXPORT jlong JNICALL Java_io_tiledb_libtiledb_tiledbJNI_sys_1errlist_1get(JNIEnv *jenv, jclass jcls) {
6786-
jlong jresult = 0 ;
6787-
char **result = 0 ;
6788-
6789-
(void)jenv;
6790-
(void)jcls;
6791-
result = (char **)(char **)sys_errlist;
6792-
*(char ***)&jresult = result;
6793-
return jresult;
6794-
}
6795-
6796-
67976773
SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1dimension_1alloc(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jint jarg3, jlong jarg4, jlong jarg5, jlong jarg6) {
67986774
jint jresult = 0 ;
67996775
tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public FragmentInfo(Context ctx, String uri, Config config) throws TileDBError {
4848
* @param config the TileDB config
4949
* @throws TileDBError
5050
*/
51-
private void setConfig(Config config) throws TileDBError {
51+
public void setConfig(Config config) throws TileDBError {
5252
try {
5353
ctx.handleError(
5454
tiledb.tiledb_fragment_info_set_config(
@@ -686,12 +686,12 @@ public String getFragmentName(long fragmentID) throws TileDBError {
686686
* @return The fragment name.
687687
* @throws TileDBError
688688
*/
689-
public String getFragmentNameV2(long fragmentID) throws TileDBError {
689+
public TileDBString getFragmentNameV2(long fragmentID) throws TileDBError {
690690
SWIGTYPE_p_p_tiledb_string_handle_t name = tiledb.new_tiledb_string_handle_tpp();
691691

692692
ctx.handleError(
693693
tiledb.tiledb_fragment_info_get_fragment_name_v2(
694694
ctx.getCtxp(), fragmentInfop, fragmentID, name));
695-
return new TileDBString(ctx, name).getView().getFirst();
695+
return new TileDBString(ctx, name);
696696
}
697697
}

src/main/java/io/tiledb/libtiledb/tiledb.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,15 +1972,6 @@ public static capi_return_t tiledb_filter_list_get_max_chunk_size(
19721972
true);
19731973
}
19741974

1975-
public static int getSys_nerr() {
1976-
return tiledbJNI.sys_nerr_get();
1977-
}
1978-
1979-
public static SWIGTYPE_p_p_char getSys_errlist() {
1980-
long cPtr = tiledbJNI.sys_errlist_get();
1981-
return (cPtr == 0) ? null : new SWIGTYPE_p_p_char(cPtr, false);
1982-
}
1983-
19841975
public static int tiledb_dimension_alloc(
19851976
SWIGTYPE_p_tiledb_ctx_t ctx,
19861977
String name,

src/main/java/io/tiledb/libtiledb/tiledbJNI.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -887,10 +887,6 @@ public static final native long tiledb_filter_list_get_filter_from_index(
887887
public static final native long tiledb_filter_list_get_max_chunk_size(
888888
long jarg1, long jarg2, long jarg3);
889889

890-
public static final native int sys_nerr_get();
891-
892-
public static final native long sys_errlist_get();
893-
894890
public static final native int tiledb_dimension_alloc(
895891
long jarg1, String jarg2, int jarg3, long jarg4, long jarg5, long jarg6);
896892

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() == 16);
38-
Assert.assertTrue(version.getRevision() == 0);
38+
Assert.assertTrue(version.getRevision() == 2);
3939
}
4040
}

0 commit comments

Comments
 (0)