Merge pull request #571 from evoskuil/master

Move spend index to point table and delete spend table.

Author: evoskuil

include/bitcoin/database/error.hpp

@@ -116,7 +116,6 @@ enum error_t : uint8_t
     /// tx archive
     tx_empty,
     tx_tx_allocate,
-    tx_spend_allocate,
     tx_input_put,
     tx_point_allocate,
     tx_point_put,
@@ -125,7 +124,6 @@ enum error_t : uint8_t
     tx_output_put,
     tx_puts_put,
     tx_tx_set,
-    tx_spend_put,
     tx_address_allocate,
     tx_address_put,
     tx_tx_commit,

include/bitcoin/database/impl/query/archive_read.ipp

@@ -112,23 +112,23 @@ inline hash_digest CLASS::get_tx_key(const tx_link& link) const NOEXCEPT
 }
 
 TEMPLATE
-inline hash_digest CLASS::get_point_key(const point_link& link) const NOEXCEPT
+inline point_key CLASS::get_point_key(const point_link& link) const NOEXCEPT
 {
-    table::point::record point{};
+    table::point::get_composed point{};
     if (!store_.point.get(link, point))
         return {};
 
-    return point.hash;
+    return point.key;
 }
 
 TEMPLATE
-inline spend_key CLASS::get_spend_key(const spend_link& link) const NOEXCEPT
+inline hash_digest CLASS::get_point_hash(const point_link& link) const NOEXCEPT
 {
-    table::spend::get_key spend{};
-    if (!store_.spend.get(link, spend))
+    table::point::record point{};
+    if (!store_.point.get(link, point))
         return {};
 
-    return spend.key;
+    return point.hash;
 }
 
 // False implies not confirmed.

include/bitcoin/database/impl/query/archive_write.ipp

