summaryrefslogtreecommitdiff
path: root/src/mongo/util
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2019-04-24 17:26:22 -0400
committerBilly Donahue <billy.donahue@mongodb.com>2019-04-30 00:28:32 -0400
commit3d2cb8571b68999c10a5fab5bd0e8b9e5e498337 (patch)
treee8df2217e2fd568e25b8cd1a1a3e3aa17d6247cd /src/mongo/util
parent54e3e3d5de5a87ca76c98c97fb4e46fdfacf525d (diff)
downloadmongo-3d2cb8571b68999c10a5fab5bd0e8b9e5e498337.tar.gz
SERVER-40813 remove all -inl.h files
Diffstat (limited to 'src/mongo/util')
-rw-r--r--src/mongo/util/descriptive_stats-inl.h199
-rw-r--r--src/mongo/util/safe_num-inl.h130
-rw-r--r--src/mongo/util/safe_num.h98
3 files changed, 96 insertions, 331 deletions
diff --git a/src/mongo/util/descriptive_stats-inl.h b/src/mongo/util/descriptive_stats-inl.h
deleted file mode 100644
index 1b7239a3cbf..00000000000
--- a/src/mongo/util/descriptive_stats-inl.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * Copyright (C) 2018-present MongoDB, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the Server Side Public License, version 1,
- * as published by MongoDB, Inc.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Server Side Public License for more details.
- *
- * You should have received a copy of the Server Side Public License
- * along with this program. If not, see
- * <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the Server Side Public License in all respects for
- * all of the code used other than as permitted herein. If you modify file(s)
- * with this exception, you may extend this exception to your version of the
- * file(s), but you are not obligated to do so. If you do not wish to do so,
- * delete this exception statement from your version. If you delete this
- * exception statement from all source files in the program, then also delete
- * it in the license file.
- */
-
-#pragma once
-
-#include <algorithm>
-#include <limits>
-
-#include "mongo/util/str.h"
-
-namespace mongo {
-
-template <class Sample>
-BasicEstimators<Sample>::BasicEstimators()
- : _count(0),
- _sum(0),
- _diff(0),
- _min(std::numeric_limits<Sample>::max()),
- _max(std::numeric_limits<Sample>::min()) {}
-
-template <class Sample>
-BasicEstimators<Sample>& BasicEstimators<Sample>::operator<<(const Sample sample) {
- const double oldMean = (_count > 0) ? _sum / _count : 0;
- const double delta = oldMean - static_cast<double>(sample);
- const double weight = static_cast<double>(_count) / (_count + 1);
- _diff += delta * delta * weight;
- _sum += static_cast<double>(sample);
- _count++;
- _min = std::min(sample, _min);
- _max = std::max(sample, _max);
- return *this;
-}
-
-template <class Sample>
-void BasicEstimators<Sample>::appendBasicToBSONObjBuilder(BSONObjBuilder& b) const {
- b << "count" << static_cast<long long>(count()) << "mean" << mean() << "stddev" << stddev()
- << "min" << min() << "max" << max();
-}
-
-template <std::size_t NumQuantiles>
-DistributionEstimators<NumQuantiles>::DistributionEstimators() : _count(0) {
- for (std::size_t i = 0; i < NumMarkers; i++) {
- _actual_positions[i] = i + 1;
- }
-
- for (std::size_t i = 0; i < NumMarkers; i++) {
- _desired_positions[i] = 1.0 + (2.0 * (NumQuantiles + 1.0) * _positions_increments(i));
- }
-}
-
-/*
- * The quantile estimation follows the extended_p_square implementation in boost.accumulators.
- * It differs by removing the ability to request arbitrary quantiles and computing exactly
- * 'NumQuantiles' equidistant quantiles (plus minimum and maximum) instead.
- * See http://www.boost.org/doc/libs/1_51_0/doc/html/boost/accumulators/impl/
- * extended_p_square_impl.html ,
- * R. Jain and I. Chlamtac, The P^2 algorithmus for dynamic calculation of quantiles and histograms
- * without storing observations, Communications of the ACM, Volume 28
- * (October), Number 10, 1985, p. 1076-1085. and
- * K. E. E. Raatikainen, Simultaneous estimation of several quantiles, Simulation,
- * Volume 49, Number 4 (October), 1986, p. 159-164.
- */
-template <std::size_t NumQuantiles>
-DistributionEstimators<NumQuantiles>& DistributionEstimators<NumQuantiles>::operator<<(
- const double sample) {
- // first accumulate num_markers samples
- if (_count++ < NumMarkers) {
- _heights[_count - 1] = sample;
-
- if (_count == NumMarkers) {
- std::sort(_heights, _heights + NumMarkers);
- }
- } else {
- std::size_t sample_cell = 1;
-
- // find cell k = sample_cell such that heights[k-1] <= sample < heights[k]
- if (sample < _heights[0]) {
- _heights[0] = sample;
- sample_cell = 1;
- } else if (sample >= _heights[NumMarkers - 1]) {
- _heights[NumMarkers - 1] = sample;
- sample_cell = NumMarkers - 1;
- } else {
- double* it = std::upper_bound(_heights, _heights + NumMarkers, sample);
-
- sample_cell = std::distance(_heights, it);
- }
-
- // update actual positions of all markers above sample_cell index
- for (std::size_t i = sample_cell; i < NumMarkers; i++) {
- _actual_positions[i]++;
- }
-
- // update desired positions of all markers
- for (std::size_t i = 0; i < NumMarkers; i++) {
- _desired_positions[i] += _positions_increments(i);
- }
-
- // adjust heights and actual positions of markers 1 to num_markers-2 if necessary
- for (std::size_t i = 1; i <= NumMarkers - 2; i++) {
- // offset to desired position
- double d = _desired_positions[i] - _actual_positions[i];
-
- // offset to next position
- double dp = _actual_positions[i + 1] - _actual_positions[i];
-
- // offset to previous position
- double dm = _actual_positions[i - 1] - _actual_positions[i];
-
- // height ds
- double hp = (_heights[i + 1] - _heights[i]) / dp;
- double hm = (_heights[i - 1] - _heights[i]) / dm;
-
- if ((d >= 1 && dp > 1) || (d <= -1 && dm < -1)) {
- short sign_d = static_cast<short>(d / std::abs(d));
-
- double h =
- _heights[i] + sign_d / (dp - dm) * ((sign_d - dm) * hp + (dp - sign_d) * hm);
-
- // try adjusting heights[i] using p-squared formula
- if (_heights[i - 1] < h && h < _heights[i + 1]) {
- _heights[i] = h;
- } else {
- // use linear formula
- if (d > 0) {
- _heights[i] += hp;
- }
- if (d < 0) {
- _heights[i] -= hm;
- }
- }
- _actual_positions[i] += sign_d;
- }
- }
- }
-
- return *this;
-}
-
-template <std::size_t NumQuantiles>
-void DistributionEstimators<NumQuantiles>::appendQuantilesToBSONArrayBuilder(
- BSONArrayBuilder& arr) const {
- verify(quantilesReady());
- for (std::size_t i = 0; i <= NumQuantiles + 1; i++) {
- arr << quantile(i);
- }
-}
-
-template <std::size_t NumQuantiles>
-inline double DistributionEstimators<NumQuantiles>::_positions_increments(std::size_t i) const {
- return static_cast<double>(i) / (2 * (NumQuantiles + 1));
-}
-
-template <class Sample, std::size_t NumQuantiles>
-BSONObj SummaryEstimators<Sample, NumQuantiles>::statisticSummaryToBSONObj() const {
- BSONObjBuilder b;
- this->BasicEstimators<Sample>::appendBasicToBSONObjBuilder(b);
- if (this->DistributionEstimators<NumQuantiles>::quantilesReady()) {
- // Not using appendQuantiles to be explicit about which probability each quantile
- // refers to. This way the user does not need to count the quantiles or know in
- // advance how many quantiles were computed to figure out their meaning.
- BSONObjBuilder quantilesBuilder(b.subobjStart("quantiles"));
- for (size_t i = 1; i <= NumQuantiles; i++) {
- const double probability = this->DistributionEstimators<NumQuantiles>::probability(i);
- const double quantile = this->DistributionEstimators<NumQuantiles>::quantile(i);
- quantilesBuilder.append(std::string(str::stream() << probability), quantile);
- }
- quantilesBuilder.doneFast();
- }
- return b.obj();
-}
-
-} // namespace mongo
diff --git a/src/mongo/util/safe_num-inl.h b/src/mongo/util/safe_num-inl.h
deleted file mode 100644
index 8cd925aff72..00000000000
--- a/src/mongo/util/safe_num-inl.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright (C) 2018-present MongoDB, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the Server Side Public License, version 1,
- * as published by MongoDB, Inc.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Server Side Public License for more details.
- *
- * You should have received a copy of the Server Side Public License
- * along with this program. If not, see
- * <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the Server Side Public License in all respects for
- * all of the code used other than as permitted herein. If you modify file(s)
- * with this exception, you may extend this exception to your version of the
- * file(s), but you are not obligated to do so. If you do not wish to do so,
- * delete this exception statement from your version. If you delete this
- * exception statement from all source files in the program, then also delete
- * it in the license file.
- */
-
-#pragma once
-
-namespace mongo {
-
-inline SafeNum::SafeNum() : _type(EOO) {}
-
-inline SafeNum::~SafeNum() {}
-
-inline SafeNum::SafeNum(const SafeNum& rhs) : _type(rhs._type), _value(rhs._value) {}
-
-inline SafeNum& SafeNum::operator=(const SafeNum& rhs) {
- _type = rhs._type;
- _value = rhs._value;
- return *this;
-}
-
-inline SafeNum::SafeNum(int32_t num) : _type(NumberInt) {
- _value.int32Val = num;
-}
-
-inline SafeNum::SafeNum(int64_t num) : _type(NumberLong) {
- _value.int64Val = num;
-}
-
-inline SafeNum::SafeNum(double num) : _type(NumberDouble) {
- _value.doubleVal = num;
-}
-
-inline SafeNum::SafeNum(Decimal128 num) : _type(NumberDecimal) {
- _value.decimalVal = num.getValue();
-}
-
-inline bool SafeNum::operator==(const SafeNum& rhs) const {
- return isEquivalent(rhs);
-}
-
-inline bool SafeNum::operator!=(const SafeNum& rhs) const {
- return !isEquivalent(rhs);
-}
-
-inline SafeNum SafeNum::operator+(const SafeNum& rhs) const {
- return addInternal(*this, rhs);
-}
-
-inline SafeNum& SafeNum::operator+=(const SafeNum& rhs) {
- return *this = addInternal(*this, rhs);
-}
-
-inline SafeNum SafeNum::operator*(const SafeNum& rhs) const {
- return mulInternal(*this, rhs);
-}
-
-inline SafeNum& SafeNum::operator*=(const SafeNum& rhs) {
- return *this = mulInternal(*this, rhs);
-}
-
-inline SafeNum SafeNum::bitAnd(const SafeNum& rhs) const {
- return andInternal(*this, rhs);
-}
-
-inline SafeNum SafeNum::operator&(const SafeNum& rhs) const {
- return bitAnd(rhs);
-}
-
-inline SafeNum& SafeNum::operator&=(const SafeNum& rhs) {
- return *this = bitAnd(rhs);
-}
-
-inline SafeNum SafeNum::bitOr(const SafeNum& rhs) const {
- return orInternal(*this, rhs);
-}
-
-inline SafeNum SafeNum::operator|(const SafeNum& rhs) const {
- return bitOr(rhs);
-}
-
-inline SafeNum& SafeNum::operator|=(const SafeNum& rhs) {
- return *this = bitOr(rhs);
-}
-
-inline SafeNum SafeNum::bitXor(const SafeNum& rhs) const {
- return xorInternal(*this, rhs);
-}
-
-inline SafeNum SafeNum::operator^(const SafeNum& rhs) const {
- return bitXor(rhs);
-}
-
-inline SafeNum& SafeNum::operator^=(const SafeNum& rhs) {
- return *this = bitXor(rhs);
-}
-
-inline bool SafeNum::isValid() const {
- return _type != EOO;
-}
-
-inline BSONType SafeNum::type() const {
- return _type;
-}
-
-} // namespace mongo
diff --git a/src/mongo/util/safe_num.h b/src/mongo/util/safe_num.h
index f6ef4042533..529adec4878 100644
--- a/src/mongo/util/safe_num.h
+++ b/src/mongo/util/safe_num.h
@@ -242,6 +242,100 @@ private:
// Convenience method for unittest code. Please use accessors otherwise.
std::ostream& operator<<(std::ostream& os, const SafeNum& snum);
-} // namespace mongo
+inline SafeNum::SafeNum() : _type(EOO) {}
+
+inline SafeNum::~SafeNum() {}
+
+inline SafeNum::SafeNum(const SafeNum& rhs) : _type(rhs._type), _value(rhs._value) {}
+
+inline SafeNum& SafeNum::operator=(const SafeNum& rhs) {
+ _type = rhs._type;
+ _value = rhs._value;
+ return *this;
+}
+
+inline SafeNum::SafeNum(int32_t num) : _type(NumberInt) {
+ _value.int32Val = num;
+}
+
+inline SafeNum::SafeNum(int64_t num) : _type(NumberLong) {
+ _value.int64Val = num;
+}
+
+inline SafeNum::SafeNum(double num) : _type(NumberDouble) {
+ _value.doubleVal = num;
+}
+
+inline SafeNum::SafeNum(Decimal128 num) : _type(NumberDecimal) {
+ _value.decimalVal = num.getValue();
+}
+
+inline bool SafeNum::operator==(const SafeNum& rhs) const {
+ return isEquivalent(rhs);
+}
+
+inline bool SafeNum::operator!=(const SafeNum& rhs) const {
+ return !isEquivalent(rhs);
+}
+
+inline SafeNum SafeNum::operator+(const SafeNum& rhs) const {
+ return addInternal(*this, rhs);
+}
+
+inline SafeNum& SafeNum::operator+=(const SafeNum& rhs) {
+ return *this = addInternal(*this, rhs);
+}
+
+inline SafeNum SafeNum::operator*(const SafeNum& rhs) const {
+ return mulInternal(*this, rhs);
+}
+
+inline SafeNum& SafeNum::operator*=(const SafeNum& rhs) {
+ return *this = mulInternal(*this, rhs);
+}
+
+inline SafeNum SafeNum::bitAnd(const SafeNum& rhs) const {
+ return andInternal(*this, rhs);
+}
+
+inline SafeNum SafeNum::operator&(const SafeNum& rhs) const {
+ return bitAnd(rhs);
+}
+
+inline SafeNum& SafeNum::operator&=(const SafeNum& rhs) {
+ return *this = bitAnd(rhs);
+}
+
+inline SafeNum SafeNum::bitOr(const SafeNum& rhs) const {
+ return orInternal(*this, rhs);
+}
+
+inline SafeNum SafeNum::operator|(const SafeNum& rhs) const {
+ return bitOr(rhs);
+}
+
+inline SafeNum& SafeNum::operator|=(const SafeNum& rhs) {
+ return *this = bitOr(rhs);
+}
+
+inline SafeNum SafeNum::bitXor(const SafeNum& rhs) const {
+ return xorInternal(*this, rhs);
+}
+
+inline SafeNum SafeNum::operator^(const SafeNum& rhs) const {
+ return bitXor(rhs);
+}
+
+inline SafeNum& SafeNum::operator^=(const SafeNum& rhs) {
+ return *this = bitXor(rhs);
+}
+
+inline bool SafeNum::isValid() const {
+ return _type != EOO;
+}
-#include "mongo/util/safe_num-inl.h"
+inline BSONType SafeNum::type() const {
+ return _type;
+}
+
+} // namespace mongo