Rename hashmap2 to arraymap.

evoskuil · evoskuil · commit 8f61a1fabb5b · 2025-01-07T20:51:26.000-05:00
diff --git a/Makefile.am b/Makefile.am
@@ -76,8 +76,8 @@ test_libbitcoin_database_test_SOURCES = \
     test/mocks/chunk_storage.hpp \
     test/mocks/chunk_store.hpp \
     test/mocks/map_store.hpp \
+    test/primitives/arraymap.cpp \
     test/primitives/hashmap.cpp \
-    test/primitives/hashmap2.cpp \
     test/primitives/head.cpp \
     test/primitives/head2.cpp \
     test/primitives/iterator.cpp \
@@ -159,8 +159,8 @@ include_bitcoin_database_impl_memory_HEADERS = \
 
 include_bitcoin_database_impl_primitivesdir = ${includedir}/bitcoin/database/impl/primitives
 include_bitcoin_database_impl_primitives_HEADERS = \
+    include/bitcoin/database/impl/primitives/arraymap.ipp \
     include/bitcoin/database/impl/primitives/hashmap.ipp \
-    include/bitcoin/database/impl/primitives/hashmap2.ipp \
     include/bitcoin/database/impl/primitives/head.ipp \
     include/bitcoin/database/impl/primitives/head2.ipp \
     include/bitcoin/database/impl/primitives/iterator.ipp \
@@ -206,8 +206,8 @@ include_bitcoin_database_memory_interfaces_HEADERS = \
 
 include_bitcoin_database_primitivesdir = ${includedir}/bitcoin/database/primitives
 include_bitcoin_database_primitives_HEADERS = \
+    include/bitcoin/database/primitives/arraymap.hpp \
     include/bitcoin/database/primitives/hashmap.hpp \
-    include/bitcoin/database/primitives/hashmap2.hpp \
     include/bitcoin/database/primitives/head.hpp \
     include/bitcoin/database/primitives/head2.hpp \
     include/bitcoin/database/primitives/iterator.hpp \
diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt
@@ -284,8 +284,8 @@ if (with-tests)
         "../../test/mocks/chunk_storage.hpp"
         "../../test/mocks/chunk_store.hpp"
         "../../test/mocks/map_store.hpp"
+        "../../test/primitives/arraymap.cpp"
         "../../test/primitives/hashmap.cpp"
-        "../../test/primitives/hashmap2.cpp"
         "../../test/primitives/head.cpp"
         "../../test/primitives/head2.cpp"
         "../../test/primitives/iterator.cpp"
diff --git a/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj b/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj
@@ -85,8 +85,8 @@
       <ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
+    <ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
     <ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp" />
-    <ClCompile Include="..\..\..\..\test\primitives\hashmap2.cpp" />
     <ClCompile Include="..\..\..\..\test\primitives\head.cpp" />
     <ClCompile Include="..\..\..\..\test\primitives\head2.cpp" />
     <ClCompile Include="..\..\..\..\test\primitives\iterator.cpp" />
diff --git a/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters b/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters
@@ -78,10 +78,10 @@
     <ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp">
       <Filter>src\mocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
+    <ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
       <Filter>src\primitives</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\primitives\hashmap2.cpp">
+    <ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
       <Filter>src\primitives</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\test\primitives\head.cpp">
diff --git a/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj b/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj
@@ -113,8 +113,8 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\simple_writer.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\streamers.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
+    <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap2.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head2.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp" />
@@ -153,8 +153,8 @@
     <None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp" />
     <None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_reader.ipp" />
     <None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_writer.ipp" />
+    <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp" />
     <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp" />
-    <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap2.ipp" />
     <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp" />
     <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head2.ipp" />
     <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp" />
diff --git a/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters b/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters
@@ -182,10 +182,10 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp">
       <Filter>include\bitcoin\database\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
+    <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
       <Filter>include\bitcoin\database\primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap2.hpp">
+    <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
       <Filter>include\bitcoin\database\primitives</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp">
@@ -298,10 +298,10 @@
     <None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_writer.ipp">
       <Filter>include\bitcoin\database\impl\memory</Filter>
     </None>
-    <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
+    <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp">
       <Filter>include\bitcoin\database\impl\primitives</Filter>
     </None>
-    <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap2.ipp">
+    <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
       <Filter>include\bitcoin\database\impl\primitives</Filter>
     </None>
     <None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp">
diff --git a/include/bitcoin/database.hpp b/include/bitcoin/database.hpp
@@ -42,8 +42,8 @@
 #include <bitcoin/database/memory/utilities.hpp>
 #include <bitcoin/database/memory/interfaces/memory.hpp>
 #include <bitcoin/database/memory/interfaces/storage.hpp>
+#include <bitcoin/database/primitives/arraymap.hpp>
 #include <bitcoin/database/primitives/hashmap.hpp>
-#include <bitcoin/database/primitives/hashmap2.hpp>
 #include <bitcoin/database/primitives/head.hpp>
 #include <bitcoin/database/primitives/head2.hpp>
 #include <bitcoin/database/primitives/iterator.hpp>
