Merge pull request #738 from evoskuil/master

Updates for new ins|point tables configuration.

Author: evoskuil

console/executor_test_reader.cpp

@@ -169,15 +169,15 @@ void executor::read_test(bool dump) const
             if (!points.empty())
             {
                 pt_fk = points.front();
-                table::point::record point{};
-                if (!store_.point.get(pt_fk, point))
+                table::ins::record ins{};
+                if (!store_.ins.get(pt_fk, ins))
                 {
-                    // fault, missing point.
+                    // fault, missing ins.
                     return;
                 }
 
-                in_fk = point.input_fk;
-                pt_tx_fk = point.parent_fk;
+                in_fk = ins.input_fk;
+                pt_tx_fk = ins.parent_fk;
             }
 
             ////++found;

console/executor_test_writer.cpp

@@ -46,6 +46,20 @@ void executor::write_test(bool)
 
 #if defined(UNDEFINED)
 
+void executor::write_test(bool)
+{
+    for (database::header_link link{ 793'008_u32 }; link < 885'000_u32; ++link)
+    {
+        if (!query_.set_block_unknown(link))
+        {
+            logger(format("set_block_unknown fault [%1%].") % link.value);
+            return;
+        }
+    }
+
+    logger(format("set_block_unknown complete."));
+}
+
 void executor::write_test()
 {
     code ec{};

src/chasers/chaser_confirm.cpp

@@ -264,11 +264,11 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
             return;
         }
 
-////if (!set_organized(link, height))
-////{
-////    fault(error::confirm10);
-////    return;
-////}
+        if (!set_organized(link, height))
+        {
+            fault(error::confirm10);
+            return;
+        }
 
         set_position(height);
 

src/chasers/chaser_header.cpp

@@ -71,7 +71,7 @@ code chaser_header::duplicate(size_t& height,
         // database::error::block_unconfirmable
         // database::error::block_confirmable
         // database::error::block_valid
-        // database::error::unknown_state
+        // database::error::unknown_state (debugging)
         // database::error::unvalidated
         const auto ec = query.get_header_state(id);
 

src/parser.cpp

@@ -82,9 +82,12 @@ parser::parser(system::chain::selection context) NOEXCEPT
     configured.database.output_size = 25'300'000'000;
     configured.database.output_rate = 5;
 
-    configured.database.point_size = 32'000'000'000;
+    configured.database.point_size = 21'100'000'000;
     configured.database.point_rate = 5;
 
+    configured.database.ins_size = 10'500'000'000;
+    configured.database.ins_rate = 5;
+
     configured.database.puts_size = 3'700'000'000;
     configured.database.puts_rate = 5;
 
@@ -696,14 +699,26 @@ options_metadata parser::load_settings() THROWS
     (
         "database.point_size",
         value<uint64_t>(&configured.database.point_size),
-        "The minimum allocation of the point table body, defaults to '32000000000'."
+        "The minimum allocation of the point table body, defaults to '21100000000'."
     )
     (
         "database.point_rate",
         value<uint16_t>(&configured.database.point_rate),
         "The percentage expansion of the point table body, defaults to '5'."
     )
 
+    /* ins */
+    (
+        "database.ins_size",
+        value<uint64_t>(&configured.database.ins_size),
+        "The minimum allocation of the point table body, defaults to '10500000000'."
+    )
+    (
+        "database.ins_rate",
+        value<uint16_t>(&configured.database.ins_rate),
+        "The percentage expansion of the ins table body, defaults to '5'."
+    )
+
     /* puts */
     (
         "database.puts_size",