From cb549879aa51fd528df48facaaf3e9854cb0d4e9 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Mon, 1 Aug 2022 19:54:44 +0300 Subject: [PATCH 1/5] update to TileDB-2.11.0 --- cmake/Modules/FindTileDB_EP.cmake | 12 ++++---- gradle.properties | 2 +- src/main/c/generated/tiledb_wrap.cxx | 30 +++++++++++++++++++ .../java/io/tiledb/java/api/FragmentInfo.java | 25 ++++++++++++++++ src/main/java/io/tiledb/libtiledb/tiledb.java | 18 +++++++++++ .../io/tiledb/libtiledb/tiledbConstants.java | 3 +- .../java/io/tiledb/libtiledb/tiledbJNI.java | 7 +++++ .../io/tiledb/java/api/ArraySchemaTest.java | 2 +- .../java/io/tiledb/java/api/VersionTest.java | 4 +-- swig/tiledb.i | 1 + 10 files changed, 93 insertions(+), 11 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index f48187da..0f648583 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -48,14 +48,14 @@ 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.10.2/tiledb-windows-x86_64-2.10.2-9ab84f9.zip") - SET(DOWNLOAD_SHA1 "fe6dac320afb08dd3f2f40f2705306f6eb245f8b") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0-rc0/tiledb-windows-x86_64-2.11.0-rc0-a1452f8.zip") + SET(DOWNLOAD_SHA1 "d2cf27709ae8be1f58415ec98578e3448774dc72") elseif(APPLE) # macOS - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-macos-x86_64-2.10.2-9ab84f9.tar.gz") - SET(DOWNLOAD_SHA1 "2be62a6c48c0bd7aeea786414aa32aef26fe6a64") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0-rc0/tiledb-macos-x86_64-2.11.0-rc0-a1452f8.tar.gz") + SET(DOWNLOAD_SHA1 "5fc5e1d84dc8ceb1660c026ab959c72fd4e05dce") else() # Linux - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-linux-x86_64-2.10.2-9ab84f9.tar.gz") - SET(DOWNLOAD_SHA1 "03f6d4892f11cbd939660b78c923325396bd600f") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0-rc0/tiledb-linux-x86_64-2.11.0-rc0-a1452f8.tar.gz") + SET(DOWNLOAD_SHA1 "f03305987eb715a5a8a32f8a0a300e4b43c71903") endif() ExternalProject_Add(ep_tiledb diff --git a/gradle.properties b/gradle.properties index 0bc45b01..6497dd6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.10.2 +TILEDB_GIT_TAG=2.11.0-rc0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF diff --git a/src/main/c/generated/tiledb_wrap.cxx b/src/main/c/generated/tiledb_wrap.cxx index dd2b2a48..ba2eb6e2 100644 --- a/src/main/c/generated/tiledb_wrap.cxx +++ b/src/main/c/generated/tiledb_wrap.cxx @@ -5489,6 +5489,18 @@ SWIGEXPORT jobject JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1timestamp_ } +SWIGEXPORT jstring JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1timestamps(JNIEnv *jenv, jclass jcls) { + jstring jresult = 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + result = (char *)tiledb_timestamps(); + if (result) jresult = jenv->NewStringUTF((const char *)result); + return jresult; +} + + SWIGEXPORT void JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1version(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3) { int32_t *arg1 = (int32_t *) 0 ; int32_t *arg2 = (int32_t *) 0 ; @@ -14018,6 +14030,24 @@ SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1mime_1type_1f } +SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1fragment_1info_1get_1total_1cell_1num(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3) { + jint jresult = 0 ; + tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ; + tiledb_fragment_info_t *arg2 = (tiledb_fragment_info_t *) 0 ; + uint64_t *arg3 = (uint64_t *) 0 ; + int32_t result; + + (void)jenv; + (void)jcls; + arg1 = *(tiledb_ctx_t **)&jarg1; + arg2 = *(tiledb_fragment_info_t **)&jarg2; + arg3 = *(uint64_t **)&jarg3; + result = (int32_t)tiledb_fragment_info_get_total_cell_num(arg1,arg2,arg3); + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jint JNICALL Java_io_tiledb_libtiledb_tiledbJNI_tiledb_1dimension_1dump_1stdout(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) { jint jresult = 0 ; tiledb_ctx_t *arg1 = (tiledb_ctx_t *) 0 ; diff --git a/src/main/java/io/tiledb/java/api/FragmentInfo.java b/src/main/java/io/tiledb/java/api/FragmentInfo.java index 5b8a5659..0ea79b60 100644 --- a/src/main/java/io/tiledb/java/api/FragmentInfo.java +++ b/src/main/java/io/tiledb/java/api/FragmentInfo.java @@ -149,6 +149,31 @@ public long getFragmentSize(long fragmentID) throws TileDBError { return tiledb.ullp_value(size).longValue(); } + /** + * Retrieves the number of cells written to the fragments by the user. + * + *

