Remove dead code (finalizer lambda).

libbitcoin · Jun 16, 2024 · b1b8df0 · b1b8df0
1 parent 08825f2
commit b1b8df0
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 145 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -186,7 +186,6 @@ include_bitcoin_database_locks_HEADERS = \
 include_bitcoin_database_memorydir = ${includedir}/bitcoin/database/memory
 include_bitcoin_database_memory_HEADERS = \
     include/bitcoin/database/memory/accessor.hpp \
-    include/bitcoin/database/memory/finalizer.hpp \
     include/bitcoin/database/memory/map.hpp \
     include/bitcoin/database/memory/memory.hpp \
     include/bitcoin/database/memory/reader.hpp \

diff --git a/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj b/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj
@@ -103,7 +103,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\database\locks\interprocess_lock.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\locks\locks.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\accessor.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\finalizer.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\map.hpp" />

diff --git a/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters b/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters
@@ -152,9 +152,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\accessor.hpp">
       <Filter>include\bitcoin\database\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\finalizer.hpp">
-      <Filter>include\bitcoin\database\memory</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp">
       <Filter>include\bitcoin\database\memory\interfaces</Filter>
     </ClInclude>

diff --git a/include/bitcoin/database.hpp b/include/bitcoin/database.hpp
@@ -32,7 +32,6 @@
 #include <bitcoin/database/locks/interprocess_lock.hpp>
 #include <bitcoin/database/locks/locks.hpp>
 #include <bitcoin/database/memory/accessor.hpp>
-#include <bitcoin/database/memory/finalizer.hpp>
 #include <bitcoin/database/memory/map.hpp>
 #include <bitcoin/database/memory/memory.hpp>
 #include <bitcoin/database/memory/reader.hpp>

diff --git a/include/bitcoin/database/impl/primitives/hashmap.ipp b/include/bitcoin/database/impl/primitives/hashmap.ipp
@@ -212,7 +212,7 @@ bool CLASS::set(const Link& link, const Element& element) NOEXCEPT
         return false;
 
     iostream stream{ *ptr };
-    finalizer sink{ stream };
+    flipper sink{ stream };
     sink.skip_bytes(index_size);
 
     // (1.65%)
@@ -263,18 +263,17 @@ bool CLASS::put_link(Link& link, const Key& key,
         return false;
 
     iostream stream{ *ptr };
-    finalizer sink{ stream };
+    flipper sink{ stream };
     sink.skip_bytes(Link::size);
     sink.write_bytes(key);
-    sink.set_finalizer([this, link, index = head_.index(key), ptr]() NOEXCEPT
-    {
-        auto& next = unsafe_array_cast<uint8_t, Link::size>(ptr->begin());
-        return head_.push(link, next, index);
-    });
 
     // (1.63%)
     if constexpr (!is_slab) { BC_DEBUG_ONLY(sink.set_limit(Size * count);) }
-    return element.to_data(sink) && sink.finalize();
+    if (!element.to_data(sink))
+        return false;
+
+    auto& next = unsafe_array_cast<uint8_t, Link::size>(ptr->begin());
+    return head_.push(link, next, head_.index(key));
 }
 
 TEMPLATE
@@ -296,19 +295,16 @@ bool CLASS::put(const Link& link, const Key& key,
         return false;
 
     iostream stream{ *ptr };
-    finalizer sink{ stream };
+    flipper sink{ stream };
     sink.skip_bytes(Link::size);
     sink.write_bytes(key);
 
-    // The finalizer provides deferred index commit following serialization.
-    sink.set_finalizer([this, link, index = head_.index(key), ptr]() NOEXCEPT
-    {
-        auto& next = unsafe_array_cast<uint8_t, Link::size>(ptr->begin());
-        return head_.push(link, next, index);
-    });
-
     if constexpr (!is_slab) { BC_DEBUG_ONLY(sink.set_limit(Size * count);) }
-    return element.to_data(sink) && sink.finalize();
+    if (!element.to_data(sink))
+        return false;
+
+    auto& next = unsafe_array_cast<uint8_t, Link::size>(ptr->begin());
+    return head_.push(link, next, head_.index(key));
 }
 
 TEMPLATE
