Rename TILE_WRITER_DATA -> WRITER_TILE_DATA

TileDB-Inc · Mar 13, 2024 · d1189ef · d1189ef
1 parent dce3b7e
commit d1189ef
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/tiledb/common/memory_tracker.cc b/tiledb/common/memory_tracker.cc
@@ -90,8 +90,8 @@ std::string memory_type_to_str(MemoryType type) {
       return "Domains";
     case MemoryType::TILE_SUMS:
       return "TileSums";
-    case MemoryType::TILE_WRITER_DATA:
-      return "TileWriterData";
+    case MemoryType::WRITER_TILE_DATA:
+      return "WriterTileData";
     case MemoryType::METADATA:
       return "Metadata";
     case MemoryType::WRITER_DATA:

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

diff --git a/tiledb/sm/query/writers/global_order_writer.cc b/tiledb/sm/query/writers/global_order_writer.cc
@@ -114,7 +114,7 @@ GlobalOrderWriter::~GlobalOrderWriter() {
 
 GlobalOrderWriter::GlobalWriteState::GlobalWriteState(
     shared_ptr<MemoryTracker> memory_tracker)
-    : last_tiles_(memory_tracker->get_resource(MemoryType::TILE_WRITER_DATA))
+    : last_tiles_(memory_tracker->get_resource(MemoryType::WRITER_TILE_DATA))
     , last_var_offsets_(memory_tracker->get_resource(MemoryType::WRITER_DATA))
     , cells_written_(memory_tracker->get_resource(MemoryType::WRITER_DATA)) {
 }
@@ -757,7 +757,7 @@ Status GlobalOrderWriter::global_write() {
   }
 
   tdb::pmr::unordered_map<std::string, WriterTileTupleVector> tiles(
-      query_memory_tracker_->get_resource(MemoryType::TILE_WRITER_DATA));
+      query_memory_tracker_->get_resource(MemoryType::WRITER_TILE_DATA));
   RETURN_CANCEL_OR_ERROR(prepare_full_tiles(coord_dups, &tiles));
 
   // Find number of tiles and gather stats

diff --git a/tiledb/sm/query/writers/unordered_writer.cc b/tiledb/sm/query/writers/unordered_writer.cc
@@ -677,7 +677,7 @@ Status UnorderedWriter::unordered_write() {
 
   // Prepare tiles
   tdb::pmr::unordered_map<std::string, WriterTileTupleVector> tiles(
-      query_memory_tracker_->get_resource(MemoryType::TILE_WRITER_DATA));
+      query_memory_tracker_->get_resource(MemoryType::WRITER_TILE_DATA));
   RETURN_CANCEL_OR_ERROR(prepare_tiles(&tiles));
 
   // No tiles

diff --git a/tiledb/sm/query/writers/writer_base.cc b/tiledb/sm/query/writers/writer_base.cc
@@ -1208,12 +1208,12 @@ 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)) {
+    , list_(memory_tracker->get_resource(sm::MemoryType::WRITER_TILE_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)) {
+    , list_(memory_tracker->get_resource(sm::MemoryType::WRITER_TILE_DATA)) {
 }
diff --git a/tiledb/sm/tile/tile.cc b/tiledb/sm/tile/tile.cc
@@ -174,7 +174,7 @@ WriterTile::WriterTile(
           type,
           cell_size,
           size,
-          memory_tracker->get_resource(MemoryType::TILE_WRITER_DATA))
+          memory_tracker->get_resource(MemoryType::WRITER_TILE_DATA))
     , filtered_buffer_(0) {
 }