SERVER-61630 support a string form of RecordId

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/db/query/plan_executor_sbe.cpp b/src/mongo/db/query/plan_executor_sbe.cpp
index acd7a746988..d15daede90e 100644
--- a/src/mongo/db/query/plan_executor_sbe.cpp
+++ b/src/mongo/db/query/plan_executor_sbe.cpp
@@ -329,7 +329,9 @@ BSONObj PlanExecutorSBE::getPostBatchResumeToken() const {
                                      "but found a result without a valid RecordId: "
                                   << msgTag,
                     tag == sbe::value::TypeTags::RecordId);
-            return BSON("$recordId" << sbe::value::bitcastTo<int64_t>(val));
+            BSONObjBuilder builder;
+            sbe::value::getRecordIdView(val)->serializeToken("$recordId", &builder);
+            return builder.obj();
         }
     }
 
@@ -383,7 +385,7 @@ sbe::PlanState fetchNext(sbe::PlanStage* root,
         invariant(recordIdSlot);
         auto [tag, val] = recordIdSlot->getViewOfValue();
         if (tag == sbe::value::TypeTags::RecordId) {
-            *dlOut = RecordId{sbe::value::bitcastTo<int64_t>(val)};
+            *dlOut = *sbe::value::getRecordIdView(val);
         }
     }
     return state;