SERVER-43762 tighten the overload set for BSONObjBuilder::appendNumber

15 files changed, 47 insertions, 44 deletions

diff --git a/src/mongo/db/exec/sbe/stages/branch.cpp b/src/mongo/db/exec/sbe/stages/branch.cpp
index 36715084bd9..90d07536f80 100644
--- a/src/mongo/db/exec/sbe/stages/branch.cpp
+++ b/src/mongo/db/exec/sbe/stages/branch.cpp
@@ -184,11 +184,13 @@ std::unique_ptr<PlanStageStats> BranchStage::getStats(bool includeDebugInfo) con
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendNumber("numTested", _specificStats.numTested);
-        bob.appendNumber("thenBranchOpens", _specificStats.thenBranchOpens);
-        bob.appendNumber("thenBranchCloses", _specificStats.thenBranchCloses);
-        bob.appendNumber("elseBranchOpens", _specificStats.elseBranchOpens);
-        bob.appendNumber("elseBranchCloses", _specificStats.elseBranchCloses);
+        bob.appendNumber("numTested", static_cast<long long>(_specificStats.numTested));
+        bob.appendNumber("thenBranchOpens", static_cast<long long>(_specificStats.thenBranchOpens));
+        bob.appendNumber("thenBranchCloses",
+                         static_cast<long long>(_specificStats.thenBranchCloses));
+        bob.appendNumber("elseBranchOpens", static_cast<long long>(_specificStats.elseBranchOpens));
+        bob.appendNumber("elseBranchCloses",
+                         static_cast<long long>(_specificStats.elseBranchCloses));
         bob.append("filter", DebugPrinter{}.print(_filter->debugPrint()));
         bob.append("thenSlots", _inputThenVals);
         bob.append("elseSlots", _inputElseVals);