@@ -327,15 +323,6 @@ bool CLASS::commit(const Link& link, const Key& key) NOEXCEPT
     return head_.push(link, next, head_.index(key));
 }
 
-TEMPLATE
-Link CLASS::commit_link(const Link& link, const Key& key) NOEXCEPT
-{
-    if (!commit(link, key))
-        return {};
-
-    return link;
-}
-
 // protected/static
 // ----------------------------------------------------------------------------
 

diff --git a/include/bitcoin/database/impl/query/archive.ipp b/include/bitcoin/database/impl/query/archive.ipp
@@ -851,7 +851,7 @@ code CLASS::set_code(tx_link& out_fk, const transaction& tx) NOEXCEPT
     for (const auto& spend: views_reverse(spends))
     {
         --spend_fk.value;
-        if (store_.spend.commit_link(spend_fk, spend).is_terminal())
+        if (!store_.spend.commit(spend_fk, spend))
             return error::tx_spend_commit;
     }
 

diff --git a/include/bitcoin/database/memory/finalizer.hpp b/include/bitcoin/database/memory/finalizer.hpp
diff --git a/include/bitcoin/database/memory/memory.hpp b/include/bitcoin/database/memory/memory.hpp
@@ -20,7 +20,6 @@
 #define LIBBITCOIN_DATABASE_MEMORY_MEMORY_HPP
 
 #include <bitcoin/database/memory/accessor.hpp>
-#include <bitcoin/database/memory/finalizer.hpp>
 #include <bitcoin/database/memory/interfaces/memory.hpp>
 #include <bitcoin/database/memory/interfaces/storage.hpp>
 #include <bitcoin/database/memory/map.hpp>