@@ -122,6 +122,7 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
     // Commit input and ins|point records.
     for (const auto& in: *ins)
     {
+        // TODO: preallocate (requires input sizes).
         input_link input_fk{};
         if (!store_.input.put_link(input_fk, table::input::put_ref
         {
@@ -132,28 +133,19 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
             return error::tx_input_put;
         }
 
-        if (!store_.ins.put(point_it, table::ins::record
+        if (!store_.ins.put(point_it++, table::ins::record
         {
             {},
-            in->point().index(),
             in->sequence(),
             input_fk,
             tx_fk
         }))
         {
             return error::tx_ins_put;
         }
-
-        if (!store_.point.put(point_it++, table::point::record_ref
-        {
-            {},
-            in->point().hash()
-        }))
-        {
-            return error::tx_point_put;
-        }
     }
 
+    // TODO: preallocate (requires output sizes).
     // Commit output records.
     for (const auto& out: *outs)
     {
@@ -177,8 +169,19 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
     if (puts_fk.is_terminal())
         return error::tx_puts_put;
 
+    // Commit accumulated points.
+    point_it = point_fk;
+    for (const auto& in: *ins)
+    {
+        const auto key = table::point::compose(in->point());
+        if (!store_.point.put(point_it++, key, table::point::record{}))
+        {
+            return error::tx_point_put;
+        }
+    }
+
     // Create tx record.
-    // Commit is deferred for spend/address index consistency.
+    // Commit is deferred for point/address index consistency.
     if (!store_.tx.set(tx_fk, table::transaction::record_put_ref
     {
         {},
@@ -192,30 +195,6 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
         return error::tx_tx_set;
     }
 
-    // Commit spend index records.
-    if (!tx.is_coinbase())
-    {
-        auto sp_fk = store_.spend.allocate(inputs);
-        if (sp_fk.is_terminal())
-            return error::tx_spend_allocate;
-
-        auto in = ins->begin();
-        const auto ptr = store_.spend.get_memory();
-
-        for (auto pt_fk = point_fk; pt_fk < (point_fk + inputs); ++pt_fk)
-        {
-            const auto key = table::spend::compose((*in++)->point());
-            if (!store_.spend.put(ptr, sp_fk++, key, table::spend::record
-            {
-                {},
-                pt_fk
-            }))
-            {
-                return error::tx_spend_put;
-            }
-        }
-    }
-
     // Commit address index records.
     if (address_enabled())
     {

include/bitcoin/database/impl/query/confirm.ipp

@@ -73,7 +73,7 @@ bool CLASS::is_confirmed_tx(const tx_link& link) const NOEXCEPT
 }
 
 TEMPLATE
-bool CLASS::is_confirmed_input(const spend_link& link) const NOEXCEPT
+bool CLASS::is_confirmed_input(const point_link& link) const NOEXCEPT
 {
     // The spend.tx is strong *and* its block is confirmed (by height).
     const auto fk = to_spending_tx(link);
@@ -132,7 +132,7 @@ bool CLASS::is_strong_block(const header_link& link) const NOEXCEPT
 
 // unused
 TEMPLATE
-bool CLASS::is_strong_spend(const spend_link& link) const NOEXCEPT
+bool CLASS::is_strong_spend(const point_link& link) const NOEXCEPT
 {
     return is_strong_tx(to_spending_tx(link));
 }
@@ -141,7 +141,7 @@ bool CLASS::is_strong_spend(const spend_link& link) const NOEXCEPT
 TEMPLATE
 bool CLASS::is_mature(const point_link& link, size_t height) const NOEXCEPT
 {
-    const auto key = get_point_key(link);
+    const auto key = get_point_hash(link);
     if (key == system::null_hash)
         return true;
 
@@ -189,7 +189,7 @@ code CLASS::locked_prevout(const point_link& link, uint32_t sequence,
 
     // Get hash from point, search for prevout tx and get its link.
     table::transaction::get_version tx{};
-    const auto tx_fk = store_.tx.find(get_point_key(link), tx);
+    const auto tx_fk = store_.tx.find(get_point_hash(link), tx);
     if (tx_fk.is_terminal())
         return error::missing_previous_output;
 

include/bitcoin/database/impl/query/consensus.ipp

@@ -199,81 +199,34 @@ code CLASS::unspent_duplicates(const header_link& link,
 
 // protected
 TEMPLATE
-code CLASS::get_conflicts(point_links& points, const point& point,
+code CLASS::push_spenders(tx_links& out, const point& point,
     const point_link& self) const NOEXCEPT
 {
-    // Iterate to all matching spend table keys. Since these are stubs of the
-    // full tx hash there will be false positives at the rate of the original
-    // "foreign point" indexation. This means two sets of conflicts, first the
-    // spend table and then the stubs. But this dramatically reduces paging in
-    // the double spend search. The spend table load controls for primary but
-    // not secondary conflicts. Reducing secondary conflicts requires increase
-    // to the stub hash portion of the spend key. Given that the spend key has
-    // two parts (stub|index) there is never a secondary conflict produced by
-    // the existence of multiple spends of outputs in the same transaction.
-    auto it = store_.spend.it(table::spend::compose(point));
+    auto it = store_.point.it(table::point::compose(point));
     if (!it)
         return error::integrity4;
 
+    point_links points{};
     do
     {
-        table::spend::record get{};
-        if (!store_.spend.get(it, get))
-            return error::integrity5;
-
-        if (get.point_fk != self)
-            points.push_back(get.point_fk);
+        if (it.self() != self)
+            points.push_back(it.self());
     }
     while (it.advance());
-    return error::success;
-}
-
-// protected
-TEMPLATE
-code CLASS::push_doubles(tx_links& out, const point& point,
-    const point_links& points) const NOEXCEPT
-{
-    if (points.empty())
-        return error::success;
+    it.reset();
 
-    // The expected self spend and primary conflicts are removed. This serves
-    // to remove secondary conflicts, leaving only actual additional spends.
-    auto ptr = store_.point.get_memory();
     for (auto link: points)
     {
-        table::point::record get{};
-        if (!store_.point.get(ptr, link, get))
-            return error::integrity6;
-
-        // Extremely rare, normally implies a duplicate tx.
-        if (get.hash == point.hash())
-        {
-            ptr.reset();
-            table::ins::get_parent ins{};
-            if (!store_.ins.get(link, ins))
-                return error::integrity6;
+        table::ins::get_parent get{};
+        if (!store_.ins.get(link, get))
+            return error::integrity5;
 
-            out.push_back(ins.parent_fk);
-            ptr = store_.point.get_memory();
-        }
+        out.push_back(get.parent_fk);
     }
 
     return error::success;
 }
 
-// protected
-TEMPLATE
-code CLASS::push_spenders(tx_links& out, const point& point,
-    const point_link& self) const NOEXCEPT
-{
-    code ec{};
-    point_links points{};
-    if ((ec = get_conflicts(points, point, self)))
-        return ec;
-
-    return push_doubles(out, point, points);
-}
-
 TEMPLATE
 code CLASS::get_double_spenders(tx_links& out,
     const block& block) const NOEXCEPT

include/bitcoin/database/impl/query/extent.ipp

@@ -95,7 +95,6 @@ size_t CLASS::archive_body_size() const NOEXCEPT
         + point_body_size()
         + ins_body_size()
         + puts_body_size()
-        + spend_body_size()
         + txs_body_size()
         + tx_body_size();
 }
@@ -123,7 +122,6 @@ size_t CLASS::archive_head_size() const NOEXCEPT
         + point_head_size()
         + ins_head_size()
         + puts_head_size()
-        + spend_head_size()
         + txs_head_size()
         + tx_head_size();
 }
@@ -137,7 +135,6 @@ DEFINE_SIZES(input)
 DEFINE_SIZES(point)
 DEFINE_SIZES(ins)
 DEFINE_SIZES(puts)
-DEFINE_SIZES(spend)
 DEFINE_SIZES(txs)
 DEFINE_SIZES(tx)
 
@@ -154,7 +151,7 @@ DEFINE_SIZES(neutrino)
 // ----------------------------------------------------------------------------
 
 DEFINE_BUCKETS(header)
-DEFINE_BUCKETS(spend)
+DEFINE_BUCKETS(point)
 DEFINE_BUCKETS(txs)
 DEFINE_BUCKETS(tx)
 
@@ -173,7 +170,6 @@ DEFINE_RECORDS(tx)
 DEFINE_RECORDS(point)
 DEFINE_RECORDS(ins)
 DEFINE_RECORDS(puts)
-DEFINE_RECORDS(spend)
 
 DEFINE_RECORDS(candidate)
 DEFINE_RECORDS(confirmed)

include/bitcoin/database/impl/query/objects.ipp

@@ -231,7 +231,7 @@ typename CLASS::input::cptr CLASS::get_input(
 
     const auto ptr = to_shared<input>
     (
-        make_point(std::move(point.hash), ins.index),
+        make_point(std::move(point.hash), point.index),
         in.script,
         in.witness,
         ins.sequence