Add nomap::expand method and dependencies.

Author: evoskuil

include/bitcoin/database/impl/primitives/manager.ipp

@@ -52,6 +52,15 @@ bool CLASS::truncate(const Link& count) NOEXCEPT
     return file_.truncate(link_to_position(count));
 }
 
+TEMPLATE
+bool CLASS::expand(const Link& count) NOEXCEPT
+{
+    if (count.is_terminal())
+        return false;
+
+    return file_.expand(link_to_position(count));
+}
+
 TEMPLATE
 Link CLASS::allocate(const Link& size) NOEXCEPT
 {

include/bitcoin/database/impl/primitives/nomap.ipp

@@ -103,6 +103,12 @@ bool CLASS::truncate(const Link& count) NOEXCEPT
     return manager_.truncate(count);
 }
 
+TEMPLATE
+bool CLASS::expand(const Link& count) NOEXCEPT
+{
+    return manager_.expand(count);
+}
+
 // error condition
 // ----------------------------------------------------------------------------
 

include/bitcoin/database/memory/interfaces/storage.hpp

@@ -64,6 +64,9 @@ class storage
     /// Reduce logical size to specified (false if size exceeds logical).
     virtual bool truncate(size_t size) NOEXCEPT = 0;
 
+    /// Increase logical size to specified as requried (false only if fails).
+    virtual bool expand(size_t size) NOEXCEPT = 0;
+
     /// Allocate bytes and return offset to first allocated (or eof).
     virtual size_t allocate(size_t chunk) NOEXCEPT = 0;
 

include/bitcoin/database/memory/map.hpp

@@ -87,6 +87,9 @@ class BCD_API map
     /// Reduce logical size to specified (false if size exceeds logical).
     bool truncate(size_t size) NOEXCEPT override;
 
+    /// Increase logical size to specified as requried (false only if fails).
+    bool expand(size_t size) NOEXCEPT override;
+
     /// Allocate bytes and return offset to first allocated (or eof).
     size_t allocate(size_t chunk) NOEXCEPT override;
 

include/bitcoin/database/primitives/manager.hpp

@@ -52,6 +52,9 @@ class manager
     /// Reduce the number of records (false if not lesser).
     bool truncate(const Link& count) NOEXCEPT;
 
+    /// Increase the number of records as necessary (false only if fails).
+    bool expand(const Link& count) NOEXCEPT;
+
     /// Allocate records and return first logical position (eof possible).
     /// For record, size is number of records to allocate (link + data).
     /// For slab size must include bytes (link + data) [key is part of data].

include/bitcoin/database/primitives/nomap.hpp

@@ -68,6 +68,9 @@ class nomap
     /// Reduce count as specified.
     bool truncate(const Link& count) NOEXCEPT;
 
+    /// Increase count as neccesary to specified.
+    bool expand(const Link& count) NOEXCEPT;
+
     /// Errors.
     /// -----------------------------------------------------------------------
 

src/memory/map.cpp

@@ -229,6 +229,32 @@ bool map::truncate(size_t size) NOEXCEPT
     return true;
 }
 
+bool map::expand(size_t size) NOEXCEPT
+{
+    std::unique_lock field_lock(field_mutex_);
+
+    if (fault_ || !loaded_)
+        return false;
+
+    if (size <= logical_)
+        return true;
+
+    if (size > capacity_)
+    {
+        const auto capacity = to_capacity(size);
+
+        // 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_(capacity))
+            return false;
+    }
+
+    logical_ = size;
+    return true;
+}
+
 // Waits until all access pointers are destructed. Will deadlock if any access
 // pointer is waiting on allocation. Lock safety requires that access pointers
 // are short-lived and do not block on allocation.

test/mocks/chunk_storage.cpp

@@ -107,6 +107,15 @@ bool chunk_storage::truncate(size_t size) NOEXCEPT
     return true;
 }
 
+bool chunk_storage::expand(size_t size) NOEXCEPT
+{
+    std::unique_lock field_lock(field_mutex_);
+    if (size > buffer_.size())
+        buffer_.resize(size);
+
+    return true;
+}
+
 size_t chunk_storage::allocate(size_t chunk) NOEXCEPT
 {
     std::unique_lock field_lock(field_mutex_);

test/mocks/chunk_storage.hpp

@@ -48,6 +48,7 @@ class chunk_storage
     size_t capacity() const NOEXCEPT override;
     size_t size() const NOEXCEPT override;
     bool truncate(size_t size) NOEXCEPT override;
+    bool expand(size_t size) NOEXCEPT override;
     size_t allocate(size_t chunk) NOEXCEPT override;
     memory_ptr set(size_t offset, size_t size,
         uint8_t backfill) NOEXCEPT override;

test/mocks/chunk_store.hpp

@@ -74,14 +74,14 @@ class chunk_store
         return output_body_.buffer();
     }
 
-    system::data_chunk& prevout_head() NOEXCEPT
+    system::data_chunk& ins_head() NOEXCEPT
     {
-        return prevout_head_.buffer();
+        return ins_head_.buffer();
     }
 
-    system::data_chunk& prevout_body() NOEXCEPT
+    system::data_chunk& ins_body() NOEXCEPT
     {
-        return prevout_body_.buffer();
+        return ins_body_.buffer();
     }
 
     system::data_chunk& puts_head() NOEXCEPT
@@ -158,6 +158,16 @@ class chunk_store
 
     // Caches.
 
+    system::data_chunk& prevout_head() NOEXCEPT
+    {
+        return prevout_head_.buffer();
+    }
+
+    system::data_chunk& prevout_body() NOEXCEPT
+    {
+        return prevout_body_.buffer();
+    }
+
     system::data_chunk& validated_bk_head() NOEXCEPT
     {
         return validated_bk_head_.buffer();