Address most review comments

Author: ypatia

test/src/unit-sparse-global-order-reader.cc

@@ -789,9 +789,10 @@ TEST_CASE_METHOD(
     write_1d_fragment(coords, &coords_size, data, &data_size);
   }
 
-  // Two result tiles (2 * (~4500 + 8) will be bigger than the per fragment
-  // budget (3905).
-  total_budget_ = "60000";
+  // Two result tiles (2 * (2736 + 8)) = 5488 will be bigger than the per
+  // fragment budget (50000 * 0.11 / 2 fragments = 2750), so only one result
+  // tile will be loaded each time.
+  total_budget_ = "50000";
   ratio_coords_ = "0.11";
   update_config();
 
@@ -1312,8 +1313,9 @@ TEST_CASE_METHOD(
     write_1d_fragment(coords, &coords_size, data, &data_size);
   }
 
-  // Two result tile (2 * (~4500 + 8) will be bigger than the per fragment
-  // budget (1000).
+  // Two result tiles (2 * (2736 + 8)) = 5488 will be bigger than the per
+  // fragment budget (40000 * 0.22 /2 frag = 4400), so only one will be loaded
+  // each time.
   total_budget_ = "40000";
   ratio_coords_ = "0.22";
   update_config();

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

@@ -1066,10 +1066,9 @@ TEST_CASE_METHOD(
       CHECK(1 == loop_num->second);
     }
     /**
-     * FIXME: The loop_num appears to be different on different
-     * architectures/build modes. SC-61065 to investigate why. } else { CHECK(20
-     * == loop_num->second);
-     * }
+     * We can't do a similar check for multiple fragments as it is architecture
+     * dependent how many tiles fit in the memory budget. And thus also
+     * architecture dependent as to how many internal loops we have.
      */
 
     // Try to read multiple frags without partial tile offset reading. Should

tiledb/sm/filter/CMakeLists.txt

@@ -32,7 +32,7 @@ include(object_library)
 #
 commence(object_library filter)
     this_target_sources(filter.cc filter_buffer.cc filter_storage.cc)
-    this_target_object_libraries(baseline buffer tiledb_crypto thread_pool)
+    this_target_object_libraries(baseline buffer tiledb_crypto)
 conclude(object_library)
 
 #

tiledb/sm/query/readers/result_tile.cc

@@ -93,14 +93,14 @@ ResultTile::ResultTile(
 
 ResultTile::~ResultTile() {
   try {
-    // Wait for all tasks to be done
-    wait_all_attrs();
+    // Wait for all attribute tasks to be done
+    wait_all_tiles(attr_tiles_);
   } catch (...) {
   }
 
   try {
-    // Wait for all tasks to be done
-    wait_all_coords();
+    // Wait for all coordinates tasks to be done
+    wait_all_tiles(coord_tiles_);
   } catch (...) {
   }
 }
@@ -275,23 +275,10 @@ ResultTile::TileTuple* ResultTile::tile_tuple(const std::string& name) {
   return nullptr;
 }
 
-void ResultTile::wait_all_coords() const {
-  for (auto& at : coord_tiles_) {
-    auto& tile_tuple = at.second;
-    if (tile_tuple.has_value()) {
-      tile_tuple.value().fixed_tile().data();
-      if (tile_tuple.value().var_tile_opt().has_value()) {
-        tile_tuple.value().var_tile_opt().value().data();
-      }
-      if (tile_tuple.value().validity_tile_opt().has_value()) {
-        tile_tuple.value().validity_tile_opt().value().data();
-      }
-    }
-  }
-}
-
-void ResultTile::wait_all_attrs() const {
-  for (auto& at : attr_tiles_) {
+void ResultTile::wait_all_tiles(
+    const std::vector<std::pair<std::string, optional<TileTuple>>>& tiles)
+    const {
+  for (auto& at : tiles) {
     const auto& tile_tuple = at.second;
     if (tile_tuple.has_value()) {
       tile_tuple.value().fixed_tile().data();

tiledb/sm/query/readers/result_tile.h

@@ -742,11 +742,10 @@ class ResultTile {
       const uint64_t min_cell,
       const uint64_t max_cell) const;
 
-  /* Waits for all coord tiles results to be available */
-  void wait_all_coords() const;
-
-  /* Waits for all attr tiles results to be available */
-  void wait_all_attrs() const;
+  /* Waits for all tiles results to be available */
+  void wait_all_tiles(
+      const std::vector<std::pair<std::string, optional<TileTuple>>>& tiles)
+      const;
 
  protected:
   /* ********************************* */