diff options
author | Alison Lu <alison.lu@mongodb.com> | 2021-06-21 20:36:23 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-25 20:31:55 +0000 |
commit | faa111304a5301eb321b016029766104de6d9272 (patch) | |
tree | e4f9cd28993ecb25938d04e6dd5b6cb3cb34eee1 /src/mongo/db/timeseries/minmax.cpp | |
parent | b13cd8a982b9f2598ba34a1e40cfe78738ef1c90 (diff) | |
download | mongo-faa111304a5301eb321b016029766104de6d9272.tar.gz |
SERVER-56717 Update naming and comment, simplify comparisons
Diffstat (limited to 'src/mongo/db/timeseries/minmax.cpp')
-rw-r--r-- | src/mongo/db/timeseries/minmax.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/mongo/db/timeseries/minmax.cpp b/src/mongo/db/timeseries/minmax.cpp index f59c7f0d7e6..77fe8ea2a5f 100644 --- a/src/mongo/db/timeseries/minmax.cpp +++ b/src/mongo/db/timeseries/minmax.cpp @@ -417,12 +417,11 @@ std::pair<MinMaxStore::Iterator, MinMaxStore::Iterator> MinMax::_update( }; if (elem.type() == Object) { - auto shouldUpdateObject = [&](MinMaxStore::Data& data, auto compare) { + auto shouldUpdateObject = [&](MinMaxStore::Data& data, auto comp) { return data.type() == MinMaxStore::Type::kObject || data.type() == MinMaxStore::Type::kUnset || - (data.type() == MinMaxStore::Type::kArray && compare(typeComp(Array), 0)) || - (data.type() == MinMaxStore::Type::kValue && - compare(typeComp(data.valueType()), 0)); + (data.type() == MinMaxStore::Type::kArray && comp(typeComp(Array), 0)) || + (data.type() == MinMaxStore::Type::kValue && comp(typeComp(data.valueType()), 0)); }; bool updateMin = updateMinValues && shouldUpdateObject(obj.element().min(), std::less<int>{}); @@ -446,12 +445,11 @@ std::pair<MinMaxStore::Iterator, MinMaxStore::Iterator> MinMax::_update( } if (elem.type() == Array) { - auto shouldUpdateArray = [&](MinMaxStore::Data& data, auto compare) { + auto shouldUpdateArray = [&](MinMaxStore::Data& data, auto comp) { return data.type() == MinMaxStore::Type::kArray || data.type() == MinMaxStore::Type::kUnset || - (data.type() == MinMaxStore::Type::kObject && compare(typeComp(Object), 0)) || - (data.type() == MinMaxStore::Type::kValue && - compare(typeComp(data.valueType()), 0)); + (data.type() == MinMaxStore::Type::kObject && comp(typeComp(Object), 0)) || + (data.type() == MinMaxStore::Type::kValue && comp(typeComp(data.valueType()), 0)); }; bool updateMin = updateMinValues && shouldUpdateArray(obj.element().min(), std::less<int>{}); @@ -485,21 +483,21 @@ std::pair<MinMaxStore::Iterator, MinMaxStore::Iterator> MinMax::_update( return {obj.iterator(), obj.parent().end()}; } - auto maybeUpdateValue = [&](MinMaxStore::Data& data, auto compare) { + auto maybeUpdateValue = [&](MinMaxStore::Data& data, auto comp) { if (data.type() == MinMaxStore::Type::kUnset || - (data.type() == MinMaxStore::Type::kObject && compare(typeComp(Object), 0)) || - (data.type() == MinMaxStore::Type::kArray && compare(typeComp(Array), 0)) || + (data.type() == MinMaxStore::Type::kObject && comp(typeComp(Object), 0)) || + (data.type() == MinMaxStore::Type::kArray && comp(typeComp(Array), 0)) || (data.type() == MinMaxStore::Type::kValue && - compare(elem.woCompare(data.value(), false, stringComparator), 0))) { + elem.compare(data.value(), comp, stringComparator))) { data.setValue(elem); } }; if (updateMinValues) { - maybeUpdateValue(obj.element().min(), std::less<int>{}); + maybeUpdateValue(obj.element().min(), std::less<>{}); } if (updateMaxValues) { - maybeUpdateValue(obj.element().max(), std::greater<int>{}); + maybeUpdateValue(obj.element().max(), std::greater<>{}); } return {obj.iterator(), obj.parent().end()}; |