Merge pull request #742 from evoskuil/master

Update config for store change to base2 buckets.

Author: evoskuil

src/parser.cpp

@@ -72,7 +72,7 @@ parser::parser(system::chain::selection context) NOEXCEPT
 
     // database (archive)
 
-    configured.database.header_buckets = 566'667;
+    configured.database.header_bits = 20;
     configured.database.header_size = 21'000'000;
     configured.database.header_rate = 5;
 
@@ -82,7 +82,7 @@ parser::parser(system::chain::selection context) NOEXCEPT
     configured.database.output_size = 25'300'000'000;
     configured.database.output_rate = 5;
 
-    configured.database.point_buckets = 1'750'905'073;
+    configured.database.point_bits = 31;
     configured.database.point_size = 21'100'000'000;
     configured.database.point_rate = 5;
 
@@ -92,11 +92,11 @@ parser::parser(system::chain::selection context) NOEXCEPT
     configured.database.puts_size = 3'700'000'000;
     configured.database.puts_rate = 5;
 
-    configured.database.tx_buckets = 688'193'037;
+    configured.database.tx_bits = 30;
     configured.database.tx_size = 17'050'000'000;
     configured.database.tx_rate = 5;
 
-    configured.database.txs_buckets = 566'667;
+    configured.database.txs_bits = 20;
     configured.database.txs_size = 1'050'000'000;
     configured.database.txs_rate = 5;
 
@@ -108,7 +108,7 @@ parser::parser(system::chain::selection context) NOEXCEPT
     configured.database.confirmed_size = 2'575'500;
     configured.database.confirmed_rate = 5;
 
-    configured.database.strong_tx_buckets = 688'193'037;
+    configured.database.strong_tx_bits = 30;
     configured.database.strong_tx_size = 3'150'000'000;
     configured.database.strong_tx_rate = 5;
 
@@ -118,22 +118,22 @@ parser::parser(system::chain::selection context) NOEXCEPT
     configured.database.prevout_size = 5'250'000'000;
     configured.database.prevout_rate = 5;
 
-    configured.database.validated_tx_buckets = 0;
+    configured.database.validated_tx_bits = 0;
     configured.database.validated_tx_size = 1;
     configured.database.validated_tx_rate = 5;
 
-    configured.database.validated_bk_buckets = 566'667;
+    configured.database.validated_bk_bits = 21;
     configured.database.validated_bk_size = 3'400'000;
     configured.database.validated_bk_rate = 5;
 
     // database (optionals)
 
-    configured.database.address_buckets = 0;
+    configured.database.address_bits = 0;
     configured.database.address_size = 1;
     configured.database.address_rate = 5;
 
-    configured.database.neutrino_buckets = 0;
-    configured.database.neutrino_size =  1;
+    configured.database.neutrino_bits = 0;
+    configured.database.neutrino_size = 1;
     configured.database.neutrino_rate = 5;
 }
 
@@ -653,9 +653,9 @@ options_metadata parser::load_settings() THROWS
 
     /* header */
     (
-        "database.header_buckets",
-        value<uint32_t>(&configured.database.header_buckets),
-        "The number of buckets in the header table head, defaults to '566667'."
+        "database.header_bits",
+        value<uint32_t>(&configured.database.header_bits),
+        "The log2 number of buckets in the header table head, defaults to '20'."
     )
     (
         "database.header_size",
@@ -694,9 +694,9 @@ options_metadata parser::load_settings() THROWS
 
     /* point */
     (
-        "database.point_buckets",
-        value<uint32_t>(&configured.database.point_buckets),
-        "The number of buckets in the spend table head, defaults to '1750905073'."
+        "database.point_bits",
+        value<uint32_t>(&configured.database.point_bits),
+        "The log2 number of buckets in the spend table head, defaults to '31'."
     )
     (
         "database.point_size",
@@ -735,9 +735,9 @@ options_metadata parser::load_settings() THROWS
 
     /* tx */
     (
-        "database.tx_buckets",
-        value<uint32_t>(&configured.database.tx_buckets),
-        "The number of buckets in the tx table head, defaults to '688193037'."
+        "database.tx_bits",
+        value<uint32_t>(&configured.database.tx_bits),
+        "The log2 number of buckets in the tx table head, defaults to '30'."
     )
     (
         "database.tx_size",
@@ -752,9 +752,9 @@ options_metadata parser::load_settings() THROWS
 
     /* txs */
     (
-        "database.txs_buckets",
-        value<uint32_t>(&configured.database.txs_buckets),
-        "The number of buckets in the txs table head, defaults to '566667'."
+        "database.txs_bits",
+        value<uint32_t>(&configured.database.txs_bits),
+        "The log2 number of buckets in the txs table head, defaults to '20'."
     )
     (
         "database.txs_size",
@@ -793,9 +793,9 @@ options_metadata parser::load_settings() THROWS
 
     /* strong_tx */
     (
-        "database.strong_tx_buckets",
-        value<uint32_t>(&configured.database.strong_tx_buckets),
-        "The number of buckets in the strong_tx table head, defaults to '688193037'."
+        "database.strong_tx_bits",
+        value<uint32_t>(&configured.database.strong_tx_bits),
+        "The log2 number of buckets in the strong_tx table head, defaults to '30'."
     )
     (
         "database.strong_tx_size",
@@ -827,8 +827,8 @@ options_metadata parser::load_settings() THROWS
 
     /* validated_tx */
     (
-        "database.validated_tx_buckets",
-        value<uint32_t>(&configured.database.validated_tx_buckets),
+        "database.validated_tx_bits",
+        value<uint32_t>(&configured.database.validated_tx_bits),
         "The number of buckets in the validated_tx table head, defaults to '0' (0 disables)."
     )
     (
@@ -844,9 +844,9 @@ options_metadata parser::load_settings() THROWS
 
     /* validated_bk */
     (
-        "database.validated_bk_buckets",
-        value<uint32_t>(&configured.database.validated_bk_buckets),
-        "The number of buckets in the validated_bk table head, defaults to '566667'."
+        "database.validated_bk_bits",
+        value<uint32_t>(&configured.database.validated_bk_bits),
+        "The log2 number of buckets in the validated_bk table head, defaults to '21'."
     )
     (
         "database.validated_bk_size",
@@ -861,9 +861,9 @@ options_metadata parser::load_settings() THROWS
 
     /* address */
     (
-        "database.address_buckets",
-        value<uint32_t>(&configured.database.address_buckets),
-        "The number of buckets in the address table head, defaults to '0' (0 disables)."
+        "database.address_bits",
+        value<uint32_t>(&configured.database.address_bits),
+        "The log2 number of buckets in the address table head, defaults to '0' (0 disables)."
     )
     (
         "database.address_size",
@@ -878,9 +878,9 @@ options_metadata parser::load_settings() THROWS
 
     /* neutrino */
     (
-        "database.neutrino_buckets",
-        value<uint32_t>(&configured.database.neutrino_buckets),
-        "The number of buckets in the neutrino table head, defaults to '0' (0 disables)."
+        "database.neutrino_bits",
+        value<uint32_t>(&configured.database.neutrino_bits),
+        "The log2 number of buckets in the neutrino table head, defaults to '0' (0 disables)."
     )
     (
         "database.neutrino_size",