From ef7b15f2dfd5953904c8e142fea65db2f250f9a4 Mon Sep 17 00:00:00 2001 From: Anna Wawrzyniak Date: Mon, 9 Jan 2023 22:39:17 +0000 Subject: SERVER-72326 Remove boost::format from SBE pretty printers due to TSAN race condition --- src/mongo/db/exec/sbe/values/value_printer.cpp | 3 +- src/mongo/db/exec/sbe/vm/vm_printer.cpp | 9 ++-- .../lower_constant_expression.txt | 2 +- .../exec/sbe/s_b_e_constant_test/sbe_constants.txt | 4 +- .../sbe/s_b_e_prim_binary_test/add_numeric.txt | 36 +++++++-------- .../sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt | 22 ++++----- .../exec/sbe/s_b_e_prim_binary_test/div_mixed.txt | 2 +- .../sbe/s_b_e_prim_binary_test/div_numeric.txt | 54 +++++++++++----------- .../exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt | 22 ++++----- .../s_b_e_prim_binary_test/greater_eq_numeric.txt | 22 ++++----- .../sbe/s_b_e_prim_binary_test/greater_numeric.txt | 22 ++++----- .../sbe/s_b_e_prim_binary_test/less_eq_numeric.txt | 22 ++++----- .../sbe/s_b_e_prim_binary_test/less_numeric.txt | 22 ++++----- .../sbe/s_b_e_prim_binary_test/mul_numeric.txt | 36 +++++++-------- .../sbe/s_b_e_prim_binary_test/neq_numeric.txt | 22 ++++----- .../sbe/s_b_e_prim_binary_test/sub_numeric.txt | 36 +++++++-------- .../sbe/s_b_e_prim_unary_test/negate_numeric.txt | 4 +- 17 files changed, 171 insertions(+), 169 deletions(-) diff --git a/src/mongo/db/exec/sbe/values/value_printer.cpp b/src/mongo/db/exec/sbe/values/value_printer.cpp index 9673d20a304..4cd70a9196b 100644 --- a/src/mongo/db/exec/sbe/values/value_printer.cpp +++ b/src/mongo/db/exec/sbe/values/value_printer.cpp @@ -27,7 +27,6 @@ * it in the license file. */ #include -#include #include "mongo/db/exec/sbe/values/makeobj_spec.h" #include "mongo/db/exec/sbe/values/sort_spec.h" @@ -334,7 +333,7 @@ template void ValuePrinter::writeNormalizedDouble(double value) { std::stringstream ss; ss.precision(std::numeric_limits::max_digits10); - ss << (boost::format("%f") % value); + ss << value; stream << ss.str(); } diff --git a/src/mongo/db/exec/sbe/vm/vm_printer.cpp b/src/mongo/db/exec/sbe/vm/vm_printer.cpp index 2ed13999339..140e0d99fcb 100644 --- a/src/mongo/db/exec/sbe/vm/vm_printer.cpp +++ b/src/mongo/db/exec/sbe/vm/vm_printer.cpp @@ -26,8 +26,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ - -#include +#include #include "mongo/db/exec/sbe/values/value_printer.h" #include "mongo/db/exec/sbe/vm/vm.h" @@ -124,7 +123,11 @@ template std::basic_ostream& operator<<( std::basic_ostream& os, const CodeFragmentFormatter::PcPointerFmt& a) { - return os << (boost::format("0x%04x") % (a.pcPointer - a.pcBegin)); + + auto flags = os.flags(); + os << "0x" << std::hex << std::setw(4) << std::setfill('0') << (a.pcPointer - a.pcBegin); + os.flags(flags); + return os; } template diff --git a/src/mongo/db/test_output/exec/sbe/a_b_t_plan_generation/lower_constant_expression.txt b/src/mongo/db/test_output/exec/sbe/a_b_t_plan_generation/lower_constant_expression.txt index 886e00729dc..5f8bf100411 100644 --- a/src/mongo/db/test_output/exec/sbe/a_b_t_plan_generation/lower_constant_expression.txt +++ b/src/mongo/db/test_output/exec/sbe/a_b_t_plan_generation/lower_constant_expression.txt @@ -26,7 +26,7 @@ Const [32] Const [3.14] -- OUTPUT: -3.140000L +3.1400000000000001L ==== VARIATION: decimal ==== -- INPUT: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_constant_test/sbe_constants.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_constant_test/sbe_constants.txt index a8c6ac8cd70..409121ad928 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_constant_test/sbe_constants.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_constant_test/sbe_constants.txt @@ -40,11 +40,11 @@ true -- INPUT EXPRESSION: -123.000000L +123L -- COMPILED EXPRESSION: [0x0000-0x000a] -0x0000: pushConstVal(value: 123.000000L); +0x0000: pushConstVal(value: 123L); -- INPUT EXPRESSION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_numeric.txt index fa72ba31f3d..1d2624ec040 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/add_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,8 +50,8 @@ SLOTS: [1: 12, 2: 123ll] RESULT: 135ll -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] -RESULT: 135.500000L +SLOTS: [1: 12, 2: 123.5L] +RESULT: 135.5L -- EXECUTE VARIATION: SLOTS: [1: 12, 2: NumberDecimal(223.500000000000)] @@ -74,8 +74,8 @@ SLOTS: [1: 23, 2: 123ll] RESULT: 146ll -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] -RESULT: 146.500000L +SLOTS: [1: 23, 2: 123.5L] +RESULT: 146.5L -- EXECUTE VARIATION: SLOTS: [1: 23, 2: NumberDecimal(223.500000000000)] @@ -98,35 +98,35 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: 246ll -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] -RESULT: 246.500000L +SLOTS: [1: 123ll, 2: 123.5L] +RESULT: 246.5L -- EXECUTE VARIATION: SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: NumberDecimal(346.500000000000) -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] -RESULT: 135.500000L +SLOTS: [1: 123.5L, 2: 12] +RESULT: 135.5L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] -RESULT: 146.500000L +SLOTS: [1: 123.5L, 2: 23] +RESULT: 146.5L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] -RESULT: 246.500000L +SLOTS: [1: 123.5L, 2: 123ll] +RESULT: 246.5L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] -RESULT: 247.000000L +SLOTS: [1: 123.5L, 2: 123.5L] +RESULT: 247L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: NumberDecimal(347.000000000000) -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: NumberDecimal(346.500000000000) -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: NumberDecimal(347.000000000000) -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt index dfa4a9a2b4f..9dd0277b613 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/cmp3w_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,7 +50,7 @@ SLOTS: [1: 12, 2: 123ll] RESULT: -1 -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] +SLOTS: [1: 12, 2: 123.5L] RESULT: -1 -- EXECUTE VARIATION: @@ -74,7 +74,7 @@ SLOTS: [1: 23, 2: 123ll] RESULT: -1 -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] +SLOTS: [1: 23, 2: 123.5L] RESULT: -1 -- EXECUTE VARIATION: @@ -98,7 +98,7 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: 0 -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] +SLOTS: [1: 123ll, 2: 123.5L] RESULT: -1 -- EXECUTE VARIATION: @@ -106,27 +106,27 @@ SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: -1 -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] +SLOTS: [1: 123.5L, 2: 12] RESULT: 1 -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] +SLOTS: [1: 123.5L, 2: 23] RESULT: 1 -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] +SLOTS: [1: 123.5L, 2: 123ll] RESULT: 1 -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] +SLOTS: [1: 123.5L, 2: 123.5L] RESULT: 0 -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: -1 -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: 1 -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: 1 -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_mixed.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_mixed.txt index 37cbb8f09f5..0155c6d07fe 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_mixed.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_mixed.txt @@ -155,7 +155,7 @@ RESULT: Nothing -- EXECUTE VARIATION: SLOTS: [1: 12, 2: 12] -RESULT: 1.000000L +RESULT: 1L -- EXECUTE VARIATION: SLOTS: [1: 12, 2: NumberDecimal(223.500000000000)] diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_numeric.txt index a12b6838985..95cd520f5e6 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/div_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -39,19 +39,19 @@ RESULT: Nothing -- EXECUTE VARIATION: SLOTS: [1: 12, 2: 12] -RESULT: 1.000000L +RESULT: 1L -- EXECUTE VARIATION: SLOTS: [1: 12, 2: 23] -RESULT: 0.521739L +RESULT: 0.52173913043478259L -- EXECUTE VARIATION: SLOTS: [1: 12, 2: 123ll] -RESULT: 0.097561L +RESULT: 0.097560975609756101L -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] -RESULT: 0.097166L +SLOTS: [1: 12, 2: 123.5L] +RESULT: 0.097165991902834009L -- EXECUTE VARIATION: SLOTS: [1: 12, 2: NumberDecimal(223.500000000000)] @@ -63,19 +63,19 @@ RESULT: Nothing -- EXECUTE VARIATION: SLOTS: [1: 23, 2: 12] -RESULT: 1.916667L +RESULT: 1.9166666666666667L -- EXECUTE VARIATION: SLOTS: [1: 23, 2: 23] -RESULT: 1.000000L +RESULT: 1L -- EXECUTE VARIATION: SLOTS: [1: 23, 2: 123ll] -RESULT: 0.186992L +RESULT: 0.18699186991869918L -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] -RESULT: 0.186235L +SLOTS: [1: 23, 2: 123.5L] +RESULT: 0.18623481781376519L -- EXECUTE VARIATION: SLOTS: [1: 23, 2: NumberDecimal(223.500000000000)] @@ -87,46 +87,46 @@ RESULT: Nothing -- EXECUTE VARIATION: SLOTS: [1: 123ll, 2: 12] -RESULT: 10.250000L +RESULT: 10.25L -- EXECUTE VARIATION: SLOTS: [1: 123ll, 2: 23] -RESULT: 5.347826L +RESULT: 5.3478260869565215L -- EXECUTE VARIATION: SLOTS: [1: 123ll, 2: 123ll] -RESULT: 1.000000L +RESULT: 1L -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] -RESULT: 0.995951L +SLOTS: [1: 123ll, 2: 123.5L] +RESULT: 0.99595141700404854L -- EXECUTE VARIATION: SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: NumberDecimal(0.5503355704697986577181208053691275) -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] -RESULT: 10.291667L +SLOTS: [1: 123.5L, 2: 12] +RESULT: 10.291666666666666L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] -RESULT: 5.369565L +SLOTS: [1: 123.5L, 2: 23] +RESULT: 5.3695652173913047L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] -RESULT: 1.004065L +SLOTS: [1: 123.5L, 2: 123ll] +RESULT: 1.0040650406504066L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] -RESULT: 1.000000L +SLOTS: [1: 123.5L, 2: 123.5L] +RESULT: 1L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: NumberDecimal(0.5525727069351230425055928411633110) -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: NumberDecimal(1.817073170731707317073170731707317) -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: NumberDecimal(1.809716599190283400809716599190283) -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt index d4e31976424..eed67bf2574 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/eq_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,7 +50,7 @@ SLOTS: [1: 12, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] +SLOTS: [1: 12, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -74,7 +74,7 @@ SLOTS: [1: 23, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] +SLOTS: [1: 23, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -98,7 +98,7 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] +SLOTS: [1: 123ll, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -106,27 +106,27 @@ SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] +SLOTS: [1: 123.5L, 2: 12] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] +SLOTS: [1: 123.5L, 2: 23] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] +SLOTS: [1: 123.5L, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] +SLOTS: [1: 123.5L, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: false -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: false -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_numeric.txt index c659666c713..5ef6af735ae 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_eq_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,7 +50,7 @@ SLOTS: [1: 12, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] +SLOTS: [1: 12, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -74,7 +74,7 @@ SLOTS: [1: 23, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] +SLOTS: [1: 23, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -98,7 +98,7 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] +SLOTS: [1: 123ll, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -106,27 +106,27 @@ SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] +SLOTS: [1: 123.5L, 2: 12] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] +SLOTS: [1: 123.5L, 2: 23] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] +SLOTS: [1: 123.5L, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] +SLOTS: [1: 123.5L, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: false -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: true -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_numeric.txt index efee609318e..9158a39c221 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/greater_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,7 +50,7 @@ SLOTS: [1: 12, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] +SLOTS: [1: 12, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -74,7 +74,7 @@ SLOTS: [1: 23, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] +SLOTS: [1: 23, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -98,7 +98,7 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] +SLOTS: [1: 123ll, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: @@ -106,27 +106,27 @@ SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] +SLOTS: [1: 123.5L, 2: 12] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] +SLOTS: [1: 123.5L, 2: 23] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] +SLOTS: [1: 123.5L, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] +SLOTS: [1: 123.5L, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: false -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: true -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_numeric.txt index 4d5a732442b..628a8d55b44 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_eq_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,7 +50,7 @@ SLOTS: [1: 12, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] +SLOTS: [1: 12, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -74,7 +74,7 @@ SLOTS: [1: 23, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] +SLOTS: [1: 23, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -98,7 +98,7 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] +SLOTS: [1: 123ll, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -106,27 +106,27 @@ SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] +SLOTS: [1: 123.5L, 2: 12] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] +SLOTS: [1: 123.5L, 2: 23] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] +SLOTS: [1: 123.5L, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] +SLOTS: [1: 123.5L, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: true -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: false -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_numeric.txt index f272ffe99e7..ae25820b998 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/less_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,7 +50,7 @@ SLOTS: [1: 12, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] +SLOTS: [1: 12, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -74,7 +74,7 @@ SLOTS: [1: 23, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] +SLOTS: [1: 23, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -98,7 +98,7 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] +SLOTS: [1: 123ll, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -106,27 +106,27 @@ SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] +SLOTS: [1: 123.5L, 2: 12] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] +SLOTS: [1: 123.5L, 2: 23] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] +SLOTS: [1: 123.5L, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] +SLOTS: [1: 123.5L, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: true -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: false -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_numeric.txt index 3b2f59e35e1..5e2d3dc7d95 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/mul_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,8 +50,8 @@ SLOTS: [1: 12, 2: 123ll] RESULT: 1476ll -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] -RESULT: 1482.000000L +SLOTS: [1: 12, 2: 123.5L] +RESULT: 1482L -- EXECUTE VARIATION: SLOTS: [1: 12, 2: NumberDecimal(223.500000000000)] @@ -74,8 +74,8 @@ SLOTS: [1: 23, 2: 123ll] RESULT: 2829ll -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] -RESULT: 2840.500000L +SLOTS: [1: 23, 2: 123.5L] +RESULT: 2840.5L -- EXECUTE VARIATION: SLOTS: [1: 23, 2: NumberDecimal(223.500000000000)] @@ -98,35 +98,35 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: 15129ll -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] -RESULT: 15190.500000L +SLOTS: [1: 123ll, 2: 123.5L] +RESULT: 15190.5L -- EXECUTE VARIATION: SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: NumberDecimal(27490.500000000000) -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] -RESULT: 1482.000000L +SLOTS: [1: 123.5L, 2: 12] +RESULT: 1482L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] -RESULT: 2840.500000L +SLOTS: [1: 123.5L, 2: 23] +RESULT: 2840.5L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] -RESULT: 15190.500000L +SLOTS: [1: 123.5L, 2: 123ll] +RESULT: 15190.5L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] -RESULT: 15252.250000L +SLOTS: [1: 123.5L, 2: 123.5L] +RESULT: 15252.25L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: NumberDecimal(27602.250000000000000000000000) -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: NumberDecimal(27490.500000000000) -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: NumberDecimal(27602.250000000000000000000000) -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_numeric.txt index d2900d64212..52c4e4dc80a 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/neq_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,7 +50,7 @@ SLOTS: [1: 12, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] +SLOTS: [1: 12, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -74,7 +74,7 @@ SLOTS: [1: 23, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] +SLOTS: [1: 23, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -98,7 +98,7 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] +SLOTS: [1: 123ll, 2: 123.5L] RESULT: true -- EXECUTE VARIATION: @@ -106,27 +106,27 @@ SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] +SLOTS: [1: 123.5L, 2: 12] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] +SLOTS: [1: 123.5L, 2: 23] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] +SLOTS: [1: 123.5L, 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] +SLOTS: [1: 123.5L, 2: 123.5L] RESULT: false -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: true -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: true -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: true -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_numeric.txt index e76850369b5..95ce1018c81 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_binary_test/sub_numeric.txt @@ -26,7 +26,7 @@ SLOTS: [1: Nothing, 2: 123ll] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: Nothing, 2: 123.500000L] +SLOTS: [1: Nothing, 2: 123.5L] RESULT: Nothing -- EXECUTE VARIATION: @@ -50,8 +50,8 @@ SLOTS: [1: 12, 2: 123ll] RESULT: -111ll -- EXECUTE VARIATION: -SLOTS: [1: 12, 2: 123.500000L] -RESULT: -111.500000L +SLOTS: [1: 12, 2: 123.5L] +RESULT: -111.5L -- EXECUTE VARIATION: SLOTS: [1: 12, 2: NumberDecimal(223.500000000000)] @@ -74,8 +74,8 @@ SLOTS: [1: 23, 2: 123ll] RESULT: -100ll -- EXECUTE VARIATION: -SLOTS: [1: 23, 2: 123.500000L] -RESULT: -100.500000L +SLOTS: [1: 23, 2: 123.5L] +RESULT: -100.5L -- EXECUTE VARIATION: SLOTS: [1: 23, 2: NumberDecimal(223.500000000000)] @@ -98,35 +98,35 @@ SLOTS: [1: 123ll, 2: 123ll] RESULT: 0ll -- EXECUTE VARIATION: -SLOTS: [1: 123ll, 2: 123.500000L] -RESULT: -0.500000L +SLOTS: [1: 123ll, 2: 123.5L] +RESULT: -0.5L -- EXECUTE VARIATION: SLOTS: [1: 123ll, 2: NumberDecimal(223.500000000000)] RESULT: NumberDecimal(-100.500000000000) -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: Nothing] +SLOTS: [1: 123.5L, 2: Nothing] RESULT: Nothing -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 12] -RESULT: 111.500000L +SLOTS: [1: 123.5L, 2: 12] +RESULT: 111.5L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 23] -RESULT: 100.500000L +SLOTS: [1: 123.5L, 2: 23] +RESULT: 100.5L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123ll] -RESULT: 0.500000L +SLOTS: [1: 123.5L, 2: 123ll] +RESULT: 0.5L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: 123.500000L] -RESULT: 0.000000L +SLOTS: [1: 123.5L, 2: 123.5L] +RESULT: 0L -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L, 2: NumberDecimal(223.500000000000)] +SLOTS: [1: 123.5L, 2: NumberDecimal(223.500000000000)] RESULT: NumberDecimal(-100.000000000000) -- EXECUTE VARIATION: @@ -146,7 +146,7 @@ SLOTS: [1: NumberDecimal(223.500000000000), 2: 123ll] RESULT: NumberDecimal(100.500000000000) -- EXECUTE VARIATION: -SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.500000L] +SLOTS: [1: NumberDecimal(223.500000000000), 2: 123.5L] RESULT: NumberDecimal(100.000000000000) -- EXECUTE VARIATION: diff --git a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_numeric.txt b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_numeric.txt index 96e3bf54d76..124c1399e56 100644 --- a/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_numeric.txt +++ b/src/mongo/db/test_output/exec/sbe/s_b_e_prim_unary_test/negate_numeric.txt @@ -29,8 +29,8 @@ SLOTS: [1: 123ll] RESULT: -123ll -- EXECUTE VARIATION: -SLOTS: [1: 123.500000L] -RESULT: -123.500000L +SLOTS: [1: 123.5L] +RESULT: -123.5L -- EXECUTE VARIATION: SLOTS: [1: NumberDecimal(223.500000000000)] -- cgit v1.2.1