Skip to content

Commit ba74ae2

Browse files
committed
Revert "[Backport release-2.27] Result tile wait_all should block on the async i/o result (#5446) (#5458)"
This reverts commit 4ca5544.
1 parent c1428f9 commit ba74ae2

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

tiledb/sm/query/readers/result_tile.cc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,15 +281,12 @@ void ResultTile::wait_all_tiles(
281281
for (auto& at : tiles) {
282282
const auto& tile_tuple = at.second;
283283
if (tile_tuple.has_value()) {
284-
// Wait for the fixed tile i/o to be done
285-
tile_tuple.value().fixed_tile().filtered_data();
284+
tile_tuple.value().fixed_tile().data();
286285
if (tile_tuple.value().var_tile_opt().has_value()) {
287-
// Wait for the var tile i/o to be done
288-
tile_tuple.value().var_tile_opt().value().filtered_data();
286+
tile_tuple.value().var_tile_opt().value().data();
289287
}
290288
if (tile_tuple.value().validity_tile_opt().has_value()) {
291-
// Wait for the validity tile i/o to be done
292-
tile_tuple.value().validity_tile_opt().value().filtered_data();
289+
tile_tuple.value().validity_tile_opt().value().data();
293290
}
294291
}
295292
}

tiledb/sm/tile/tile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ class Tile : public TileBase {
280280
}
281281

282282
/** Returns the buffer that contains the filtered, on-disk format. */
283-
inline char* filtered_data() const {
283+
inline char* filtered_data() {
284284
std::scoped_lock<std::recursive_mutex> lock{filtered_data_io_task_mtx_};
285285
if (filtered_data_io_task_.has_value()) {
286286
if (filtered_data_io_task_.value().valid()) {

0 commit comments

Comments
 (0)