From 78ac1d2ec338fd468eb63481e85049215908e39f Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Fri, 19 Jul 2024 21:21:15 +0300 Subject: [PATCH] Use the term "enumeration filename" in code. --- tiledb/sm/array_schema/array_schema.cc | 20 ++++++++++---------- tiledb/sm/array_schema/array_schema.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tiledb/sm/array_schema/array_schema.cc b/tiledb/sm/array_schema/array_schema.cc index 332c22c4e22..eeaf6472b0b 100644 --- a/tiledb/sm/array_schema/array_schema.cc +++ b/tiledb/sm/array_schema/array_schema.cc @@ -188,8 +188,8 @@ ArraySchema::ArraySchema( dim_map_[dim->name()] = dim; } - for (auto& [enmr_name, enmr_uri] : enumeration_path_map_) { - (void)enmr_uri; + for (auto& [enmr_name, enmr_filename] : enumeration_path_map_) { + (void)enmr_filename; enumeration_map_[enmr_name] = nullptr; } @@ -822,14 +822,14 @@ void ArraySchema::serialize(Serializer& serializer) const { utils::safe_integral_cast(enumeration_map_.size()); serializer.write(enmr_num); - for (auto& [enmr_name, enmr_uri] : enumeration_path_map_) { + for (auto& [enmr_name, enmr_filename] : enumeration_path_map_) { auto enmr_name_size = static_cast(enmr_name.size()); serializer.write(enmr_name_size); serializer.write(enmr_name.data(), enmr_name_size); - auto enmr_uri_size = static_cast(enmr_uri.size()); - serializer.write(enmr_uri_size); - serializer.write(enmr_uri.data(), enmr_uri_size); + auto enmr_filename_size = static_cast(enmr_filename.size()); + serializer.write(enmr_filename_size); + serializer.write(enmr_filename.data(), enmr_filename_size); } // Serialize array current domain information @@ -1377,11 +1377,11 @@ shared_ptr ArraySchema::deserialize( std::string enmr_name( deserializer.get_ptr(enmr_name_size), enmr_name_size); - auto enmr_path_size = deserializer.read(); - std::string enmr_path_name( - deserializer.get_ptr(enmr_path_size), enmr_path_size); + auto enmr_filename_size = deserializer.read(); + std::string enmr_filename( + deserializer.get_ptr(enmr_filename_size), enmr_filename_size); - enumeration_path_map[enmr_name] = enmr_path_name; + enumeration_path_map[enmr_name] = enmr_filename; } } diff --git a/tiledb/sm/array_schema/array_schema.h b/tiledb/sm/array_schema/array_schema.h index cffeba30731..784a10fb784 100644 --- a/tiledb/sm/array_schema/array_schema.h +++ b/tiledb/sm/array_schema/array_schema.h @@ -721,7 +721,7 @@ class ArraySchema { tdb::pmr::unordered_map> enumeration_map_; - /** A map of Enumeration names to Enumeration URIs */ + /** A map of Enumeration names to Enumeration filenames */ tdb::pmr::unordered_map enumeration_path_map_; /** The filter pipeline run on offset tiles for var-length attributes. */