Changes from review

TileDB-Inc · Mar 12, 2024 · dce3b7e · dce3b7e
1 parent 5240b1b
commit dce3b7e
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 63 deletions.
diff --git a/tiledb/CMakeLists.txt b/tiledb/CMakeLists.txt
@@ -138,7 +138,6 @@ endif()
 set(TILEDB_CORE_SOURCES
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/common/memory.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/common/stdx_string.cc
-  ${TILEDB_CORE_INCLUDE_DIR}/tiledb/common/indexed_list.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/common/interval/interval.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/common/types/dynamic_typed_datum.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/platform/cert_file.cc

diff --git a/tiledb/common/indexed_list.cc b/tiledb/common/indexed_list.cc
diff --git a/tiledb/common/memory_tracker.cc b/tiledb/common/memory_tracker.cc
@@ -94,6 +94,8 @@ std::string memory_type_to_str(MemoryType type) {
       return "TileWriterData";
     case MemoryType::METADATA:
       return "Metadata";
+    case MemoryType::WRITER_DATA:
+      return "WriterData";
   }
 
   auto val = std::to_string(static_cast<uint32_t>(type));

diff --git a/tiledb/common/memory_tracker.h b/tiledb/common/memory_tracker.h
@@ -122,7 +122,8 @@ enum class MemoryType {
   METADATA,
   DOMAINS,
   TILE_SUMS,
-  TILE_WRITER_DATA
+  TILE_WRITER_DATA,
+  WRITER_DATA
 };
 
 /**

diff --git a/tiledb/sm/query/readers/reader_base.cc b/tiledb/sm/query/readers/reader_base.cc
@@ -31,6 +31,7 @@
  */
 
 #include "tiledb/sm/query/readers/reader_base.h"
+#include "tiledb/common/indexed_list.h"
 #include "tiledb/common/logger.h"
 #include "tiledb/sm/array/array.h"
 #include "tiledb/sm/array_schema/array_schema.h"
@@ -1369,3 +1370,10 @@ template void ReaderBase::validate_attribute_order<uint64_t>(
     std::vector<uint64_t>&);
 
 }  // namespace tiledb::sm
+
+template <>
+IndexedList<tiledb::sm::ResultTile>::IndexedList(
+    shared_ptr<tiledb::sm::MemoryTracker> memory_tracker)
+    : memory_tracker_(memory_tracker)
+    , list_(memory_tracker->get_resource(sm::MemoryType::TILE_DATA)) {
+}
diff --git a/tiledb/sm/query/writers/global_order_writer.cc b/tiledb/sm/query/writers/global_order_writer.cc
@@ -115,8 +115,8 @@ GlobalOrderWriter::~GlobalOrderWriter() {
 GlobalOrderWriter::GlobalWriteState::GlobalWriteState(
     shared_ptr<MemoryTracker> memory_tracker)
     : last_tiles_(memory_tracker->get_resource(MemoryType::TILE_WRITER_DATA))
-    , last_var_offsets_(memory_tracker->get_resource(MemoryType::TILE_OFFSETS))
-    , cells_written_(memory_tracker->get_resource(MemoryType::TILE_SUMS)) {
+    , last_var_offsets_(memory_tracker->get_resource(MemoryType::WRITER_DATA))
+    , cells_written_(memory_tracker->get_resource(MemoryType::WRITER_DATA)) {
 }
 
 /* ****************************** */

diff --git a/tiledb/sm/query/writers/unordered_writer.cc b/tiledb/sm/query/writers/unordered_writer.cc
@@ -89,8 +89,7 @@ UnorderedWriter::UnorderedWriter(
           remote_query,
           fragment_name)
     , frag_uri_(std::nullopt)
-    , cell_pos_(
-          query_memory_tracker_->get_resource(MemoryType::TILE_WRITER_DATA))
+    , cell_pos_(query_memory_tracker_->get_resource(MemoryType::WRITER_DATA))
     , written_buffers_(written_buffers)
     , is_coords_pass_(true) {
   // Check the layout is unordered.

diff --git a/tiledb/sm/query/writers/writer_base.cc b/tiledb/sm/query/writers/writer_base.cc
@@ -1203,3 +1203,17 @@ bool WriterBase::remote_query() const {
 }
 
 }  // namespace tiledb::sm
+
+template <>
+IndexedList<tiledb::sm::WriterTileTuple>::IndexedList(
+    shared_ptr<tiledb::sm::MemoryTracker> memory_tracker)
+    : memory_tracker_(memory_tracker)
+    , list_(memory_tracker->get_resource(sm::MemoryType::TILE_WRITER_DATA)) {
+}
+
+template <>
+IndexedList<tiledb::common::IndexedList<tiledb::sm::WriterTileTuple>>::
+    IndexedList(shared_ptr<tiledb::sm::MemoryTracker> memory_tracker)
+    : memory_tracker_(memory_tracker)
+    , list_(memory_tracker->get_resource(sm::MemoryType::TILE_WRITER_DATA)) {
+}