<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7ef0ce40ac211a04d1fad220231093aa65e720e6">https://github.com/macports/macports-ports/commit/7ef0ce40ac211a04d1fad220231093aa65e720e6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7ef0ce40ac2 tiledb: update to 2.19.1, fix building tests variant
</span>7ef0ce40ac2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7ef0ce40ac211a04d1fad220231093aa65e720e6
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Feb 1 10:27:33 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> tiledb: update to 2.19.1, fix building tests variant
</span>---
databases/tiledb/Portfile | 43 ++++++++++---
databases/tiledb/files/patch-2.19.1.diff | 56 +++++++++++++++++
databases/tiledb/files/patch-libatomic-32-bit.diff | 72 ++++++++++++++++++++++
databases/tiledb/files/patch-random.diff | 56 +++++++++++++++++
...atch-unit_capi_error_tree.cc-temporary-fix.diff | 32 ++++++++++
5 files changed, 250 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/tiledb/Portfile b/databases/tiledb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index efb1e33e910..49eb6aa7756 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/tiledb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/tiledb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ legacysupport.newest_darwin_requires_legacy 19
</span> # See discussion in: https://github.com/macports/macports-ports/pull/19686
legacysupport.use_mp_libcxx yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup TileDB-Inc TileDB 2.19.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup TileDB-Inc TileDB 2.19.1
</span> name tiledb
revision 0
categories databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span> description The universal storage engine
long_description {*}${description}
homepage https://tiledb.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b2d4dc9dd9c3900c6b6690880afbbed3af39e06d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c607801c4ecda58005e84db3b8b1f72da0100a5b7e149601358b9a254afff962 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4386918
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5090fbe9f0b49a499e3a1a313e49b5b25e58ca7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6a73b1b7d2ee5305f919d9f94883abc68e8c948257e22ce8771a72a22b46d95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4386342
</span> github.tarball_from archive
# Notice that 32-bit platforms are not supported by upstream, and there are reports elsewhere
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +70,23 @@ if {${os.platform} eq "darwin" && ${os.major} < 20} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# This should be dropped with the next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixes here are either already in upstream/dev or to-become-irrelevant.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-2.19.1.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/TileDB-Inc/TileDB/pull/4690
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-random.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Verify if still broken in the next release. Relevant only for build with +tests:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/TileDB-Inc/TileDB/issues/4590
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-unit_capi_error_tree.cc-temporary-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Can be rewritten unconditionally, but no point in making a patch more complex:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}] && ${configure.build_arch} in [arm i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libatomic-32-bit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2020
# https://github.com/TileDB-Inc/TileDB/issues/4566
compiler.blacklist-append {clang < 1400}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,19 +127,27 @@ if {${build_arch} eq "i386" && [string match *clang* ${configure.compiler}]} {
</span>
destroot.target install-tiledb
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# FIXME: ppc32 tests build, but fail to pass. Possibly size of bool issue?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ppc64 tests are much better, though not clean. See above.
</span> variant tests description "Enable testing" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is needed only if a bundled Catch2 is used:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PortGroup conflicts_build 1.0
</span>
if {${configure.build_arch} in [list i386 ppc]} {
cmake.build_type Debug
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use bundled catch2 due to regular breakages. See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is a tricky part. We may need to switch between
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Macports-provided Catch2 and a bundled one. Related:
</span> # https://github.com/TileDB-Inc/TileDB/issues/4590
# https://github.com/TileDB-Inc/TileDB/issues/4095
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port:catch2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build catch2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:catch2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # As of 2.19.1, bundled one is broken:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # :info:build Undefined symbols:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # :info:build "__ZN5Catch29formatReconstructedExpressionERSoRKSsNS_9StringRefES2_", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # :info:build __ZNK5Catch10BinaryExprIRKN9__gnu_cxx17__normal_iteratorIPiSt6vectorIiSaIiEEEES9_E29streamReconstructedExpressionERSo in test_assert.cc.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # conflicts_build catch2
</span>
configure.pre_args-replace \
-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/tiledb/files/patch-2.19.1.diff b/databases/tiledb/files/patch-2.19.1.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..23c23429861
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/tiledb/files/patch-2.19.1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+These are specific to 2.19.1 and to be dropped with the next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/sm/query/readers/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/sm/query/readers/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,4 +28,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commence(unit_test readers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_sources(main.cc unit_reader_base.cc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this_target_object_libraries(baseline)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conclude(unit_test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/sm/misc/test/unit_uuid.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/sm/misc/test/unit_uuid.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace tiledb::sm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-std::mutex catch2_macro_mutex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern std::mutex catch2_macro_mutex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // A thread-safe variant of the REQUIRE macro.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define REQUIRE_SAFE(a) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/src/unit-cppapi-global-order-writes-remote.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/src/unit-cppapi-global-order-writes-remote.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstring>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <numeric>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace tiledb;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/src/unit-enumerations.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/src/unit-enumerations.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2073,7 +2073,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_CASE_METHOD(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EnumerationFx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Cap'N Proto - Basic New ArraySchema Serialization",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "[enumeration][capnp][basic][initialized-in-ram") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "[enumeration][capnp][basic][initialized-in-ram]") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto client_side = GENERATE(true, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto ser_type = GENERATE(SerializationType::CAPNP, SerializationType::JSON);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/src/unit-dimension.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/src/unit-dimension.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -273,7 +273,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_CASE(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Dimension: Test map_to_uint64, float32",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "[dimension][map_to_uint64][float32") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "[dimension][map_to_uint64][float32]") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Create dimensions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dimension d1("d1", Datatype::FLOAT32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float dom1[] = {0.0f, 1.0f};
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/tiledb/files/patch-libatomic-32-bit.diff b/databases/tiledb/files/patch-libatomic-32-bit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b0acb9c69d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/tiledb/files/patch-libatomic-32-bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,72 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6be77374803628b592b722d5335bae3e616755c6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 1 Feb 2024 01:37:45 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix building some tests which need libatomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiledb/api/c_api/enumeration/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiledb/api/c_api/string/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiledb/api/c_api_support/exception_wrapper/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiledb/common/thread_pool/test/CMakeLists.txt | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiledb/sm/query/readers/aggregators/test/CMakeLists.txt | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 5 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tiledb/api/c_api/enumeration/CMakeLists.txt tiledb/api/c_api/enumeration/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af077b988..78feda977 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/api/c_api/enumeration/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/api/c_api/enumeration/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@ gather_sources(${SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commence(object_library capi_enumeration_stub)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_sources(enumeration_api.cc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- this_target_link_libraries(export)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this_target_link_libraries(export atomic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_object_libraries(capi_buffer_stub constants)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_object_libraries(enumeration)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conclude(object_library)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tiledb/api/c_api/string/CMakeLists.txt tiledb/api/c_api/string/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3ce1872d1..e8c8b3df4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/api/c_api/string/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/api/c_api/string/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@ gather_sources(${SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commence(object_library capi_string)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_sources(${SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- this_target_link_libraries(export)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this_target_link_libraries(export atomic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_object_libraries(baseline capi_context_stub)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conclude(object_library)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tiledb/api/c_api_support/exception_wrapper/CMakeLists.txt tiledb/api/c_api_support/exception_wrapper/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7d6669f31..bef1f163c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/api/c_api_support/exception_wrapper/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/api/c_api_support/exception_wrapper/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@ gather_sources(${SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commence(object_library exception_wrapper)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_sources(${SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- this_target_link_libraries(export)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this_target_link_libraries(export atomic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_object_libraries(baseline thread_pool config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conclude(object_library)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tiledb/common/thread_pool/test/CMakeLists.txt tiledb/common/thread_pool/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 39a7426ae..df0b8221a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/common/thread_pool/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/common/thread_pool/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,4 +33,5 @@ commence(unit_test thread_pool)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a part of the thread pool.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_object_libraries(cancelable_tasks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_sources(main.cc unit_thread_pool.cc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this_target_link_libraries(atomic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conclude(unit_test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tiledb/sm/query/readers/aggregators/test/CMakeLists.txt tiledb/sm/query/readers/aggregators/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 386fd236b..a17498fc6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/sm/query/readers/aggregators/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/sm/query/readers/aggregators/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,4 +29,5 @@ include(unit_test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commence(unit_test aggregators)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_sources(main.cc bench_aggregators.cc unit_aggregate_with_count.cc unit_aggregation_policies.cc unit_aggregators.cc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this_target_object_libraries(aggregators)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this_target_link_libraries(atomic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conclude(unit_test)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/tiledb/files/patch-random.diff b/databases/tiledb/files/patch-random.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8088995d574
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/tiledb/files/patch-random.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/TileDB-Inc/TileDB/pull/4690
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tiledb/common/thread_pool/test/unit_thread_pool.cc tiledb/common/thread_pool/test/unit_thread_pool.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 99131dd90..18dfd31da 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/common/thread_pool/test/unit_thread_pool.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/common/thread_pool/test/unit_thread_pool.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdio>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <random>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tiledb/common/thread_pool.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tiledb/sm/misc/cancelable_tasks.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/src/unit-tile-metadata-generator.cc test/src/unit-tile-metadata-generator.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cd3a1b07c..b754f7fda 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/src/unit-tile-metadata-generator.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/src/unit-tile-metadata-generator.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Tests the TileMetadataGenerator class.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <random>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <test/support/tdb_catch.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "test/support/src/helpers.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tiledb/common/common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/src/unit-tile-metadata.cc test/src/unit-tile-metadata.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 89281332f..f478b2d30 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/src/unit-tile-metadata.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/src/unit-tile-metadata.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * load_tile_*_values and get_tile_* apis of fragment metadata.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <random>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <test/support/tdb_catch.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "test/support/src/helpers.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tiledb/sm/c_api/tiledb_struct_def.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tiledb/sm/query/readers/aggregators/test/bench_aggregators.cc tiledb/sm/query/readers/aggregators/test/bench_aggregators.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d88e135f4..f714249d8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/sm/query/readers/aggregators/test/bench_aggregators.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/sm/query/readers/aggregators/test/bench_aggregators.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Benchmarks the `AggregateWithCount` class.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <random>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tiledb/common/common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tiledb/sm/query/readers/aggregators/aggregate_buffer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tiledb/sm/query/readers/aggregators/aggregate_with_count.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/tiledb/files/patch-unit_capi_error_tree.cc-temporary-fix.diff b/databases/tiledb/files/patch-unit_capi_error_tree.cc-temporary-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..53427236dd6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/tiledb/files/patch-unit_capi_error_tree.cc-temporary-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 279a8e0b5fd676daffb75e8f1227f695d1bf14a3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 1 Feb 2024 01:47:37 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] unit_capi_error_tree.cc: temporary fix to broken source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../exception_wrapper/test/unit_capi_error_tree.cc | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tiledb/api/c_api_support/exception_wrapper/test/unit_capi_error_tree.cc tiledb/api/c_api_support/exception_wrapper/test/unit_capi_error_tree.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 839ce5ebf..e4f748736 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tiledb/api/c_api_support/exception_wrapper/test/unit_capi_error_tree.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tiledb/api/c_api_support/exception_wrapper/test/unit_capi_error_tree.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -309,14 +309,16 @@ TEST_CASE("ErrorTreeTest - single node", "[error_tree_test]") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x.visit(v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK(v.value() == "x");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Temporary hack. See: https://github.com/TileDB-Inc/TileDB/issues/4590
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_CASE("ErrorTreeTest - two wide", "[error_tree_test]") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ErrorTreeTest x{{{Error{"a", "b"}, {}}, {Error{"c", "d"}, {}}}};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SkeletonVisitor<Error> v{};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x.visit(v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK(v.value() == "x,x");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_CASE("ErrorTreeTest - two deep", "[error_tree_test]") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ErrorTreeTest x{{{Error{"a", "b"}, {{Error{"c", "d"}, {}}}}}};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SkeletonVisitor<Error> v{};
</span></pre><pre style='margin:0'>
</pre>