diff --git a/src/mongo/db/exec/sbe/stages/bson_scan.cpp b/src/mongo/db/exec/sbe/stages/bson_scan.cpp
index f3222d6c04a..154d7d4552c 100644
--- a/src/mongo/db/exec/sbe/stages/bson_scan.cpp
+++ b/src/mongo/db/exec/sbe/stages/bson_scan.cpp
@@ -145,7 +145,7 @@ std::unique_ptr<PlanStageStats> BSONScanStage::getStats(bool includeDebugInfo) c
     if (includeDebugInfo) {
         BSONObjBuilder bob;
         if (_recordSlot) {
-            bob.appendIntOrLL("recordSlot", *_recordSlot);
+            bob.appendNumber("recordSlot", static_cast<long long>(*_recordSlot));
         }
         bob.append("field", _fields);
         bob.append("outputSlots", _vars);
diff --git a/src/mongo/db/exec/sbe/stages/check_bounds.cpp b/src/mongo/db/exec/sbe/stages/check_bounds.cpp
index 0b8738a95b5..c1d4707e10a 100644
--- a/src/mongo/db/exec/sbe/stages/check_bounds.cpp
+++ b/src/mongo/db/exec/sbe/stages/check_bounds.cpp
@@ -140,10 +140,10 @@ std::unique_ptr<PlanStageStats> CheckBoundsStage::getStats(bool includeDebugInfo
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendNumber("seeks", _specificStats.seeks);
-        bob.appendIntOrLL("inKeySlot", _inKeySlot);
-        bob.appendIntOrLL("inRecordIdSlot", _inRecordIdSlot);
-        bob.appendIntOrLL("outSlot", _outSlot);
+        bob.appendNumber("seeks", static_cast<long long>(_specificStats.seeks));
+        bob.appendNumber("inKeySlot", static_cast<long long>(_inKeySlot));
+        bob.appendNumber("inRecordIdSlot", static_cast<long long>(_inRecordIdSlot));
+        bob.appendNumber("outSlot", static_cast<long long>(_outSlot));
         ret->debugInfo = bob.obj();
     }
 
diff --git a/src/mongo/db/exec/sbe/stages/filter.h b/src/mongo/db/exec/sbe/stages/filter.h
index 66760acf2f5..a3ee0355146 100644
--- a/src/mongo/db/exec/sbe/stages/filter.h
+++ b/src/mongo/db/exec/sbe/stages/filter.h
@@ -138,7 +138,7 @@ public:
 
         if (includeDebugInfo) {
             BSONObjBuilder bob;
-            bob.appendNumber("numTested", _specificStats.numTested);
+            bob.appendNumber("numTested", static_cast<long long>(_specificStats.numTested));
             bob.append("filter", DebugPrinter{}.print(_filter->debugPrint()));
             ret->debugInfo = bob.obj();
         }
diff --git a/src/mongo/db/exec/sbe/stages/ix_scan.cpp b/src/mongo/db/exec/sbe/stages/ix_scan.cpp
index db48badf335..430b19c2ee5 100644
--- a/src/mongo/db/exec/sbe/stages/ix_scan.cpp
+++ b/src/mongo/db/exec/sbe/stages/ix_scan.cpp
@@ -327,19 +327,19 @@ std::unique_ptr<PlanStageStats> IndexScanStage::getStats(bool includeDebugInfo)
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendNumber("numReads", _specificStats.numReads);
-        bob.appendNumber("seeks", _specificStats.seeks);
+        bob.appendNumber("numReads", static_cast<long long>(_specificStats.numReads));
+        bob.appendNumber("seeks", static_cast<long long>(_specificStats.seeks));
         if (_recordSlot) {
-            bob.appendIntOrLL("recordSlot", *_recordSlot);
+            bob.appendNumber("recordSlot", static_cast<long long>(*_recordSlot));
         }
         if (_recordIdSlot) {
-            bob.appendIntOrLL("recordIdSlot", *_recordIdSlot);
+            bob.appendNumber("recordIdSlot", static_cast<long long>(*_recordIdSlot));
         }
         if (_seekKeySlotLow) {
-            bob.appendIntOrLL("seekKeySlotLow", *_seekKeySlotLow);
+            bob.appendNumber("seekKeySlotLow", static_cast<long long>(*_seekKeySlotLow));
         }
         if (_seekKeySlotHigh) {
-            bob.appendIntOrLL("seekKeySlotHigh", *_seekKeySlotHigh);
+            bob.appendNumber("seekKeySlotHigh", static_cast<long long>(*_seekKeySlotHigh));
         }
         bob.append("outputSlots", _vars);
         bob.append("indexKeysToInclude", _indexKeysToInclude.to_string());
diff --git a/src/mongo/db/exec/sbe/stages/loop_join.cpp b/src/mongo/db/exec/sbe/stages/loop_join.cpp
index 0205cd9e2f0..98f0f3e0085 100644
--- a/src/mongo/db/exec/sbe/stages/loop_join.cpp
+++ b/src/mongo/db/exec/sbe/stages/loop_join.cpp
@@ -166,8 +166,8 @@ std::unique_ptr<PlanStageStats> LoopJoinStage::getStats(bool includeDebugInfo) c
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendNumber("innerOpens", _specificStats.innerOpens);
-        bob.appendNumber("innerCloses", _specificStats.innerCloses);
+        bob.appendNumber("innerOpens", static_cast<long long>(_specificStats.innerOpens));
+        bob.appendNumber("innerCloses", static_cast<long long>(_specificStats.innerCloses));
         bob.append("outerProjects", _outerProjects);
         bob.append("outerCorrelated", _outerCorrelated);
         if (_predicate) {
diff --git a/src/mongo/db/exec/sbe/stages/makeobj.cpp b/src/mongo/db/exec/sbe/stages/makeobj.cpp
index 7d8c73743bb..2c46aa48f80 100644
--- a/src/mongo/db/exec/sbe/stages/makeobj.cpp
+++ b/src/mongo/db/exec/sbe/stages/makeobj.cpp
@@ -381,9 +381,9 @@ std::unique_ptr<PlanStageStats> MakeObjStageBase<O>::getStats(bool includeDebugI
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendIntOrLL("objSlot", _objSlot);
+        bob.appendNumber("objSlot", static_cast<long long>(_objSlot));
         if (_rootSlot) {
-            bob.appendIntOrLL("rootSlot", *_rootSlot);
+            bob.appendNumber("rootSlot", static_cast<long long>(*_rootSlot));
         }
         if (_fieldBehavior) {
             bob.append("fieldBehavior", *_fieldBehavior == FieldBehavior::drop ? "drop" : "keep");
diff --git a/src/mongo/db/exec/sbe/stages/scan.cpp b/src/mongo/db/exec/sbe/stages/scan.cpp
index 2e8ded40b82..9e411a87135 100644
--- a/src/mongo/db/exec/sbe/stages/scan.cpp
+++ b/src/mongo/db/exec/sbe/stages/scan.cpp
@@ -289,15 +289,15 @@ std::unique_ptr<PlanStageStats> ScanStage::getStats(bool includeDebugInfo) const
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendNumber("numReads", _specificStats.numReads);
+        bob.appendNumber("numReads", static_cast<long long>(_specificStats.numReads));
         if (_recordSlot) {
-            bob.appendIntOrLL("recordSlot", *_recordSlot);
+            bob.appendNumber("recordSlot", static_cast<long long>(*_recordSlot));
         }
         if (_recordIdSlot) {
-            bob.appendIntOrLL("recordIdSlot", *_recordIdSlot);
+            bob.appendNumber("recordIdSlot", static_cast<long long>(*_recordIdSlot));
         }
         if (_seekKeySlot) {
-            bob.appendIntOrLL("seekKeySlot", *_seekKeySlot);
+            bob.appendNumber("seekKeySlot", static_cast<long long>(*_seekKeySlot));
         }
         bob.append("fields", _fields);
         bob.append("outputSlots", _vars);
diff --git a/src/mongo/db/exec/sbe/stages/sort.cpp b/src/mongo/db/exec/sbe/stages/sort.cpp
index 7126dbea9fc..13bae045aae 100644
--- a/src/mongo/db/exec/sbe/stages/sort.cpp
+++ b/src/mongo/db/exec/sbe/stages/sort.cpp
@@ -236,8 +236,9 @@ std::unique_ptr<PlanStageStats> SortStage::getStats(bool includeDebugInfo) const
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendIntOrLL("memLimit", _specificStats.maxMemoryUsageBytes);
-        bob.appendIntOrLL("totalDataSizeSorted", _specificStats.totalDataSizeBytes);
+        bob.appendNumber("memLimit", static_cast<long long>(_specificStats.maxMemoryUsageBytes));
+        bob.appendNumber("totalDataSizeSorted",
+                         static_cast<long long>(_specificStats.totalDataSizeBytes));
         bob.appendBool("usedDisk", _specificStats.spills > 0);
 
         BSONObjBuilder childrenBob(bob.subobjStart("orderBySlots"));
diff --git a/src/mongo/db/exec/sbe/stages/spool.cpp b/src/mongo/db/exec/sbe/stages/spool.cpp
index e0a51b28748..caffc5c77d7 100644
--- a/src/mongo/db/exec/sbe/stages/spool.cpp
+++ b/src/mongo/db/exec/sbe/stages/spool.cpp
@@ -126,7 +126,7 @@ std::unique_ptr<PlanStageStats> SpoolEagerProducerStage::getStats(bool includeDe
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendIntOrLL("spoolId", _spoolId);
+        bob.appendNumber("spoolId", static_cast<long long>(_spoolId));
         bob.append("outputSlots", _vals);
         ret->debugInfo = bob.obj();
     }
@@ -273,7 +273,7 @@ std::unique_ptr<PlanStageStats> SpoolLazyProducerStage::getStats(bool includeDeb
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendIntOrLL("spoolId", _spoolId);
+        bob.appendNumber("spoolId", static_cast<long long>(_spoolId));
         bob.append("outputSlots", _vals);
         if (_predicate) {
             bob.append("filter", DebugPrinter{}.print(_predicate->debugPrint()));
diff --git a/src/mongo/db/exec/sbe/stages/spool.h b/src/mongo/db/exec/sbe/stages/spool.h
index 995b10076a0..d6eabed2026 100644
--- a/src/mongo/db/exec/sbe/stages/spool.h
+++ b/src/mongo/db/exec/sbe/stages/spool.h
@@ -225,7 +225,7 @@ public:
 
         if (includeDebugInfo) {
             BSONObjBuilder bob;
-            bob.appendIntOrLL("spoolId", _spoolId);
+            bob.appendNumber("spoolId", static_cast<long long>(_spoolId));
             bob.append("outputSlots", _vals);
             ret->debugInfo = bob.obj();
         }
diff --git a/src/mongo/db/exec/sbe/stages/text_match.cpp b/src/mongo/db/exec/sbe/stages/text_match.cpp
index 25c2e21c53d..23afc8b5aa0 100644
--- a/src/mongo/db/exec/sbe/stages/text_match.cpp
+++ b/src/mongo/db/exec/sbe/stages/text_match.cpp
@@ -116,8 +116,8 @@ std::unique_ptr<PlanStageStats> TextMatchStage::getStats(bool includeDebugInfo)
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendIntOrLL("inputSlot", _inputSlot);
-        bob.appendIntOrLL("outputSlot", _outputSlot);
+        bob.appendNumber("inputSlot", static_cast<long long>(_inputSlot));
+        bob.appendNumber("outputSlot", static_cast<long long>(_outputSlot));
         ret->debugInfo = bob.obj();
     }
 
diff --git a/src/mongo/db/exec/sbe/stages/traverse.cpp b/src/mongo/db/exec/sbe/stages/traverse.cpp
index 0d87e043aa3..f222e8addc2 100644
--- a/src/mongo/db/exec/sbe/stages/traverse.cpp
+++ b/src/mongo/db/exec/sbe/stages/traverse.cpp
@@ -274,14 +274,14 @@ std::unique_ptr<PlanStageStats> TraverseStage::getStats(bool includeDebugInfo) c
     if (includeDebugInfo) {
         DebugPrinter printer;
         BSONObjBuilder bob;
-        bob.appendNumber("innerOpens", _specificStats.innerOpens);
-        bob.appendNumber("innerCloses", _specificStats.innerCloses);
-        bob.appendIntOrLL("inputSlot", _inField);
-        bob.appendIntOrLL("outputSlot", _outField);
-        bob.appendIntOrLL("outputSlotInner", _outFieldInner);
+        bob.appendNumber("innerOpens", static_cast<long long>(_specificStats.innerOpens));
+        bob.appendNumber("innerCloses", static_cast<long long>(_specificStats.innerCloses));
+        bob.appendNumber("inputSlot", static_cast<long long>(_inField));
+        bob.appendNumber("outputSlot", static_cast<long long>(_outField));
+        bob.appendNumber("outputSlotInner", static_cast<long long>(_outFieldInner));
         bob.append("correlatedSlots", _correlatedSlots);
         if (_nestedArraysDepth) {
-            bob.appendNumber("nestedArraysDepth", *_nestedArraysDepth);
+            bob.appendNumber("nestedArraysDepth", static_cast<long long>(*_nestedArraysDepth));
         }
         if (_fold) {
             bob.append("fold", printer.print(_fold->debugPrint()));
diff --git a/src/mongo/db/exec/sbe/stages/unique.cpp b/src/mongo/db/exec/sbe/stages/unique.cpp
index a03162ebc35..4437df5908d 100644
--- a/src/mongo/db/exec/sbe/stages/unique.cpp
+++ b/src/mongo/db/exec/sbe/stages/unique.cpp
@@ -99,8 +99,8 @@ std::unique_ptr<PlanStageStats> UniqueStage::getStats(bool includeDebugInfo) con
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendNumber("dupsTested", _specificStats.dupsTested);
-        bob.appendNumber("dupsDropped", _specificStats.dupsDropped);
+        bob.appendNumber("dupsTested", static_cast<long long>(_specificStats.dupsTested));
+        bob.appendNumber("dupsDropped", static_cast<long long>(_specificStats.dupsDropped));
         bob.append("keySlots", _keySlots);
         ret->debugInfo = bob.obj();
     }
diff --git a/src/mongo/db/exec/sbe/stages/unwind.cpp b/src/mongo/db/exec/sbe/stages/unwind.cpp
index 3616517942a..63f3af745d1 100644
--- a/src/mongo/db/exec/sbe/stages/unwind.cpp
+++ b/src/mongo/db/exec/sbe/stages/unwind.cpp
@@ -166,10 +166,10 @@ std::unique_ptr<PlanStageStats> UnwindStage::getStats(bool includeDebugInfo) con
 
     if (includeDebugInfo) {
         BSONObjBuilder bob;
-        bob.appendIntOrLL("inputSlot", _inField);
-        bob.appendIntOrLL("outSlot", _outField);
-        bob.appendIntOrLL("outIndexSlot", _outIndex);
-        bob.appendIntOrLL("preserveNullAndEmptyArrays", _preserveNullAndEmptyArrays);
+        bob.appendNumber("inputSlot", static_cast<long long>(_inField));
+        bob.appendNumber("outSlot", static_cast<long long>(_outField));
+        bob.appendNumber("outIndexSlot", static_cast<long long>(_outIndex));
+        bob.appendNumber("preserveNullAndEmptyArrays", _preserveNullAndEmptyArrays);
         ret->debugInfo = bob.obj();
     }