Skip to content

Commit

Permalink
Fix ASAN failure
Browse files Browse the repository at this point in the history
  • Loading branch information
ypatia committed Jan 14, 2025
1 parent 9e7915b commit 395f6ba
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions tiledb/sm/query/readers/result_tile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,14 @@ 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().filtered_data();
tile_tuple.value().fixed_tile().data();
if (tile_tuple.value().var_tile_opt().has_value()) {
tile_tuple.value().var_tile_opt().value().filtered_data();
tile_tuple.value().var_tile_opt().value().data();
}
if (tile_tuple.value().validity_tile_opt().has_value()) {
tile_tuple.value().validity_tile_opt().value().filtered_data();
tile_tuple.value().validity_tile_opt().value().data();
}
}
Expand All @@ -294,11 +297,14 @@ void ResultTile::wait_all_attrs() const {
for (auto& at : attr_tiles_) {
const auto& tile_tuple = at.second;
if (tile_tuple.has_value()) {
tile_tuple.value().fixed_tile().filtered_data();
tile_tuple.value().fixed_tile().data();
if (tile_tuple.value().var_tile_opt().has_value()) {
tile_tuple.value().var_tile_opt().value().filtered_data();
tile_tuple.value().var_tile_opt().value().data();
}
if (tile_tuple.value().validity_tile_opt().has_value()) {
tile_tuple.value().validity_tile_opt().value().filtered_data();
tile_tuple.value().validity_tile_opt().value().data();
}
}
Expand Down
2 changes: 1 addition & 1 deletion tiledb/sm/tile/tile.h
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ class Tile : public TileBase {
}

/** Returns the buffer that contains the filtered, on-disk format. */
inline char* filtered_data() {
inline char* filtered_data() const {
// if an i/o task has been launched
if (filtered_data_block_ != nullptr) {
std::scoped_lock<std::recursive_mutex> lock{filtered_data_io_task_mtx_};
Expand Down

0 comments on commit 395f6ba

Please sign in to comment.