Merge pull request #774 from evoskuil/master

Remove arraymaps from collision rate report.

Author: evoskuil

console/executor_dumps.cpp

@@ -141,19 +141,16 @@ void executor::dump_buckets() const
         query_.address_buckets());
 }
 
-// txs, validated_tx, validated_bk collision rates assume 1:1 records.
 void executor::dump_collisions() const
 {
     logger(format(BN_MEASURE_COLLISION_RATES) %
         (to_double(query_.header_records()) / query_.header_buckets()) %
-        (to_double(query_.header_records()) / query_.txs_buckets()) %
         (to_double(query_.tx_records()) / query_.tx_buckets()) %
         (to_double(query_.point_records()) / query_.point_buckets()) %
         (to_double(query_.strong_tx_records()) / query_.strong_tx_buckets()) %
-        (to_double(query_.header_records()) / query_.validated_bk_buckets()) %
         (to_double(query_.tx_records()) / query_.validated_tx_buckets()) %
-        (query_.address_enabled() ?
-            (to_double(query_.address_records()) / query_.address_buckets()) : zero));
+        (query_.address_enabled() ? (to_double(query_.address_records()) / 
+            query_.address_buckets()) : zero));
 }
 
 void executor::dump_progress() const

console/localize.hpp

@@ -126,13 +126,11 @@ namespace node {
 #define BN_MEASURE_COLLISION_RATES \
     "Collision rates...\n" \
     "   header    :%1%\n" \
-    "   txs       :%2%\n" \
-    "   tx        :%3%\n" \
-    "   point     :%4%\n" \
-    "   strong_tx :%5%\n" \
-    "   valid_bk  :%6%\n" \
-    "   valid_tx  :%7%\n" \
-    "   address   :%8%"
+    "   tx        :%2%\n" \
+    "   point     :%3%\n" \
+    "   strong_tx :%4%\n" \
+    "   valid_tx  :%5%\n" \
+    "   address   :%6%"
 #define BN_MEASURE_PROGRESS_START \
     "Thinking..."
 #define BN_MEASURE_PROGRESS \

include/bitcoin/node/chasers/chaser_organize.hpp

@@ -202,5 +202,6 @@ BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 BC_POP_WARNING()
 
 #undef CLASS
+#undef TEMPLATE
 
 #endif

install-cmake.sh

@@ -899,7 +899,7 @@ build_from_tarball_boost()
         "$BOOST_CXXFLAGS" \
         "$BOOST_LINKFLAGS" \
         "link=$BOOST_LINK" \
-	"warnings=off" \
+        "warnings=off" \
         "boost.locale.iconv=$BOOST_ICU_ICONV" \
         "boost.locale.posix=$BOOST_ICU_POSIX" \
         "-sNO_BZIP2=1" \

install-cmakepresets.sh

@@ -942,7 +942,7 @@ build_from_tarball_boost()
         "$BOOST_CXXFLAGS" \
         "$BOOST_LINKFLAGS" \
         "link=$BOOST_LINK" \
-	"warnings=off" \
+        "warnings=off" \
         "boost.locale.iconv=$BOOST_ICU_ICONV" \
         "boost.locale.posix=$BOOST_ICU_POSIX" \
         "-sNO_BZIP2=1" \

install.sh

@@ -774,7 +774,7 @@ build_from_tarball_boost()
         "$BOOST_CXXFLAGS" \
         "$BOOST_LINKFLAGS" \
         "link=$BOOST_LINK" \
-	"warnings=off" \
+        "warnings=off" \
         "boost.locale.iconv=$BOOST_ICU_ICONV" \
         "boost.locale.posix=$BOOST_ICU_POSIX" \
         "-sNO_BZIP2=1" \