diff --git a/include/bitcoin/database/impl/primitives/arraymap.ipp b/include/bitcoin/database/impl/primitives/arraymap.ipp
@@ -16,8 +16,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_HASHMAP2_IPP
-#define LIBBITCOIN_DATABASE_PRIMITIVES_HASHMAP2_IPP
+#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYMAP_IPP
+#define LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYMAP_IPP
 
 #include <algorithm>
 #include <bitcoin/system.hpp>
@@ -27,7 +27,7 @@ namespace libbitcoin {
 namespace database {
 
 TEMPLATE
-CLASS::hashmap2(storage& header, storage& body, const Link& buckets) NOEXCEPT
+CLASS::arraymap(storage& header, storage& body, const Link& buckets) NOEXCEPT
   : head_(header, buckets), manager_(body)
 {
 }
diff --git a/include/bitcoin/database/primitives/arraymap.hpp b/include/bitcoin/database/primitives/arraymap.hpp
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU Affero General Public License
 /// along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_HASHMAP2_HPP
-#define LIBBITCOIN_DATABASE_PRIMITIVES_HASHMAP2_HPP
+#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYMAP_HPP
+#define LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYMAP_HPP
 
 #include <bitcoin/system.hpp>
 #include <bitcoin/database/define.hpp>
@@ -36,16 +36,16 @@ namespace database {
 /// the extent the record/slab size is known (limit can always be removed).
 /// Streams are always initialized from first element byte up to file limit.
 template <typename Link, typename Key, size_t Size>
-class hashmap2
+class arraymap
 {
 public:
-    DEFAULT_COPY_MOVE_DESTRUCT(hashmap2);
+    DEFAULT_COPY_MOVE_DESTRUCT(arraymap);
 
     using key = Key;
     using link = Link;
     using iterator = database::iterator<Link, Key, Size>;
 
-    hashmap2(storage& header, storage& body, const Link& buckets) NOEXCEPT;
+    arraymap(storage& header, storage& body, const Link& buckets) NOEXCEPT;
 
     /// Setup, not thread safe.
     /// -----------------------------------------------------------------------
@@ -132,16 +132,16 @@ class hashmap2
 };
 
 template <typename Element>
-using hash_map2 = hashmap2<linkage<Element::pk>, system::data_array<Element::sk>,
+using array_map = arraymap<linkage<Element::pk>, system::data_array<Element::sk>,
     Element::size>;
 
 } // namespace database
 } // namespace libbitcoin
 
 #define TEMPLATE template <typename Link, typename Key, size_t Size>
-#define CLASS hashmap2<Link, Key, Size>
+#define CLASS arraymap<Link, Key, Size>
 
-#include <bitcoin/database/impl/primitives/hashmap2.ipp>
+#include <bitcoin/database/impl/primitives/arraymap.ipp>
 
 #undef CLASS
 #undef TEMPLATE
diff --git a/include/bitcoin/database/primitives/primitives.hpp b/include/bitcoin/database/primitives/primitives.hpp
@@ -21,7 +21,7 @@
 
 #include <bitcoin/database/primitives/nomap.hpp>
 #include <bitcoin/database/primitives/hashmap.hpp>
-#include <bitcoin/database/primitives/hashmap2.hpp>
+#include <bitcoin/database/primitives/arraymap.hpp>
 #include <bitcoin/database/primitives/head.hpp>
 #include <bitcoin/database/primitives/head2.hpp>
 #include <bitcoin/database/primitives/iterator.hpp>
diff --git a/src/memory/map.cpp b/src/memory/map.cpp
@@ -242,13 +242,13 @@ size_t map::allocate(size_t chunk) NOEXCEPT
     auto end = logical_ + chunk;
     if (end > capacity_)
     {
-        const auto new_capacity = to_capacity(end);
+        const auto capacity = to_capacity(end);
 
         // TODO: Could loop over a try lock here and log deadlock warning.
         std::unique_lock remap_lock(remap_mutex_);
 
         // Disk full condition leaves store in valid state despite eof return.
-        if (!remap_(new_capacity))
+        if (!remap_(capacity))
             return storage::eof;
     }
 
@@ -267,20 +267,18 @@ memory_ptr map::set(size_t offset, size_t size, uint8_t backfill) NOEXCEPT
         const auto end = std::max(logical_, offset + size);
         if (end > capacity_)
         {
-            const auto old_capacity = capacity_;
-            const auto new_capacity = to_capacity(end);
+            const auto capacity = to_capacity(end);
 
             // TODO: Could loop over a try lock here and log deadlock warning.
             std::unique_lock remap_lock(remap_mutex_);
 
             // Disk full condition leaves store in valid state despite null.
-            if (!remap_(new_capacity))
+            if (!remap_(capacity))
                 return {};
 
             // Fill new capacity as offset may not be at end due to expansion.
             BC_PUSH_WARNING(NO_POINTER_ARITHMETIC)
-            std::fill_n(memory_map_ + logical_, new_capacity - logical_,
-                backfill);
+            std::fill_n(memory_map_ + logical_, capacity - logical_, backfill);
             BC_POP_WARNING()
         }
 
diff --git a/test/primitives/arraymap.cpp b/test/primitives/arraymap.cpp