Contributions from each fragment to the total are as described in following. + * + *

In the case of sparse fragments, this is the number of non-empty cells in the fragment. + * + *

In the case of dense fragments, TileDB may add fill values to populate partially populated + * tiles. Those fill values are counted in the returned number of cells. In other words, the cell + * number is derived from the number of *integral* tiles written in the file. + * + *

note: The count returned is the cumulative total of cells written to all fragments in the + * current fragment_info entity, i.e. count may effectively include multiples for any cells that + * may be overlapping across the various fragments. + * + * @return The total number of cells. + * @throws TileDBError + */ + public long getTotalCellNum() throws TileDBError { + SWIGTYPE_p_unsigned_long_long cellNum = tiledb.new_ullp(); + tiledb.tiledb_fragment_info_get_total_cell_num(ctx.getCtxp(), fragmentInfop, cellNum); + + return tiledb.ullp_value(cellNum).longValue(); + } + /** * Returns true if the fragment with the given index is dense. * diff --git a/src/main/java/io/tiledb/libtiledb/tiledb.java b/src/main/java/io/tiledb/libtiledb/tiledb.java index 0ba7ce02..fef7f045 100644 --- a/src/main/java/io/tiledb/libtiledb/tiledb.java +++ b/src/main/java/io/tiledb/libtiledb/tiledb.java @@ -1193,6 +1193,10 @@ public static SWIGTYPE_p_tiledb_array_schema_evolution_t tiledb_array_schema_evo return (cPtr == 0) ? null : new SWIGTYPE_p_tiledb_array_schema_evolution_t(cPtr, false); } + public static int tiledb_status(int x) { + return tiledbJNI.tiledb_status(x); + } + public static int tiledb_query_type_to_str( tiledb_query_type_t query_type, SWIGTYPE_p_p_char str) { return tiledbJNI.tiledb_query_type_to_str( @@ -1348,6 +1352,10 @@ public static java.math.BigInteger tiledb_timestamp_now_ms() { return tiledbJNI.tiledb_timestamp_now_ms(); } + public static String tiledb_timestamps() { + return tiledbJNI.tiledb_timestamps(); + } + public static void tiledb_version( SWIGTYPE_p_int major, SWIGTYPE_p_int minor, SWIGTYPE_p_int rev) { tiledbJNI.tiledb_version( @@ -5032,6 +5040,16 @@ public static int tiledb_mime_type_from_str(String str, SWIGTYPE_p_tiledb_mime_t str, SWIGTYPE_p_tiledb_mime_type_t.getCPtr(mime_type)); } + public static int tiledb_fragment_info_get_total_cell_num( + SWIGTYPE_p_tiledb_ctx_t ctx, + SWIGTYPE_p_tiledb_fragment_info_t fragment_info, + SWIGTYPE_p_unsigned_long_long count) { + return tiledbJNI.tiledb_fragment_info_get_total_cell_num( + SWIGTYPE_p_tiledb_ctx_t.getCPtr(ctx), + SWIGTYPE_p_tiledb_fragment_info_t.getCPtr(fragment_info), + SWIGTYPE_p_unsigned_long_long.getCPtr(count)); + } + public static int tiledb_dimension_dump_stdout( SWIGTYPE_p_tiledb_ctx_t ctx, SWIGTYPE_p_tiledb_dimension_t dim) { return tiledbJNI.tiledb_dimension_dump_stdout( diff --git a/src/main/java/io/tiledb/libtiledb/tiledbConstants.java b/src/main/java/io/tiledb/libtiledb/tiledbConstants.java index 30d30e45..52b636f7 100644 --- a/src/main/java/io/tiledb/libtiledb/tiledbConstants.java +++ b/src/main/java/io/tiledb/libtiledb/tiledbConstants.java @@ -11,9 +11,10 @@ public interface tiledbConstants { public static final int TILEDB_COMPRESSION_FILTER_DEFAULT_LEVEL = (-30000); public static final int TILEDB_ERR = (-1); + public static final int TILEDB_INVALID_CONTEXT = (-3); public static final int TILEDB_OK = 0; public static final int TILEDB_OOM = (-2); public static final int TILEDB_VERSION_MAJOR = 2; - public static final int TILEDB_VERSION_MINOR = 10; + public static final int TILEDB_VERSION_MINOR = 11; public static final int TILEDB_VERSION_PATCH = 0; } diff --git a/src/main/java/io/tiledb/libtiledb/tiledbJNI.java b/src/main/java/io/tiledb/libtiledb/tiledbJNI.java index 42d1dfb9..2cb0907a 100644 --- a/src/main/java/io/tiledb/libtiledb/tiledbJNI.java +++ b/src/main/java/io/tiledb/libtiledb/tiledbJNI.java @@ -693,6 +693,8 @@ public static final native void uint64_tArray_setitem( public static final native long tiledb_array_schema_evolution_tpp_value(long jarg1); + public static final native int tiledb_status(int jarg1); + public static final native int tiledb_query_type_to_str(int jarg1, long jarg2); public static final native int tiledb_query_type_from_str(String jarg1, long jarg2); @@ -753,6 +755,8 @@ public static final native void uint64_tArray_setitem( public static final native java.math.BigInteger tiledb_timestamp_now_ms(); + public static final native String tiledb_timestamps(); + public static final native void tiledb_version(long jarg1, long jarg2, long jarg3); public static final native int tiledb_error_message(long jarg1, long jarg2); @@ -1744,6 +1748,9 @@ public static final native int tiledb_filestore_buffer_export( public static final native int tiledb_mime_type_from_str(String jarg1, long jarg2); + public static final native int tiledb_fragment_info_get_total_cell_num( + long jarg1, long jarg2, long jarg3); + public static final native int tiledb_dimension_dump_stdout(long jarg1, long jarg2); public static final native int tiledb_attribute_dump_stdout(long jarg1, long jarg2); diff --git a/src/test/java/io/tiledb/java/api/ArraySchemaTest.java b/src/test/java/io/tiledb/java/api/ArraySchemaTest.java index ae552373..38a1635d 100644 --- a/src/test/java/io/tiledb/java/api/ArraySchemaTest.java +++ b/src/test/java/io/tiledb/java/api/ArraySchemaTest.java @@ -148,7 +148,7 @@ public void testArraySchemaSetAllowDups() throws Exception { public void testArraySchemaVersion() throws Exception { try (Context ctx = new Context(); ArraySchema schema = schemaCreate(ctx, ArrayType.TILEDB_SPARSE, layout)) { - Assert.assertEquals(14, schema.getVersion()); + Assert.assertEquals(15, schema.getVersion()); } } diff --git a/src/test/java/io/tiledb/java/api/VersionTest.java b/src/test/java/io/tiledb/java/api/VersionTest.java index 7360064b..5f75bee4 100644 --- a/src/test/java/io/tiledb/java/api/VersionTest.java +++ b/src/test/java/io/tiledb/java/api/VersionTest.java @@ -34,7 +34,7 @@ public void testVersion() { Version version = new Version(); System.out.println(version); Assert.assertTrue(version.getMajor() >= 2); - Assert.assertTrue(version.getMinor() >= 10); - Assert.assertTrue(version.getRevision() >= 2); + Assert.assertTrue(version.getMinor() >= 11); + Assert.assertTrue(version.getRevision() >= 0); } } diff --git a/swig/tiledb.i b/swig/tiledb.i index dbca48a7..fd015795 100644 --- a/swig/tiledb.i +++ b/swig/tiledb.i @@ -45,6 +45,7 @@ import java.nio.ByteBuffer; %include "stdint.i" %include "carrays.i" %array_class(int32_t, int32_tArray); +%array_class(capi_return_t, capi_return_t); %array_class(int64_t, int64_tArray); %array_class(char, charArray); %array_class(float, floatArray); From 1b91af2dd844bef54f4fb147899b6f39adc4609b Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Tue, 2 Aug 2022 21:31:17 +0300 Subject: [PATCH 2/5] add support for the Float scaling filter --- .../java/io/tiledb/java/api/FilterList.java | 2 + .../tiledb/java/api/FloatScalingFilter.java | 223 ++++++++++++++++++ .../libtiledb/tiledb_filter_option_t.java | 5 +- .../libtiledb/tiledb_filter_type_t.java | 3 +- .../java/io/tiledb/java/api/FilterTest.java | 16 ++ 5 files changed, 247 insertions(+), 2 deletions(-) create mode 100644 src/main/java/io/tiledb/java/api/FloatScalingFilter.java diff --git a/src/main/java/io/tiledb/java/api/FilterList.java b/src/main/java/io/tiledb/java/api/FilterList.java index ba52678d..8f23e03d 100644 --- a/src/main/java/io/tiledb/java/api/FilterList.java +++ b/src/main/java/io/tiledb/java/api/FilterList.java @@ -90,6 +90,8 @@ public Filter getFilter(long idx) throws TileDBError { return new CheckSumSHA256Filter(this.ctx, _filterpp); case TILEDB_FILTER_DICTIONARY: return new DictionaryFilter(this.ctx, _filterpp); + case TILEDB_FILTER_SCALE_FLOAT: + return new FloatScalingFilter(this.ctx, _filterpp); default: { tiledb.delete_tiledb_filter_tpp(_filterpp); diff --git a/src/main/java/io/tiledb/java/api/FloatScalingFilter.java b/src/main/java/io/tiledb/java/api/FloatScalingFilter.java new file mode 100644 index 00000000..856b6295 --- /dev/null +++ b/src/main/java/io/tiledb/java/api/FloatScalingFilter.java @@ -0,0 +1,223 @@ +package io.tiledb.java.api; + +import io.tiledb.libtiledb.SWIGTYPE_p_p_tiledb_filter_t; +import io.tiledb.libtiledb.tiledb; +import io.tiledb.libtiledb.tiledb_filter_option_t; +import io.tiledb.libtiledb.tiledb_filter_type_t; + +public class FloatScalingFilter extends Filter { + + /** + * Constructor. + * + * @param ctx The TileDB context + * @throws TileDBError + */ + public FloatScalingFilter(Context ctx) throws TileDBError { + super(ctx, tiledb_filter_type_t.TILEDB_FILTER_SCALE_FLOAT); + } + + /** + * Constructor. + * + * @param ctx The TileDB context + * @param offset The offset param + * @param factor The factor param + * @param byteWidth The byteWidth param + * @throws TileDBError + */ + public FloatScalingFilter(Context ctx, int offset, int factor, int byteWidth) throws TileDBError { + super(ctx, tiledb_filter_type_t.TILEDB_FILTER_SCALE_FLOAT); + try (NativeArray offsetArray = + new NativeArray( + ctx, + new int[] { + offset, + }, + Integer.class); + NativeArray factorArray = + new NativeArray( + ctx, + new int[] { + factor, + }, + Integer.class); + NativeArray byteWidthArray = + new NativeArray( + ctx, + new int[] { + byteWidth, + }, + Integer.class); ) { + ctx.handleError( + tiledb.tiledb_filter_set_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_OFFSET, + offsetArray.toVoidPointer())); + ctx.handleError( + tiledb.tiledb_filter_set_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_FACTOR, + factorArray.toVoidPointer())); + ctx.handleError( + tiledb.tiledb_filter_set_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_BYTEWIDTH, + byteWidthArray.toVoidPointer())); + } catch (TileDBError err) { + super.close(); + throw err; + } + } + + /** + * Sets the offset param + * + * @param ctx The TileDB context. + * @param offset The offset input. + * @throws TileDBError + */ + public void setOffset(Context ctx, int offset) throws TileDBError { + try (NativeArray offsetArray = + new NativeArray( + ctx, + new int[] { + offset, + }, + Integer.class)) { + ctx.handleError( + tiledb.tiledb_filter_set_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_OFFSET, + offsetArray.toVoidPointer())); + } catch (TileDBError err) { + super.close(); + throw err; + } + } + + /** + * Sets the factor param. + * + * @param ctx The TileDB context + * @param factor The factor input + * @throws TileDBError + */ + public void setFactor(Context ctx, int factor) throws TileDBError { + try (NativeArray offsetArray = + new NativeArray( + ctx, + new int[] { + factor, + }, + Integer.class)) { + ctx.handleError( + tiledb.tiledb_filter_set_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_FACTOR, + offsetArray.toVoidPointer())); + } catch (TileDBError err) { + super.close(); + throw err; + } + } + + /** + * Sets the ByteWidth param. + * + * @param ctx The TileDB context + * @param byteWidth The byteWidth param + * @throws TileDBError + */ + public void setByteWidth(Context ctx, int byteWidth) throws TileDBError { + try (NativeArray offsetArray = + new NativeArray( + ctx, + new int[] { + byteWidth, + }, + Integer.class)) { + ctx.handleError( + tiledb.tiledb_filter_set_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_BYTEWIDTH, + offsetArray.toVoidPointer())); + } catch (TileDBError err) { + super.close(); + throw err; + } + } + + /** + * Constructor. + * + * @param ctx The TileDB Context + * @param filterpp + */ + protected FloatScalingFilter(Context ctx, SWIGTYPE_p_p_tiledb_filter_t filterpp) { + super(ctx, filterpp); + } + + /** + * @return The ByteWidth param + * @throws TileDBError + */ + public int getByteWidth() throws TileDBError { + Context ctx = getCtx(); + int window; + try (NativeArray byteWidthArray = new NativeArray(ctx, 1, Integer.class)) { + ctx.handleError( + tiledb.tiledb_filter_get_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_BYTEWIDTH, + byteWidthArray.toVoidPointer())); + window = (int) byteWidthArray.getItem(0); + } + return window; + } + + /** + * @return The factor param + * @throws TileDBError + */ + public int getFactor() throws TileDBError { + Context ctx = getCtx(); + int window; + try (NativeArray factorArray = new NativeArray(ctx, 1, Integer.class)) { + ctx.handleError( + tiledb.tiledb_filter_get_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_FACTOR, + factorArray.toVoidPointer())); + window = (int) factorArray.getItem(0); + } + return window; + } + + /** + * @return The offset param + * @throws TileDBError + */ + public int getOffset() throws TileDBError { + Context ctx = getCtx(); + int window; + try (NativeArray offsetArray = new NativeArray(ctx, 1, Integer.class)) { + ctx.handleError( + tiledb.tiledb_filter_get_option( + ctx.getCtxp(), + getFilterp(), + tiledb_filter_option_t.TILEDB_SCALE_FLOAT_OFFSET, + offsetArray.toVoidPointer())); + window = (int) offsetArray.getItem(0); + } + return window; + } +} diff --git a/src/main/java/io/tiledb/libtiledb/tiledb_filter_option_t.java b/src/main/java/io/tiledb/libtiledb/tiledb_filter_option_t.java index 118361f9..2863f21a 100644 --- a/src/main/java/io/tiledb/libtiledb/tiledb_filter_option_t.java +++ b/src/main/java/io/tiledb/libtiledb/tiledb_filter_option_t.java @@ -11,7 +11,10 @@ public enum tiledb_filter_option_t { TILEDB_COMPRESSION_LEVEL(0), TILEDB_BIT_WIDTH_MAX_WINDOW(1), - TILEDB_POSITIVE_DELTA_MAX_WINDOW(2); + TILEDB_POSITIVE_DELTA_MAX_WINDOW(2), + TILEDB_SCALE_FLOAT_BYTEWIDTH(3), + TILEDB_SCALE_FLOAT_FACTOR(4), + TILEDB_SCALE_FLOAT_OFFSET(5); public final int swigValue() { return swigValue; diff --git a/src/main/java/io/tiledb/libtiledb/tiledb_filter_type_t.java b/src/main/java/io/tiledb/libtiledb/tiledb_filter_type_t.java index e25904b0..ff9b792c 100644 --- a/src/main/java/io/tiledb/libtiledb/tiledb_filter_type_t.java +++ b/src/main/java/io/tiledb/libtiledb/tiledb_filter_type_t.java @@ -22,7 +22,8 @@ public enum tiledb_filter_type_t { TILEDB_FILTER_POSITIVE_DELTA(10), TILEDB_FILTER_CHECKSUM_MD5(12), TILEDB_FILTER_CHECKSUM_SHA256(13), - TILEDB_FILTER_DICTIONARY(14); + TILEDB_FILTER_DICTIONARY(14), + TILEDB_FILTER_SCALE_FLOAT(15); public final int swigValue() { return swigValue; diff --git a/src/test/java/io/tiledb/java/api/FilterTest.java b/src/test/java/io/tiledb/java/api/FilterTest.java index 974a6e65..bc06ec89 100644 --- a/src/test/java/io/tiledb/java/api/FilterTest.java +++ b/src/test/java/io/tiledb/java/api/FilterTest.java @@ -75,6 +75,22 @@ public void testLZ4Filter() throws Exception { } } + @Test + public void testFloatScalingFilter() throws Exception { + try (Context ctx = new Context()) { + try (FloatScalingFilter filter = new FloatScalingFilter(ctx, 10, 10, 10)) { + Assert.assertEquals(filter.getFactor(), 10); + Assert.assertEquals(filter.getOffset(), 10); + Assert.assertEquals(filter.getByteWidth(), 10); + } + try (FloatScalingFilter filter = new FloatScalingFilter(ctx)) { + Assert.assertEquals(filter.getFactor(), 0); + Assert.assertEquals(filter.getOffset(), 0); + Assert.assertEquals(filter.getByteWidth(), 8); + } + } + } + @Test public void testBzip2Filter() throws Exception { try (Context ctx = new Context()) { From ab6ef0c7af3caedf60d4ce73e9e4925b41801472 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Tue, 9 Aug 2022 21:07:18 +0300 Subject: [PATCH 3/5] update to TileDB-2.11.0-Stable --- cmake/Modules/FindTileDB_EP.cmake | 12 ++++++------ gradle.properties | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 0f648583..411424b0 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -48,14 +48,14 @@ 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.11.0-rc0/tiledb-windows-x86_64-2.11.0-rc0-a1452f8.zip") - SET(DOWNLOAD_SHA1 "d2cf27709ae8be1f58415ec98578e3448774dc72") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-windows-x86_64-2.11.0-34e5dbc.zip") + SET(DOWNLOAD_SHA1 "ae60d7bea72472716cb85631c27f8d2ddc7d7dd7") elseif(APPLE) # macOS - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0-rc0/tiledb-macos-x86_64-2.11.0-rc0-a1452f8.tar.gz") - SET(DOWNLOAD_SHA1 "5fc5e1d84dc8ceb1660c026ab959c72fd4e05dce") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-macos-x86_64-2.11.0-34e5dbc.tar.gz") + SET(DOWNLOAD_SHA1 "56e865574404cb11cbd631c7c25ab0cfd413f9b3") else() # Linux - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0-rc0/tiledb-linux-x86_64-2.11.0-rc0-a1452f8.tar.gz") - SET(DOWNLOAD_SHA1 "f03305987eb715a5a8a32f8a0a300e4b43c71903") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-linux-x86_64-2.11.0-34e5dbc.tar.gz") + SET(DOWNLOAD_SHA1 "c2eb91e352905728edfeb8dc0a6fbfd7bc69ef66") endif() ExternalProject_Add(ep_tiledb diff --git a/gradle.properties b/gradle.properties index 6497dd6f..f52bc72b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.11.0-rc0 +TILEDB_GIT_TAG=2.11.0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF From 625e1dab8fb86eaf153b155aa1c51d1081bf48e4 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Wed, 10 Aug 2022 17:27:22 +0300 Subject: [PATCH 4/5] update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index baddd7c0..bfcc8e12 100644 --- a/README.md +++ b/README.md @@ -55,4 +55,5 @@ The below table references which versions of TileDB-Java are compatible with whi | 0.10.X | 2.8.X | | 0.11.X | 2.9.X | | 0.12.X | 2.10.X | +| 0.13.X | 2.11.X | From 5ed68d56552fbbdf0f4e4b00d688d50ea36c1132 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Wed, 10 Aug 2022 17:27:56 +0300 Subject: [PATCH 5/5] update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c736ac36..ab43f9a5 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.tiledb' -version '0.12.2-SNAPSHOT' +version '0.13.0-SNAPSHOT' repositories { jcenter()