SERVER-63902 Fix $natural hint on time-series collections

1 files changed, 4 insertions, 8 deletions

diff --git a/src/mongo/db/ops/write_ops_exec.cpp b/src/mongo/db/ops/write_ops_exec.cpp
index b0b23e3e42b..d1afdc8dde9 100644
--- a/src/mongo/db/ops/write_ops_exec.cpp
+++ b/src/mongo/db/ops/write_ops_exec.cpp
@@ -809,10 +809,8 @@ static SingleWriteResult performSingleUpdateOp(OperationContext* opCtx,
                 "Cannot perform an upsert on a time-series collection",
                 !updateRequest->isUpsert());
 
-        // Only translate the hint (if there is one) if it is specified with an index specification
-        // document.
-        if (!updateRequest->getHint().isEmpty() &&
-            updateRequest->getHint().firstElement().fieldNameStringData() != "$hint"_sd) {
+        // Only translate the hint if it is specified with an index key.
+        if (timeseries::isHintIndexKey(updateRequest->getHint())) {
             updateRequest->setHint(
                 uassertStatusOK(timeseries::createBucketsIndexSpecFromTimeseriesIndexSpec(
                     *timeseriesOptions, updateRequest->getHint())));
@@ -1144,10 +1142,8 @@ static SingleWriteResult performSingleDeleteOp(OperationContext* opCtx,
                 "Time-series buckets collection is missing time-series options",
                 timeseriesOptions);
 
-        // Only translate the hint if it is specified by index spec.
-        if (!request.getHint().isEmpty() &&
-            (request.getHint().firstElement().fieldNameStringData() != "$hint"_sd ||
-             request.getHint().firstElement().type() != BSONType::String)) {
+        // Only translate the hint if it is specified by index key.
+        if (timeseries::isHintIndexKey(request.getHint())) {
             request.setHint(
                 uassertStatusOK(timeseries::createBucketsIndexSpecFromTimeseriesIndexSpec(
                     *timeseriesOptions, request.getHint())));