diff --git a/console/executor_dumps.cpp b/console/executor_dumps.cpp index 4d0db7fd..2fc84b02 100644 --- a/console/executor_dumps.cpp +++ b/console/executor_dumps.cpp @@ -104,8 +104,9 @@ void executor::dump_body_sizes() const query_.ecdsa_body_size() % query_.schnorr_body_size() % query_.silent_body_size() % - query_.duplicate_body_size() % + query_.prevalid_body_size() % query_.prevout_body_size() % + query_.duplicate_body_size() % query_.strong_tx_body_size() % query_.validated_bk_body_size() % query_.validated_tx_body_size() % @@ -127,6 +128,7 @@ void executor::dump_records() const query_.ecdsa_records() % query_.schnorr_records() % query_.silent_records() % + query_.prevalid_records() % query_.duplicate_records() % query_.strong_tx_records() % query_.filter_bk_records() % @@ -140,8 +142,8 @@ void executor::dump_buckets() const query_.txs_buckets() % query_.tx_buckets() % query_.point_buckets() % - query_.duplicate_buckets() % query_.prevout_buckets() % + query_.duplicate_buckets() % query_.strong_tx_buckets() % query_.validated_bk_buckets() % query_.validated_tx_buckets() % diff --git a/console/localize.hpp b/console/localize.hpp index 947dc199..5d191292 100644 --- a/console/localize.hpp +++ b/console/localize.hpp @@ -88,14 +88,15 @@ " ecdsa :%11%\n" \ " schnorr :%12%\n" \ " silent :%13%\n" \ - " duplicate :%14%\n" \ + " prevalid :%14%\n" \ " prevout :%15%\n" \ - " strong_tx :%16%\n" \ - " valid_bk :%17%\n" \ - " valid_tx :%18%\n" \ - " filter_bk :%19%\n" \ - " filter_tx :%20%\n" \ - " address :%21%" + " duplicate :%16%\n" \ + " strong_tx :%17%\n" \ + " valid_bk :%18%\n" \ + " valid_tx :%19%\n" \ + " filter_bk :%20%\n" \ + " filter_tx :%21%\n" \ + " address :%22%" #define BS_INFORMATION_RECORDS \ "Table records...\n" \ " header :%1%\n" \ @@ -108,10 +109,11 @@ " ecdsa :%8%\n" \ " schnorr :%9%\n" \ " silent :%10%\n" \ - " duplicate :%11%\n" \ - " strong_tx :%12%\n" \ - " filter_bk :%13%\n" \ - " address :%14%" + " prevalid :%11%\n" \ + " duplicate :%12%\n" \ + " strong_tx :%13%\n" \ + " filter_bk :%14%\n" \ + " address :%15%" #define BS_INFORMATION_SLABS \ "Table slabs..." #define BS_INFORMATION_SLABS_ROW \ @@ -126,8 +128,8 @@ " txs :%2%\n" \ " tx :%3%\n" \ " point :%4%\n" \ - " duplicate :%5%\n" \ - " prevout :%6%\n" \ + " prevout :%5%\n" \ + " duplicate :%6%\n" \ " strong_tx :%7%\n" \ " valid_bk :%8%\n" \ " valid_tx :%9%\n" \ diff --git a/src/parser.cpp b/src/parser.cpp index 81d369c8..e797d466 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -151,14 +151,18 @@ parser::parser(system::chain::selection context, configured.database.silent_size = 1; configured.database.silent_rate = 5; - configured.database.duplicate_buckets = 1024; - configured.database.duplicate_size = 44; - configured.database.duplicate_rate = 5; + // No need for size or rate, expands all in one shot (config disabled). + configured.database.prevalid_size = 1; + configured.database.prevalid_rate = 0; configured.database.prevout_buckets = 0; configured.database.prevout_size = 1; configured.database.prevout_rate = 5; + configured.database.duplicate_buckets = 1024; + configured.database.duplicate_size = 44; + configured.database.duplicate_rate = 5; + configured.database.validated_bk_buckets = 950'001; configured.database.validated_bk_size = 1'700'000; configured.database.validated_bk_rate = 5; @@ -1638,22 +1642,17 @@ options_metadata parser::load_settings() THROWS "The percentage expansion of the batch_schnorr table body, defaults to '5'." ) - /* duplicate */ - ( - "database.duplicate_buckets", - value(&configured.database.duplicate_buckets), - "The minimum number of buckets in the cache_duplicate table head, defaults to '1024'." - ) - ( - "database.duplicate_size", - value(&configured.database.duplicate_size), - "The minimum allocation of the cache_duplicate table body, defaults to '44'." - ) - ( - "database.duplicate_rate", - value(&configured.database.duplicate_rate), - "The percentage expansion of the cache_duplicate table, defaults to '5'." - ) + /////* prevalid */ + ////( + //// "database.prevalid_size", + //// value(&configured.database.prevalid_size), + //// "The minimum allocation of the batch_prevalid table body, defaults to '1'." + ////) + ////( + //// "database.prevalid_rate", + //// value(&configured.database.prevalid_rate), + //// "The percentage expansion of the batch_prevalid table, defaults to '5'." + ////) /* prevout */ ( @@ -1672,6 +1671,23 @@ options_metadata parser::load_settings() THROWS "The percentage expansion of the cache_prevout table, defaults to '5'." ) + /* duplicate */ + ( + "database.duplicate_buckets", + value(&configured.database.duplicate_buckets), + "The minimum number of buckets in the cache_duplicate table head, defaults to '1024'." + ) + ( + "database.duplicate_size", + value(&configured.database.duplicate_size), + "The minimum allocation of the cache_duplicate table body, defaults to '44'." + ) + ( + "database.duplicate_rate", + value(&configured.database.duplicate_rate), + "The percentage expansion of the cache_duplicate table, defaults to '5'." + ) + /* validated_bk */ ( "database.validated_bk_buckets",