Merge branch 'dev' into yt/sc-48774/fragment_list_consolidation

Author: ypatia

.github/workflows/build-windows.yml

@@ -61,6 +61,7 @@ jobs:
       TILEDB_WEBP: ${{ matrix.TILEDB_WEBP }}
       TILEDB_CMAKE_BUILD_TYPE: 'Release'
       VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
+      CXXFLAGS: '/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR' # https://github.com/actions/runner-images/issues/10004
     steps:
       - name: 'tiledb env prep'
         run: |

.github/workflows/unit-test-runs.yml

@@ -10,7 +10,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        # Temporarily reverting to windows-2019 until https://github.com/actions/runner-images/issues/10004 gets fixed.
+        os: [macos-latest, ubuntu-latest, windows-2019]
       fail-fast: false
     name: Build - ${{ matrix.os }}
     timeout-minutes: 90
@@ -53,6 +54,11 @@ jobs:
         shell: bash
         if: ${{ !startsWith(matrix.os, 'windows-') }}
 
+      - name: 'Print env'
+        run: set
+        shell: cmd
+        if: ${{ startsWith(matrix.os, 'windows-') }}
+
       - name: 'Build standalone unit tests'
         run: |
           cmake -S . \

format_spec/FORMAT_SPEC.md

@@ -4,7 +4,7 @@ title: Format Specification
 
 **Notes:**
 
-* The current TileDB format version number is **21** (`uint32_t`).
+* The current TileDB format version number is **22** (`uint32_t`).
 * Data written by TileDB and referenced in this document is **little-endian**
   with the following exceptions:
 

format_spec/array_schema.md

@@ -54,6 +54,7 @@ The array schema file consists of a single [generic tile](./generic_tile.md), wi
 | Label 1 | [Dimension Label](#dimension_label) | First dimension label |
 | … | … | … |
 | Label N | [Dimension Label](#dimension_label) | Nth dimension label |
+| CurrentDomain | [CurrentDomain](./current_domain.md) | The array current domain |
 
 ## Domain
 

format_spec/current_domain.md

@@ -0,0 +1,15 @@
+---
+title: Current Domain
+---
+
+## Main Structure
+
+The array current domain is stored within the [Array Schema](./array_schema.md#array-schema-file)
+file. If a current domain is empty, only the version number and the empty flag are serialized to storage.
+
+| **Field** | **Type** | **Description** |
+| :--- | :--- | :--- |
+| Version number | `uint32_t` | Current domain version number |
+| Empty | `uint8_t` | Whether the current domain has a representation(e.g. NDRectangle) set or not |
+| Type | `uint8_t` | The type of current domain stored in this file |
+| NDRectangle | [MBR](./fragment.md#mbr) | A hyperrectangle defined using [1DRange](./fragment.md#mbr) items for each dimension |

ports/triplets/x64-windows-asan.cmake

@@ -7,3 +7,7 @@ set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
 # bigobj is needed for capnp.
 set(VCPKG_C_FLAGS "/fsanitize=address /bigobj")
 set(VCPKG_CXX_FLAGS "/fsanitize=address /bigobj")
+
+# https://github.com/actions/runner-images/issues/10004
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")

ports/triplets/x64-windows.cmake

@@ -2,4 +2,8 @@ set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 
+# https://github.com/actions/runner-images/issues/10004
+set(VCPKG_C_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_CXX_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+
 set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)

test/src/unit-capi-array_schema.cc

@@ -921,7 +921,11 @@ void ArraySchemaFx::load_and_check_array_schema(const std::string& path) {
       "- Cell val num: " + CELL_VAL_NUM_STR + "\n" + "- Filters: 2\n" +
       "  > BZIP2: COMPRESSION_LEVEL=5\n" +
       "  > BitWidthReduction: BIT_WIDTH_MAX_WINDOW=1000\n" +
-      "- Fill value: " + FILL_VALUE_STR + "\n";
+      "- Fill value: " + FILL_VALUE_STR + "\n" + "### Current domain ###\n" +
+      "- Version: " +
+      std::to_string(tiledb::sm::constants::current_domain_version) + "\n" +
+      "- Empty: 1" + "\n";
+
   FILE* gold_fout = fopen("gold_fout.txt", "w");
   const char* dump = dump_str.c_str();
   fwrite(dump, sizeof(char), strlen(dump), gold_fout);

test/src/unit-s3.cc

@@ -35,7 +35,7 @@
 #include <test/support/tdb_catch.h>
 #include "test/support/src/helpers.h"
 #include "test/support/src/vfs_helpers.h"
-#include "tiledb/common/thread_pool.h"
+#include "tiledb/common/thread_pool/thread_pool.h"
 #include "tiledb/sm/config/config.h"
 #include "tiledb/sm/filesystem/s3.h"
 #include "tiledb/sm/global_state/unit_test_config.h"

test/src/unit-sparse-unordered-with-dups-reader.cc

@@ -1002,7 +1002,7 @@ TEST_CASE_METHOD(
     write_1d_fragment(coords4.data(), &coords4_size, data4.data(), &data4_size);
   }
 
-  total_budget_ = "3000000";
+  total_budget_ = "3300000";
   ratio_array_data_ = "0.002";
   partial_tile_offsets_loading_ =
       enable_partial_tile_offsets_loading ? "true" : "false";