Skip to content

Commit b890edb

Browse files
authored
Merge pull request #140 from TileDB-Inc/victorgiannakouris/ch1335/update-for-tiledb-1-7-2
Update for TileDB 1 7 2 [ch1335]
2 parents 6bef2b3 + 9a259bd commit b890edb

File tree

92 files changed

+147
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+147
-101
lines changed

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=dev
2+
TILEDB_GIT_TAG=1.7.2
33
TILEDB_VERBOSE=OFF
44
TILEDB_S3=OFF
55
TILEDB_HDFS=OFF

src/main/c/generated/tiledb_wrap.cxx

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* This file is not intended to be easily readable and contains a number of
66
* coding conventions designed to improve portability and efficiency. Do not make
@@ -182,15 +182,16 @@ template <typename T> T SwigValueInit() {
182182

183183
/* Support for throwing Java exceptions */
184184
typedef enum {
185-
SWIG_JavaOutOfMemoryError = 1,
186-
SWIG_JavaIOException,
187-
SWIG_JavaRuntimeException,
185+
SWIG_JavaOutOfMemoryError = 1,
186+
SWIG_JavaIOException,
187+
SWIG_JavaRuntimeException,
188188
SWIG_JavaIndexOutOfBoundsException,
189189
SWIG_JavaArithmeticException,
190190
SWIG_JavaIllegalArgumentException,
191191
SWIG_JavaNullPointerException,
192192
SWIG_JavaDirectorPureVirtual,
193-
SWIG_JavaUnknownError
193+
SWIG_JavaUnknownError,
194+
SWIG_JavaIllegalStateException,
194195
} SWIG_JavaExceptionCodes;
195196

196197
typedef struct {
@@ -211,6 +212,7 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
211212
{ SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
212213
{ SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
213214
{ SWIG_JavaUnknownError, "java/lang/UnknownError" },
215+
{ SWIG_JavaIllegalStateException, "java/lang/IllegalStateException" },
214216
{ (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" }
215217
};
216218
const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
@@ -8096,6 +8098,33 @@ SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1array_1get_1m
80968098
}
80978099

80988100

8101+
SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1array_1has_1metadata_1key(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jstring jarg3, jlong jarg4, jlong jarg5) {
8102+
jint jresult = 0 ;
8103+
tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;
8104+
tiledb_array_t *arg2 = (tiledb_array_t *) 0 ;
8105+
char *arg3 = (char *) 0 ;
8106+
tiledb_datatype_t *arg4 = (tiledb_datatype_t *) 0 ;
8107+
int32_t *arg5 = (int32_t *) 0 ;
8108+
int32_t result;
8109+
8110+
(void)jenv;
8111+
(void)jcls;
8112+
arg1 = *(tiledb_ctx_t **)&jarg1;
8113+
arg2 = *(tiledb_array_t **)&jarg2;
8114+
arg3 = 0;
8115+
if (jarg3) {
8116+
arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
8117+
if (!arg3) return 0;
8118+
}
8119+
arg4 = *(tiledb_datatype_t **)&jarg4;
8120+
arg5 = *(int32_t **)&jarg5;
8121+
result = (int32_t)tiledb_array_has_metadata_key(arg1,arg2,(char const *)arg3,arg4,arg5);
8122+
jresult = (jint)result;
8123+
if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
8124+
return jresult;
8125+
}
8126+
8127+
80998128
SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1array_1consolidate_1metadata(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jlong jarg3) {
81008129
jint jresult = 0 ;
81018130
tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* Do not make changes to this file unless you know what you are doing--modify
66
* the SWIG interface file instead.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* Do not make changes to this file unless you know what you are doing--modify
66
* the SWIG interface file instead.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* Do not make changes to this file unless you know what you are doing--modify
66
* the SWIG interface file instead.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* Do not make changes to this file unless you know what you are doing--modify
66
* the SWIG interface file instead.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* Do not make changes to this file unless you know what you are doing--modify
66
* the SWIG interface file instead.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* Do not make changes to this file unless you know what you are doing--modify
66
* the SWIG interface file instead.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* Do not make changes to this file unless you know what you are doing--modify
66
* the SWIG interface file instead.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 4.0.0
3+
* Version 4.0.1
44
*
55
* Do not make changes to this file unless you know what you are doing--modify
66
* the SWIG interface file instead.

0 commit comments

Comments
 (0)