From d52885d68df850448e387f9a53efe46310440419 Mon Sep 17 00:00:00 2001 From: Niclas Antti Date: Mon, 30 Jul 2018 13:55:33 +0300 Subject: [PATCH] MXS-1777 Cosmetic changes based on code reviews. --- maxutils/maxbase/include/maxbase/average.hh | 9 +++++---- maxutils/maxbase/src/average.cc | 8 ++++---- server/modules/routing/readwritesplit/readwritesplit.hh | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/maxutils/maxbase/include/maxbase/average.hh b/maxutils/maxbase/include/maxbase/average.hh index 3f275645e..9264f3825 100644 --- a/maxutils/maxbase/include/maxbase/average.hh +++ b/maxutils/maxbase/include/maxbase/average.hh @@ -28,13 +28,14 @@ public: int num_samples() const; void reset(); CumulativeAverage& operator+=(const CumulativeAverage& rhs); - CumulativeAverage operator+(const CumulativeAverage& rhs) const; private: double m_ave = 0; int m_num_samples = 0; int m_num_last_added = 0; }; +CumulativeAverage operator+(const CumulativeAverage& rhs, const CumulativeAverage& lhs); + /** Exponential Moving Average. */ class EMAverage { @@ -54,9 +55,9 @@ public: private: const double m_min_alpha; const double m_max_alpha; - int m_sample_max; - int m_num_samples = 0; - double m_ave = 0; + int m_sample_max; + int m_num_samples = 0; + double m_ave = 0; }; } // maxbase diff --git a/maxutils/maxbase/src/average.cc b/maxutils/maxbase/src/average.cc index bff3f7ab0..cc6bd3e5f 100644 --- a/maxutils/maxbase/src/average.cc +++ b/maxutils/maxbase/src/average.cc @@ -43,15 +43,15 @@ int CumulativeAverage::num_samples() const return m_num_samples; } -CumulativeAverage &CumulativeAverage::operator+=(const CumulativeAverage &rhs) +CumulativeAverage &CumulativeAverage::operator+=(const CumulativeAverage& rhs) { this->add(rhs.m_ave, rhs.m_num_samples); return *this; } -CumulativeAverage CumulativeAverage::operator+(const CumulativeAverage &rhs) const +CumulativeAverage operator+(const CumulativeAverage& lhs, const CumulativeAverage& rhs) { - return CumulativeAverage(*this) += rhs; + return CumulativeAverage(lhs) += rhs; } void CumulativeAverage::reset() @@ -84,7 +84,7 @@ void EMAverage::add(double ave, int num_samples) } } -void EMAverage::add(const CumulativeAverage &ca) +void EMAverage::add(const CumulativeAverage& ca) { add(ca.average(), ca.num_samples()); } diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh index 0ef1e7532..ff6320967 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.hh +++ b/server/modules/routing/readwritesplit/readwritesplit.hh @@ -103,7 +103,7 @@ static const MXS_ENUM_VALUE slave_selection_criteria_values[] = {"LEAST_ROUTER_CONNECTIONS", LEAST_ROUTER_CONNECTIONS}, {"LEAST_BEHIND_MASTER", LEAST_BEHIND_MASTER}, {"LEAST_CURRENT_OPERATIONS", LEAST_CURRENT_OPERATIONS}, - {"LOWEST_RESPONSE_TIME", LOWEST_RESPONSE_TIME}, + {"LOWEST_RESPONSE_TIME", LOWEST_RESPONSE_TIME}, {NULL} };