Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 7 insertions, 15 deletions

diff --git a/src/mongo/shell/shell_utils.cpp b/src/mongo/shell/shell_utils.cpp
index abdbb179bfa..cb82f223f9b 100644
--- a/src/mongo/shell/shell_utils.cpp
+++ b/src/mongo/shell/shell_utils.cpp
@@ -521,23 +521,15 @@ BSONObj numberDecimalsAlmostEqual(const BSONObj& input, void*) {
     auto ten = Decimal128(10);
     auto exponent = a.toAbs().logarithm(ten).round();
 
-    // Early exit for zero, infinity and NaN cases.
-    if ((a.isZero() && b.isZero()) || (a.isNaN() && b.isNaN()) ||
-        (a.isInfinite() && b.isInfinite() && (a.isNegative() == b.isNegative()))) {
-        return BSON("" << true /* isErrorAcceptable */);
-    } else if (!a.isZero() && !b.isZero()) {
-        // Return early if arguments are not the same order of magnitude.
-        if (exponent != b.toAbs().logarithm(ten).round()) {
-            return BSON("" << false);
-        }
-
-        // Put the whole number behind the decimal point.
-        if (!exponent.isZero()) {
-            a = a.divide(ten.power(exponent));
-            b = b.divide(ten.power(exponent));
-        }
+    // Return early if arguments are not the same order of magnitude.
+    if (exponent != b.toAbs().logarithm(ten).round()) {
+        return BSON("" << false);
     }
 
+    // Put the whole number behind the decimal point.
+    a = a.divide(ten.power(exponent));
+    b = b.divide(ten.power(exponent));
+
     auto places = third.numberDecimal();
     auto isErrorAcceptable = a.subtract(b)
                                  .toAbs()