replace get_point_rate() hack with _search_count() hacks.

Author: evoskuil

include/bitcoin/database/impl/query/query.ipp

@@ -74,14 +74,6 @@ CLASS::query(Store& store) NOEXCEPT
 {
 }
 
-TEMPLATE
-uint64_t CLASS::get_point_rate() const NOEXCEPT
-{
-    const auto negative = (double)store_.point.negative_search_count();
-    const auto positive = (double)store_.point.positive_search_count();
-    return static_cast<uint64_t>(10'000.0 * (positive / (positive + negative)));
-}
-
 TEMPLATE
 code CLASS::get_code() const NOEXCEPT
 {

include/bitcoin/database/primitives/hashmap.hpp

@@ -49,6 +49,18 @@ class hashmap
 
     hashmap(storage& header, storage& body, const Link& buckets) NOEXCEPT;
 
+    /// Count of puts resulting in table body search to detect duplication.
+    size_t positive_search_count() const NOEXCEPT
+    {
+        return pcounter_.load(std::memory_order_relaxed);
+    }
+
+    /// Count of puts not resulting in table body search to detect duplication.
+    size_t negative_search_count() const NOEXCEPT
+    {
+        return ncounter_.load(std::memory_order_relaxed);
+    }
+
     /// Setup, not thread safe.
     /// -----------------------------------------------------------------------
 
@@ -79,16 +91,6 @@ class hashmap
     /// Increase count as neccesary to specified.
     bool expand(const Link& count) NOEXCEPT;
 
-    /// Count of puts resulting in table body search to detect duplication.
-    size_t negative_search_count() const NOEXCEPT
-    {
-        return ncounter_.load(std::memory_order_relaxed);
-    }
-    size_t positive_search_count() const NOEXCEPT
-    {
-        return pcounter_.load(std::memory_order_relaxed);
-    }
-
     /// Errors.
     /// -----------------------------------------------------------------------
 

include/bitcoin/database/query.hpp

@@ -76,6 +76,18 @@ class query
 
     query(Store& store) NOEXCEPT;
 
+    /// Count of puts resulting in table body search to detect duplication.
+    size_t positive_search_count() const NOEXCEPT
+    {
+        return store_.point.positive_search_count();
+    }
+
+    /// Count of puts not resulting in table body search to detect duplication.
+    size_t negative_search_count() const NOEXCEPT
+    {
+        return store_.point.negative_search_count();
+    }
+
     /// Store management from query-holder (not store owner) context.
     /// -----------------------------------------------------------------------
 
@@ -85,9 +97,6 @@ class query
     /// Get first fault code.
     code get_fault() const NOEXCEPT;
 
-    // TESTING
-    uint64_t get_point_rate() const NOEXCEPT;
-
     /// True if there is a fault condition (disk full is not a fault).
     bool is_fault() const NOEXCEPT;