Skip to content

Commit

Permalink
Remove duplicate memory variables
Browse files Browse the repository at this point in the history
Spotted by Luc in code review.
  • Loading branch information
davisp authored and abigalekim committed Feb 7, 2024
1 parent 8a3c6d4 commit 06776da
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 9 deletions.
3 changes: 1 addition & 2 deletions tiledb/sm/query/readers/dense_reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ DenseReader::DenseReader(
shared_ptr<Logger> logger,
StrategyParams& params,
bool remote_query)
: ReaderBase(stats, logger->clone("DenseReader", ++logger_id_), params)
, array_memory_tracker_(params.array_memory_tracker()) {
: ReaderBase(stats, logger->clone("DenseReader", ++logger_id_), params) {
elements_mode_ = false;

// Sanity checks.
Expand Down
3 changes: 0 additions & 3 deletions tiledb/sm/query/readers/dense_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,6 @@ class DenseReader : public ReaderBase, public IQueryStrategy {
/** Target upper memory limit for tiles. */
uint64_t tile_upper_memory_limit_;

/** Memory tracker object for the array. */
shared_ptr<MemoryTracker> array_memory_tracker_;

/* ********************************* */
/* PRIVATE METHODS */
/* ********************************* */
Expand Down
1 change: 0 additions & 1 deletion tiledb/sm/query/readers/sparse_index_reader_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ SparseIndexReaderBase::SparseIndexReaderBase(
, tmp_read_state_(array_->fragment_metadata().size())
, memory_budget_(config_, reader_string)
, include_coords_(include_coords)
, array_memory_tracker_(params.array_memory_tracker())
, memory_used_for_coords_total_(0)
, deletes_consolidation_no_purge_(
buffers_.count(constants::delete_timestamps) != 0)
Expand Down
3 changes: 0 additions & 3 deletions tiledb/sm/query/readers/sparse_index_reader_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -540,9 +540,6 @@ class SparseIndexReaderBase : public ReaderBase {
/** Are dimensions var sized. */
std::vector<bool> is_dim_var_size_;

/** Memory tracker object for the array. */
shared_ptr<MemoryTracker> array_memory_tracker_;

/** Memory used for coordinates tiles. */
std::atomic<uint64_t> memory_used_for_coords_total_;

Expand Down

0 comments on commit 06776da

Please sign in to comment.