Merge pull request #743 from evoskuil/master

Add missing info to console data dumps, update parser.

Author: evoskuil

console/executor_dumps.cpp

@@ -95,6 +95,7 @@ void executor::dump_body_sizes() const
         query_.point_body_size() %
         query_.input_body_size() %
         query_.output_body_size() %
+        query_.ins_body_size() %
         query_.puts_body_size() %
         query_.candidate_body_size() %
         query_.confirmed_body_size() %
@@ -112,6 +113,8 @@ void executor::dump_records() const
         query_.header_records() %
         query_.tx_records() %
         query_.point_records() %
+        query_.ins_records() %
+        query_.puts_records() %
         query_.candidate_records() %
         query_.confirmed_records() %
         query_.prevout_records() %

console/localize.hpp

@@ -76,25 +76,28 @@ namespace node {
     "   point     :%4%\n" \
     "   input     :%5%\n" \
     "   output    :%6%\n" \
-    "   puts      :%7%\n" \
-    "   candidate :%8%\n" \
-    "   confirmed :%9%\n" \
-    "   prevout   :%10%\n" \
-    "   strong_tx :%11%\n" \
-    "   valid_tx  :%12%\n" \
-    "   valid_bk  :%13%\n" \
-    "   address   :%14%\n" \
-    "   neutrino  :%15%"
+    "   ins       :%7%\n" \
+    "   puts      :%8%\n" \
+    "   candidate :%9%\n" \
+    "   confirmed :%10%\n" \
+    "   prevout   :%11%\n" \
+    "   strong_tx :%12%\n" \
+    "   valid_tx  :%13%\n" \
+    "   valid_bk  :%14%\n" \
+    "   address   :%15%\n" \
+    "   neutrino  :%16%"
 #define BN_MEASURE_RECORDS \
     "Table records...\n" \
     "   header    :%1%\n" \
     "   tx        :%2%\n" \
     "   point     :%3%\n" \
-    "   candidate :%4%\n" \
-    "   confirmed :%5%\n" \
-    "   prevout   :%6%\n" \
-    "   strong_tx :%7%\n" \
-    "   address   :%8%"
+    "   ins       :%4%\n" \
+    "   puts      :%5%\n" \
+    "   candidate :%6%\n" \
+    "   confirmed :%7%\n" \
+    "   prevout   :%8%\n" \
+    "   strong_tx :%9%\n" \
+    "   address   :%10%"
 #define BN_MEASURE_SLABS \
     "Table slabs..."
 #define BN_MEASURE_SLABS_ROW \

src/parser.cpp

@@ -76,24 +76,24 @@ parser::parser(system::chain::selection context) NOEXCEPT
     configured.database.header_size = 21'000'000;
     configured.database.header_rate = 5;
 
-    configured.database.input_size = 93'050'000'000;
+    configured.database.input_size = 92'500'000'000;
     configured.database.input_rate = 5;
 
     configured.database.output_size = 25'300'000'000;
     configured.database.output_rate = 5;
 
     configured.database.point_bits = 31;
-    configured.database.point_size = 21'100'000'000;
+    configured.database.point_size = 25'700'000'000;
     configured.database.point_rate = 5;
 
-    configured.database.ins_size = 10'500'000'000;
+    configured.database.ins_size = 8'550'000'000;
     configured.database.ins_rate = 5;
 
     configured.database.puts_size = 3'700'000'000;
     configured.database.puts_rate = 5;
 
     configured.database.tx_bits = 30;
-    configured.database.tx_size = 17'050'000'000;
+    configured.database.tx_size = 17'000'000'000;
     configured.database.tx_rate = 5;
 
     configured.database.txs_bits = 20;
@@ -672,7 +672,7 @@ options_metadata parser::load_settings() THROWS
     (
         "database.input_size",
         value<uint64_t>(&configured.database.input_size),
-        "The minimum allocation of the input table body, defaults to '93050000000'."
+        "The minimum allocation of the input table body, defaults to '92500000000'."
     )
     (
         "database.input_rate",
@@ -701,7 +701,7 @@ 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 '21100000000'."
+        "The minimum allocation of the point table body, defaults to '25700000000'."
     )
     (
         "database.point_rate",
@@ -713,7 +713,7 @@ options_metadata parser::load_settings() THROWS
     (
         "database.ins_size",
         value<uint64_t>(&configured.database.ins_size),
-        "The minimum allocation of the point table body, defaults to '10500000000'."
+        "The minimum allocation of the point table body, defaults to '8550000000'."
     )
     (
         "database.ins_rate",
@@ -742,7 +742,7 @@ options_metadata parser::load_settings() THROWS
     (
         "database.tx_size",
         value<uint64_t>(&configured.database.tx_size),
-        "The minimum allocation of the tx table body, defaults to '17050000000'."
+        "The minimum allocation of the tx table body, defaults to '17000000000'."
     )
     (
         "database.tx_rate",