diff --git a/include/bitcoin/database/primitives/hashmap.hpp b/include/bitcoin/database/primitives/hashmap.hpp
@@ -30,7 +30,7 @@
 namespace libbitcoin {
 namespace database {
 
-/// Caution: iterator/reader/finalizer hold body remap lock until disposed.
+/// Caution: iterator/reader/flipper hold body remap lock until disposed.
 /// These handles should be used for serialization and immediately disposed.
 /// Readers and writers are always prepositioned at data, and are limited to
 /// the extent the record/slab size is known (limit can always be removed).
@@ -146,7 +146,6 @@ class hashmap
 
     /// Commit previously set element at link to key.
     bool commit(const Link& link, const Key& key) NOEXCEPT;
-    Link commit_link(const Link& link, const Key& key) NOEXCEPT;
 
 protected:
     /// Get element at link using memory object, false if deserialize error.

diff --git a/include/bitcoin/database/tables/archives/header.hpp b/include/bitcoin/database/tables/archives/header.hpp
@@ -54,7 +54,7 @@ struct header
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             context::to_data(sink, ctx);
             sink.write_byte(to_int<uint8_t>(milestone));
@@ -94,7 +94,7 @@ struct header
       : public schema::header
     {
         // header->previous_block_hash() ignored.
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             BC_ASSERT(header);
             context::to_data(sink, ctx);
@@ -120,7 +120,7 @@ struct header
       : public schema::header
     {
         // header.previous_block_hash() ignored.
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             context::to_data(sink, ctx);
             sink.write_byte(to_int<uint8_t>(milestone));

diff --git a/include/bitcoin/database/tables/archives/point.hpp b/include/bitcoin/database/tables/archives/point.hpp
@@ -47,7 +47,7 @@ struct point
             return source;
         }
 
-        inline bool to_data(const finalizer& sink) const NOEXCEPT
+        inline bool to_data(const flipper& sink) const NOEXCEPT
         {
             return sink;
         }

diff --git a/include/bitcoin/database/tables/archives/spend.hpp b/include/bitcoin/database/tables/archives/spend.hpp
@@ -70,7 +70,7 @@ struct spend
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             sink.write_little_endian<tx::integer, tx::size>(parent_fk);
             sink.write_little_endian<uint32_t>(sequence);

diff --git a/include/bitcoin/database/tables/archives/transaction.hpp b/include/bitcoin/database/tables/archives/transaction.hpp
@@ -73,7 +73,7 @@ struct transaction
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             sink.write_byte(to_int<uint8_t>(coinbase));
             sink.write_little_endian<bytes::integer, bytes::size>(light);
@@ -139,7 +139,7 @@ struct transaction
     struct record_put_ref
       : public schema::transaction
     {
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             using namespace system;
             sink.write_byte(to_int<uint8_t>(tx.is_coinbase()));

diff --git a/include/bitcoin/database/tables/archives/txs.hpp b/include/bitcoin/database/tables/archives/txs.hpp
@@ -62,7 +62,7 @@ struct txs
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             BC_ASSERT(tx_fks.size() < system::power2<uint64_t>(to_bits(schema::count_)));
             const auto fks = system::possible_narrow_cast<tx::integer>(tx_fks.size());

diff --git a/include/bitcoin/database/tables/caches/validated_bk.hpp b/include/bitcoin/database/tables/caches/validated_bk.hpp
@@ -54,7 +54,7 @@ struct validated_bk
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             sink.write_little_endian<coding::integer, coding::size>(code);
             sink.write_variable(fees);

diff --git a/include/bitcoin/database/tables/caches/validated_tx.hpp b/include/bitcoin/database/tables/caches/validated_tx.hpp
@@ -62,7 +62,7 @@ struct validated_tx
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             context::to_data(sink, ctx);
             sink.write_little_endian<coding::integer, coding::size>(code);

diff --git a/include/bitcoin/database/tables/context.hpp b/include/bitcoin/database/tables/context.hpp
@@ -41,7 +41,7 @@ struct context
         context.mtp    = source.template read_little_endian<uint32_t>();
     };
 
-    static inline void to_data(finalizer& sink, const context& context) NOEXCEPT
+    static inline void to_data(flipper& sink, const context& context) NOEXCEPT
     {
         sink.template write_little_endian<flag::integer, flag::size>(context.flags);
         sink.template write_little_endian<block::integer, block::size>(context.height);

diff --git a/include/bitcoin/database/tables/indexes/strong_tx.hpp b/include/bitcoin/database/tables/indexes/strong_tx.hpp
@@ -45,7 +45,7 @@ struct strong_tx
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             sink.write_little_endian<block::integer, block::size>(header_fk);
             sink.write_byte(to_int<uint8_t>(positive));

diff --git a/include/bitcoin/database/tables/optionals/address.hpp b/include/bitcoin/database/tables/optionals/address.hpp
@@ -44,7 +44,7 @@ struct address
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             sink.write_little_endian<out::integer, out::size>(output_fk);
             return sink;

diff --git a/include/bitcoin/database/tables/optionals/buffer.hpp b/include/bitcoin/database/tables/optionals/buffer.hpp
@@ -50,7 +50,7 @@
 ////            return source;
 ////        }
 ////
-////        inline bool to_data(finalizer& sink) const NOEXCEPT
+////        inline bool to_data(flipper& sink) const NOEXCEPT
 ////        {
 ////            tx.to_data(sink, true);
 ////            BC_ASSERT(sink.get_write_position() == count());
@@ -81,7 +81,7 @@
 ////            return source;
 ////        }
 ////
-////        inline bool to_data(finalizer& sink) const NOEXCEPT
+////        inline bool to_data(flipper& sink) const NOEXCEPT
 ////        {
 ////            BC_ASSERT(tx);
 ////            tx->to_data(sink, true);
@@ -100,7 +100,7 @@
 ////                tx.serialized_size(true));
 ////        }
 ////
-////        inline bool to_data(finalizer& sink) const NOEXCEPT
+////        inline bool to_data(flipper& sink) const NOEXCEPT
 ////        {
 ////            tx.to_data(sink, true);
 ////            return sink;

diff --git a/include/bitcoin/database/tables/optionals/neutrino.hpp b/include/bitcoin/database/tables/optionals/neutrino.hpp
@@ -53,7 +53,7 @@ struct neutrino
             return source;
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             sink.write_bytes(filter_head);
             sink.write_variable(filter.size());
@@ -117,7 +117,7 @@ struct neutrino
                 filter.size());
         }
 
-        inline bool to_data(finalizer& sink) const NOEXCEPT
+        inline bool to_data(flipper& sink) const NOEXCEPT
         {
             sink.write_bytes(filter_head);
             sink.write_variable(filter.size());