From d5ed2ba65a7cec9b82bf7e1cbd80c4d793340cd9 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Thu, 11 Jul 2024 20:07:08 +0300 Subject: [PATCH 1/3] update to TileDB-2.25.0 --- build.gradle | 2 +- cmake/Modules/FindTileDB_EP.cmake | 20 +++++++++---------- gradle.properties | 2 +- .../io/tiledb/java/api/ArraySchemaTest.java | 2 +- .../java/io/tiledb/java/api/QueryTest.java | 2 +- .../java/io/tiledb/java/api/VersionTest.java | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index e4fdb4e8..135e5a9c 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.tiledb' -version '0.26.2-SNAPSHOT' +version '0.27.0-SNAPSHOT' repositories { mavenCentral() diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index e32f8e1c..90b535bf 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -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.24.2/tiledb-windows-x86_64-2.24.2-76cd03c.zip") - SET(DOWNLOAD_SHA1 "516c38ae6c41c8eb127b5795e5470708f701eca9") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc0/tiledb-windows-x86_64-2.25.0-rc0-ca07b03.zip") + SET(DOWNLOAD_SHA1 "fa3843b05f81fe2d6acc846ee51df0eb0c83043c") 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.24.2/tiledb-macos-x86_64-2.24.2-76cd03c.tar.gz") - SET(DOWNLOAD_SHA1 "41bad04dcef7e09784fff41cc7e2c9d61570af70") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc0/tiledb-macos-x86_64-2.25.0-rc0-ca07b03.tar.gz") + SET(DOWNLOAD_SHA1 "205ec6c2ff01a4f3a02de8433b5e9a2989a077c9") 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.24.2/tiledb-macos-arm64-2.24.2-76cd03c.tar.gz") - SET(DOWNLOAD_SHA1 "f0bc50bfa41555c8d58415a644fc89f6f91c429e") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc0/tiledb-macos-arm64-2.25.0-rc0-ca07b03.tar.gz") + SET(DOWNLOAD_SHA1 "589abc4cb88cc6f261d7d35996cedcb52c208bf1") 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.24.2/tiledb-linux-x86_64-2.24.2-76cd03c.tar.gz") - SET(DOWNLOAD_SHA1 "dd5a321486141609db3ec1bbd9a4e670c6105390") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc0/tiledb-linux-x86_64-2.25.0-rc0-ca07b03.tar.gz") + SET(DOWNLOAD_SHA1 "fc561332034b53e1358acf45ad48d55ba8076261") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.24.2/tiledb-linux-x86_64-noavx2-2.24.2-76cd03c.tar.gz") - SET(DOWNLOAD_SHA1 "e5e9874ddd0cddb2481826998484f46669de836b") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc0/tiledb-linux-x86_64-noavx2-2.25.0-rc0-ca07b03.tar.gz") + SET(DOWNLOAD_SHA1 "9bd3edbdd0385840b6469fc097436ce3fa021983") endif() endif() diff --git a/gradle.properties b/gradle.properties index 8a1ed94b..242f255f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.24.2 +TILEDB_GIT_TAG=2.25.0-rc0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF diff --git a/src/test/java/io/tiledb/java/api/ArraySchemaTest.java b/src/test/java/io/tiledb/java/api/ArraySchemaTest.java index 6d8091ed..21074065 100644 --- a/src/test/java/io/tiledb/java/api/ArraySchemaTest.java +++ b/src/test/java/io/tiledb/java/api/ArraySchemaTest.java @@ -154,7 +154,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(21, schema.getVersion()); + Assert.assertEquals(22, schema.getVersion()); } } diff --git a/src/test/java/io/tiledb/java/api/QueryTest.java b/src/test/java/io/tiledb/java/api/QueryTest.java index b5d7d99e..c5c79903 100644 --- a/src/test/java/io/tiledb/java/api/QueryTest.java +++ b/src/test/java/io/tiledb/java/api/QueryTest.java @@ -1354,7 +1354,7 @@ public void sparseArrayReadTest() throws Exception { Pair, Long> estimated = query.getEstResultSizeVarNullable(ctx, "a2"); Assert.assertEquals(40, (long) estimated.getFirst().getFirst()); Assert.assertEquals(40, (long) estimated.getFirst().getFirst()); - Assert.assertEquals(10, (long) estimated.getSecond()); + Assert.assertEquals(5, (long) estimated.getSecond()); // Submit query query.submit(); diff --git a/src/test/java/io/tiledb/java/api/VersionTest.java b/src/test/java/io/tiledb/java/api/VersionTest.java index a234dbec..76101556 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() == 24); - Assert.assertTrue(version.getRevision() == 2); + Assert.assertTrue(version.getMinor() == 25); + Assert.assertTrue(version.getRevision() == 0); } } From 48b4306f64108720afc329882d6a3672a0823aee Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Tue, 23 Jul 2024 15:34:59 +0300 Subject: [PATCH 2/3] update to TileDB-2.25.0-rc1 --- cmake/Modules/FindTileDB_EP.cmake | 20 ++++++++++---------- gradle.properties | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 90b535bf..8f8fe91c 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -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.25.0-rc0/tiledb-windows-x86_64-2.25.0-rc0-ca07b03.zip") - SET(DOWNLOAD_SHA1 "fa3843b05f81fe2d6acc846ee51df0eb0c83043c") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc1/tiledb-windows-x86_64-2.25.0-rc1-9ac1c76.zip") + SET(DOWNLOAD_SHA1 "8cc6216d830b7c5e4426d3792e53bf82cfd9f14d") 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.25.0-rc0/tiledb-macos-x86_64-2.25.0-rc0-ca07b03.tar.gz") - SET(DOWNLOAD_SHA1 "205ec6c2ff01a4f3a02de8433b5e9a2989a077c9") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc1/tiledb-macos-x86_64-2.25.0-rc1-9ac1c76.tar.gz") + SET(DOWNLOAD_SHA1 "4f8bbe8092178b3f58f6bf62e45ac442df5d842a") 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.25.0-rc0/tiledb-macos-arm64-2.25.0-rc0-ca07b03.tar.gz") - SET(DOWNLOAD_SHA1 "589abc4cb88cc6f261d7d35996cedcb52c208bf1") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc1/tiledb-macos-arm64-2.25.0-rc1-9ac1c76.tar.gz") + SET(DOWNLOAD_SHA1 "671036ef61dabdd972dd2108441daf53cadf1884") 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.25.0-rc0/tiledb-linux-x86_64-2.25.0-rc0-ca07b03.tar.gz") - SET(DOWNLOAD_SHA1 "fc561332034b53e1358acf45ad48d55ba8076261") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc1/tiledb-linux-x86_64-2.25.0-rc1-9ac1c76.tar.gz") + SET(DOWNLOAD_SHA1 "276ac1571bfaaddc545168501b008a17a876899a") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc0/tiledb-linux-x86_64-noavx2-2.25.0-rc0-ca07b03.tar.gz") - SET(DOWNLOAD_SHA1 "9bd3edbdd0385840b6469fc097436ce3fa021983") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc1/tiledb-linux-x86_64-noavx2-2.25.0-rc1-9ac1c76.tar.gz") + SET(DOWNLOAD_SHA1 "ef22dcea7c169018a21ffa12e8042993c058a6f3") endif() endif() diff --git a/gradle.properties b/gradle.properties index 242f255f..cb609ade 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.25.0-rc0 +TILEDB_GIT_TAG=2.25.0-rc1 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF From 4d4c352ac9ba815269b05871992f7c4e0ba9fe70 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Thu, 25 Jul 2024 13:54:35 +0300 Subject: [PATCH 3/3] update to TileDB-2.25.0 --- cmake/Modules/FindTileDB_EP.cmake | 20 ++++++++++---------- gradle.properties | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 8f8fe91c..564db306 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -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.25.0-rc1/tiledb-windows-x86_64-2.25.0-rc1-9ac1c76.zip") - SET(DOWNLOAD_SHA1 "8cc6216d830b7c5e4426d3792e53bf82cfd9f14d") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0/tiledb-windows-x86_64-2.25.0-bbcbd3f.zip") + SET(DOWNLOAD_SHA1 "b2b8cdfefbcbb07296c86e52cb9a2979ef455d2a") 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.25.0-rc1/tiledb-macos-x86_64-2.25.0-rc1-9ac1c76.tar.gz") - SET(DOWNLOAD_SHA1 "4f8bbe8092178b3f58f6bf62e45ac442df5d842a") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0/tiledb-macos-x86_64-2.25.0-bbcbd3f.tar.gz") + SET(DOWNLOAD_SHA1 "9c799d7de64e78d9e95cfa7db95b569cd3d3c8b0") 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.25.0-rc1/tiledb-macos-arm64-2.25.0-rc1-9ac1c76.tar.gz") - SET(DOWNLOAD_SHA1 "671036ef61dabdd972dd2108441daf53cadf1884") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0/tiledb-macos-arm64-2.25.0-bbcbd3f.tar.gz") + SET(DOWNLOAD_SHA1 "c6a1ab5213c36e53dd8e6da87c18b8bc695c532d") 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.25.0-rc1/tiledb-linux-x86_64-2.25.0-rc1-9ac1c76.tar.gz") - SET(DOWNLOAD_SHA1 "276ac1571bfaaddc545168501b008a17a876899a") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0/tiledb-linux-x86_64-2.25.0-bbcbd3f.tar.gz") + SET(DOWNLOAD_SHA1 "1d789af5d88ce09edf60d16ea3988631e780252a") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.25.0-rc1/tiledb-linux-x86_64-noavx2-2.25.0-rc1-9ac1c76.tar.gz") - SET(DOWNLOAD_SHA1 "ef22dcea7c169018a21ffa12e8042993c058a6f3") + 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") + SET(DOWNLOAD_SHA1 "02f3b9951e5d21614ea0d577190161aed2b04240") endif() endif() diff --git a/gradle.properties b/gradle.properties index cb609ade..68d67b6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.25.0-rc1 +TILEDB_GIT_TAG=2.25.0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF