SERVER-53986 Use ObjectId's as table keys for time-series collections

1 files changed, 12 insertions, 1 deletions

diff --git a/src/mongo/db/exec/collection_scan.h b/src/mongo/db/exec/collection_scan.h
index 8b19ce56ab2..b74986a8698 100644
--- a/src/mongo/db/exec/collection_scan.h
+++ b/src/mongo/db/exec/collection_scan.h
@@ -77,7 +77,15 @@ public:
     BSONObj getPostBatchResumeToken() const {
         // Return a resume token compatible with resumable initial sync.
         if (_params.requestResumeToken) {
-            return BSON("$recordId" << _lastSeenId.as<int64_t>());
+            if (_lastSeenId.isNull()) {
+                return BSON("$recordId" << NullLabeler{});
+            }
+
+            if (_isClustered) {
+                return BSON("$recordId" << _lastSeenId.as<OID>());
+            } else {
+                return BSON("$recordId" << _lastSeenId.as<int64_t>());
+            }
         }
         // Return a resume token compatible with resharding oplog sync.
         if (_params.shouldTrackLatestOplogTimestamp) {
@@ -130,6 +138,9 @@ private:
 
     CollectionScanParams _params;
 
+    // Collections with clustered indexes on _id use the ObjectId format for RecordId. All other
+    // collections use int64_t for RecordId.
+    const bool _isClustered;
     RecordId _lastSeenId;  // Null if nothing has been returned from _cursor yet.
 
     // If _params.shouldTrackLatestOplogTimestamp is set and the collection is the oplog, the latest