SERVER-68246 rewrite calls to boost::optional get and is_initialized

4 files changed, 19 insertions, 19 deletions

diff --git a/src/mongo/db/exec/sbe/stages/bson_scan.cpp b/src/mongo/db/exec/sbe/stages/bson_scan.cpp
index 3a4c3b50512..432f999e61a 100644
--- a/src/mongo/db/exec/sbe/stages/bson_scan.cpp
+++ b/src/mongo/db/exec/sbe/stages/bson_scan.cpp
@@ -171,7 +171,7 @@ std::vector<DebugPrinter::Block> BSONScanStage::debugPrint() const {
     auto ret = PlanStage::debugPrint();
 
     if (_recordSlot) {
-        DebugPrinter::addIdentifier(ret, _recordSlot.get());
+        DebugPrinter::addIdentifier(ret, _recordSlot.value());
     }
 
     ret.emplace_back(DebugPrinter::Block("[`"));
diff --git a/src/mongo/db/exec/sbe/stages/column_scan.cpp b/src/mongo/db/exec/sbe/stages/column_scan.cpp
index b60f9aca5af..a003515427f 100644
--- a/src/mongo/db/exec/sbe/stages/column_scan.cpp
+++ b/src/mongo/db/exec/sbe/stages/column_scan.cpp
@@ -485,13 +485,13 @@ std::vector<DebugPrinter::Block> ColumnScanStage::debugPrint() const {
     auto ret = PlanStage::debugPrint();
 
     if (_reconstructedRecordSlot) {
-        DebugPrinter::addIdentifier(ret, _reconstructedRecordSlot.get());
+        DebugPrinter::addIdentifier(ret, _reconstructedRecordSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_recordIdSlot) {
-        DebugPrinter::addIdentifier(ret, _recordIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _recordIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
diff --git a/src/mongo/db/exec/sbe/stages/ix_scan.cpp b/src/mongo/db/exec/sbe/stages/ix_scan.cpp
index 21b2a06cf12..92175f96f71 100644
--- a/src/mongo/db/exec/sbe/stages/ix_scan.cpp
+++ b/src/mongo/db/exec/sbe/stages/ix_scan.cpp
@@ -462,19 +462,19 @@ std::vector<DebugPrinter::Block> IndexScanStage::debugPrint() const {
     }
 
     if (_recordSlot) {
-        DebugPrinter::addIdentifier(ret, _recordSlot.get());
+        DebugPrinter::addIdentifier(ret, _recordSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_recordIdSlot) {
-        DebugPrinter::addIdentifier(ret, _recordIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _recordIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_snapshotIdSlot) {
-        DebugPrinter::addIdentifier(ret, _snapshotIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _snapshotIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
diff --git a/src/mongo/db/exec/sbe/stages/scan.cpp b/src/mongo/db/exec/sbe/stages/scan.cpp
index 0f6d514c139..57c8c594a84 100644
--- a/src/mongo/db/exec/sbe/stages/scan.cpp
+++ b/src/mongo/db/exec/sbe/stages/scan.cpp
@@ -511,41 +511,41 @@ std::vector<DebugPrinter::Block> ScanStage::debugPrint() const {
     auto ret = PlanStage::debugPrint();
 
     if (_seekKeySlot) {
-        DebugPrinter::addIdentifier(ret, _seekKeySlot.get());
+        DebugPrinter::addIdentifier(ret, _seekKeySlot.value());
     }
 
     if (_recordSlot) {
-        DebugPrinter::addIdentifier(ret, _recordSlot.get());
+        DebugPrinter::addIdentifier(ret, _recordSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_recordIdSlot) {
-        DebugPrinter::addIdentifier(ret, _recordIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _recordIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_snapshotIdSlot) {
-        DebugPrinter::addIdentifier(ret, _snapshotIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _snapshotIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_indexIdSlot) {
-        DebugPrinter::addIdentifier(ret, _indexIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _indexIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_indexKeySlot) {
-        DebugPrinter::addIdentifier(ret, _indexKeySlot.get());
+        DebugPrinter::addIdentifier(ret, _indexKeySlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_indexKeyPatternSlot) {
-        DebugPrinter::addIdentifier(ret, _indexKeyPatternSlot.get());
+        DebugPrinter::addIdentifier(ret, _indexKeyPatternSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
@@ -981,37 +981,37 @@ std::vector<DebugPrinter::Block> ParallelScanStage::debugPrint() const {
     auto ret = PlanStage::debugPrint();
 
     if (_recordSlot) {
-        DebugPrinter::addIdentifier(ret, _recordSlot.get());
+        DebugPrinter::addIdentifier(ret, _recordSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_recordIdSlot) {
-        DebugPrinter::addIdentifier(ret, _recordIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _recordIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_snapshotIdSlot) {
-        DebugPrinter::addIdentifier(ret, _snapshotIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _snapshotIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_indexIdSlot) {
-        DebugPrinter::addIdentifier(ret, _indexIdSlot.get());
+        DebugPrinter::addIdentifier(ret, _indexIdSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_indexKeySlot) {
-        DebugPrinter::addIdentifier(ret, _indexKeySlot.get());
+        DebugPrinter::addIdentifier(ret, _indexKeySlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }
 
     if (_indexKeyPatternSlot) {
-        DebugPrinter::addIdentifier(ret, _indexKeyPatternSlot.get());
+        DebugPrinter::addIdentifier(ret, _indexKeyPatternSlot.value());
     } else {
         DebugPrinter::addIdentifier(ret, DebugPrinter::kNoneKeyword);
     }