Skip to content

Commit 523f84f

Browse files
teo-tsirpanisrobertbindar
authored andcommitted
Hold a reference to the query memory tracker in IterationTileData.
1 parent aef8f9b commit 523f84f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

tiledb/sm/query/readers/dense_reader.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ Status DenseReader::dense_read() {
388388
t_start,
389389
t_end,
390390
std::move(result_space_tiles),
391-
*query_memory_tracker_);
391+
query_memory_tracker_);
392392

393393
// Add the number of cells to process to subarray_end_cell.
394394
for (uint64_t t = t_start; t < t_end; t++) {

tiledb/sm/query/readers/dense_reader.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,14 @@ class DenseReader : public ReaderBase, public IQueryStrategy {
7070
uint64_t t_start,
7171
uint64_t t_end,
7272
std::map<const DimType*, ResultSpaceTile<DimType>>&& result_space_tiles,
73-
MemoryTracker& memory_tracker)
73+
shared_ptr<MemoryTracker> memory_tracker)
7474
: t_start_(t_start)
7575
, t_end_(t_end)
76+
, memory_tracker_(memory_tracker)
7677
, tile_subarrays_(
7778
t_end - t_start,
7879
subarray.dim_num(),
79-
memory_tracker.get_resource(MemoryType::DENSE_TILE_SUBARRAY))
80+
memory_tracker_->get_resource(MemoryType::DENSE_TILE_SUBARRAY))
8081
, result_space_tiles_(std::move(result_space_tiles)) {
8182
auto& tile_coords = subarray.tile_coords();
8283
throw_if_not_ok(
@@ -127,6 +128,9 @@ class DenseReader : public ReaderBase, public IQueryStrategy {
127128
/** End tile to process. */
128129
uint64_t t_end_;
129130

131+
/** Memory tracker. */
132+
shared_ptr<MemoryTracker> memory_tracker_;
133+
130134
/** Tile subarrays. */
131135
tdb::pmr::vector<DenseTileSubarray<DimType>> tile_subarrays_;
132136

0 commit comments

Comments
 (0)