Fixes to tests

ypatia · ypatia · commit c8b6de69ae85 · 2025-01-23T16:57:03.000+02:00
diff --git a/test/src/unit-cppapi-consolidation-with-timestamps.cc b/test/src/unit-cppapi-consolidation-with-timestamps.cc
@@ -685,7 +685,7 @@ TEST_CASE_METHOD(
 
   // Will only allow to load two tiles out of 3.
   Config cfg;
-  cfg.set("sm.mem.total_budget", "60000");
+  cfg.set("sm.mem.total_budget", "50000");
   cfg.set("sm.mem.reader.sparse_global_order.ratio_coords", "0.15");
   ctx_ = Context(cfg);
 
diff --git a/test/src/unit-sparse-global-order-reader.cc b/test/src/unit-sparse-global-order-reader.cc
@@ -564,7 +564,7 @@ TEST_CASE_METHOD(
 
   // Specific relationship for failure not known, but these values
   // will result in failure with data being written.
-  total_budget_ = "30000";
+  total_budget_ = "10000";
   // Failure here occurs with the value of 0.1 for ratio_tile_ranges_.
   update_config();
 
@@ -653,7 +653,7 @@ TEST_CASE_METHOD(
 
   // specific relationship for failure not known, but these values
   // will result in failure with data being written.
-  total_budget_ = "40000";
+  total_budget_ = "15000";
   // Failure here occurs with the value of 0.1 for ratio_tile_ranges_.
   update_config();
 
@@ -791,7 +791,7 @@ TEST_CASE_METHOD(
 
   // Two result tiles (2 * (~4500 + 8) will be bigger than the per fragment
   // budget (3905).
-  total_budget_ = "82000";
+  total_budget_ = "60000";
   ratio_coords_ = "0.11";
   update_config();
 
@@ -1314,7 +1314,7 @@ TEST_CASE_METHOD(
 
   // Two result tile (2 * (~4500 + 8) will be bigger than the per fragment
   // budget (1000).
-  total_budget_ = "45000";
+  total_budget_ = "40000";
   ratio_coords_ = "0.22";
   update_config();
 
diff --git a/tiledb/sm/filter/test/filter_test_support.cc b/tiledb/sm/filter/test/filter_test_support.cc
@@ -159,7 +159,8 @@ shared_ptr<WriterTile> make_increasing_tile(
       Datatype::UINT64,
       cell_size,
       tile_size,
-      tracker);
+      tracker,
+      true);
   for (uint64_t i = 0; i < nelts; i++) {
     CHECK_NOTHROW(tile->write(&i, i * sizeof(uint64_t), sizeof(uint64_t)));
   }
@@ -178,7 +179,8 @@ shared_ptr<WriterTile> make_offsets_tile(
       Datatype::UINT64,
       constants::cell_var_offset_size,
       offsets_tile_size,
-      tracker);
+      tracker,
+      true);
 
   // Set up test data
   for (uint64_t i = 0; i < offsets.size(); i++) {
@@ -204,7 +206,8 @@ Tile create_tile_for_unfiltering(
       tile->filtered_buffer().data(),
       tile->filtered_buffer().size(),
       tracker,
-      ThreadPool::SharedTask()};
+      ThreadPool::SharedTask(),
+      true};
 }
 
 void run_reverse(
diff --git a/tiledb/sm/filter/test/tile_data_generator.h b/tiledb/sm/filter/test/tile_data_generator.h
@@ -68,7 +68,8 @@ class TileDataGenerator {
         datatype(),
         cell_size(),
         original_tile_size(),
-        memory_tracker);
+        memory_tracker,
+        true);
   }
 
   /**
@@ -100,7 +101,8 @@ class TileDataGenerator {
         filtered_buffer.data(),
         filtered_buffer.size(),
         memory_tracker,
-        ThreadPool::SharedTask());
+        ThreadPool::SharedTask(),
+        true);
   }
 
   /** Returns the size of the original unfiltered data. */
@@ -188,7 +190,8 @@ class IncrementTileDataGenerator : public TileDataGenerator {
         Datatype::UINT64,
         constants::cell_var_offset_size,
         offsets.size() * constants::cell_var_offset_size,
-        memory_tracker);
+        memory_tracker,
+        true);
     for (uint64_t index = 0; index < offsets.size(); ++index) {
       CHECK_NOTHROW(offsets_tile->write(
           &offsets[index],
diff --git a/tiledb/sm/tile/tile.cc b/tiledb/sm/tile/tile.cc
@@ -109,13 +109,15 @@ TileBase::TileBase(
     const Datatype type,
     const uint64_t cell_size,
     const uint64_t size,
-    tdb::pmr::memory_resource* resource)
+    tdb::pmr::memory_resource* resource,
+    const bool skip_waiting_on_io_task)
     : resource_(resource)
     , data_(tdb::pmr::make_unique<std::byte>(resource_, size))
     , size_(size)
     , cell_size_(cell_size)
     , format_version_(format_version)
-    , type_(type) {
+    , type_(type)
+    , skip_waiting_on_io_task_(skip_waiting_on_io_task) {
   /*
    * We can check for a bad allocation after initialization without risk
    * because none of the other member variables use its value for their own
@@ -161,26 +163,33 @@ Tile::Tile(
     tdb::pmr::memory_resource* resource,
     ThreadPool::SharedTask filtered_data_io_task,
     const bool skip_waiting_on_io_task)
-    : TileBase(format_version, type, cell_size, size, resource)
+    : TileBase(
+          format_version,
+          type,
+          cell_size,
+          size,
+          resource,
+          skip_waiting_on_io_task)
     , zipped_coords_dim_num_(zipped_coords_dim_num)
     , filtered_data_(filtered_data)
     , filtered_size_(filtered_size)
-    , filtered_data_io_task_(std::move(filtered_data_io_task))
-    , skip_waiting_on_io_task_(skip_waiting_on_io_task) {
+    , filtered_data_io_task_(std::move(filtered_data_io_task)) {
 }
 
 WriterTile::WriterTile(
     const format_version_t format_version,
     const Datatype type,
     const uint64_t cell_size,
     const uint64_t size,
-    shared_ptr<MemoryTracker> memory_tracker)
+    shared_ptr<MemoryTracker> memory_tracker,
+    const bool skip_waiting_on_io_task)
     : TileBase(
           format_version,
           type,
           cell_size,
           size,
-          memory_tracker->get_resource(MemoryType::WRITER_TILE_DATA))
+          memory_tracker->get_resource(MemoryType::WRITER_TILE_DATA),
+          skip_waiting_on_io_task)
     , filtered_buffer_(0) {
 }
 
@@ -189,8 +198,15 @@ WriterTile::WriterTile(
     const Datatype type,
     const uint64_t cell_size,
     const uint64_t size,
-    tdb::pmr::memory_resource* resource)
-    : TileBase(format_version, type, cell_size, size, resource)
+    tdb::pmr::memory_resource* resource,
+    const bool skip_waiting_on_io_task)
+    : TileBase(
+          format_version,
+          type,
+          cell_size,
+          size,
+          resource,
+          skip_waiting_on_io_task)
     , filtered_buffer_(0) {
 }
 
diff --git a/tiledb/sm/tile/tile.h b/tiledb/sm/tile/tile.h
@@ -68,7 +68,8 @@ class TileBase {
       const Datatype type,
       const uint64_t cell_size,
       const uint64_t size,
-      tdb::pmr::memory_resource* resource);
+      tdb::pmr::memory_resource* resource,
+      const bool skip_waiting_on_io_task);
 
   DISABLE_COPY_AND_COPY_ASSIGN(TileBase);
   DISABLE_MOVE_AND_MOVE_ASSIGN(TileBase);
@@ -181,6 +182,11 @@ class TileBase {
 
   /** The tile data type. */
   Datatype type_;
+
+  /**
+   * Whether to block waiting for io data to be ready before accessing data()
+   */
+  const bool skip_waiting_on_io_task_;
 };
 
 /**
@@ -428,11 +434,6 @@ class Tile : public TileBase {
    * need a mutex since the tile will be accessed by multiple threads.
    */
   mutable std::recursive_mutex filtered_data_io_task_mtx_;
-
-  /**
-   * Whether to block waiting for io data to be ready before accessing data()
-   */
-  const bool skip_waiting_on_io_task_;
 };
 
 /**
@@ -483,7 +484,8 @@ class WriterTile : public TileBase {
       const Datatype type,
       const uint64_t cell_size,
       const uint64_t size,
-      shared_ptr<MemoryTracker> memory_tracker);
+      shared_ptr<MemoryTracker> memory_tracker,
+      const bool skip_waiting_on_io_task = false);
 
   /**
    * Constructor.
@@ -499,7 +501,8 @@ class WriterTile : public TileBase {
       const Datatype type,
       const uint64_t cell_size,
       const uint64_t size,
-      tdb::pmr::memory_resource* resource);
+      tdb::pmr::memory_resource* resource,
+      const bool skip_waiting_on_io_task = false);
 
   DISABLE_COPY_AND_COPY_ASSIGN(WriterTile);
   DISABLE_MOVE_AND_MOVE_ASSIGN(WriterTile);
