1 files changed, 12 insertions, 12 deletions

diff --git a/src/mongo/db/commands/write_commands.cpp b/src/mongo/db/commands/write_commands.cpp
index 7c1ef7c0143..6eb1009bc86 100644
--- a/src/mongo/db/commands/write_commands.cpp
+++ b/src/mongo/db/commands/write_commands.cpp
@@ -206,9 +206,9 @@ write_ops::UpdateOpEntry makeTimeseriesUpdateOpEntry(
     options.mustCheckExistenceForInsertOperations =
         static_cast<bool>(repl::tenantMigrationRecipientInfo(opCtx));
     write_ops::UpdateModification u(updateBuilder.obj(), options);
-    write_ops::UpdateOpEntry update(BSON("_id" << batch->bucketId()), std::move(u));
-    invariant(!update.getMulti(), batch->bucketId().toString());
-    invariant(!update.getUpsert(), batch->bucketId().toString());
+    write_ops::UpdateOpEntry update(BSON("_id" << batch->bucket().id), std::move(u));
+    invariant(!update.getMulti(), batch->bucket().id.toString());
+    invariant(!update.getUpsert(), batch->bucket().id.toString());
     return update;
 }
 
@@ -249,7 +249,7 @@ BSONObj makeTimeseriesInsertDocument(std::shared_ptr<BucketCatalog::WriteBatch>
     }
 
     BSONObjBuilder builder;
-    builder.append("_id", batch->bucketId());
+    builder.append("_id", batch->bucket().id);
     {
         BSONObjBuilder bucketControlBuilder(builder.subobjStart("control"));
         bucketControlBuilder.append(kBucketControlVersionFieldName,
@@ -778,7 +778,7 @@ public:
                                      std::vector<size_t>* docsToRetry) const {
             auto& bucketCatalog = BucketCatalog::get(opCtx);
 
-            auto metadata = bucketCatalog.getMetadata(batch->bucketId());
+            auto metadata = bucketCatalog.getMetadata(batch->bucket());
             bool prepared = bucketCatalog.prepareCommit(batch);
             if (!prepared) {
                 invariant(batch->finished());
@@ -790,7 +790,7 @@ public:
 
             hangTimeseriesInsertBeforeWrite.pauseWhileSet();
 
-            const auto docId = batch->bucketId();
+            const auto docId = batch->bucket().id;
             const bool performInsert = batch->numPreviouslyCommittedMeasurements() == 0;
             if (performInsert) {
                 const auto output =
@@ -866,7 +866,7 @@ public:
 
             // Sort by bucket so that preparing the commit for each batch cannot deadlock.
             std::sort(batchesToCommit.begin(), batchesToCommit.end(), [](auto left, auto right) {
-                return left.get()->bucketId() < right.get()->bucketId();
+                return left.get()->bucket().id < right.get()->bucket().id;
             });
 
             boost::optional<Status> abortStatus;
@@ -882,17 +882,17 @@ public:
             std::vector<write_ops::UpdateCommandRequest> updateOps;
 
             for (auto batch : batchesToCommit) {
-                auto metadata = bucketCatalog.getMetadata(batch.get()->bucketId());
+                auto metadata = bucketCatalog.getMetadata(batch.get()->bucket());
                 if (!bucketCatalog.prepareCommit(batch)) {
                     return false;
                 }
 
                 if (batch.get()->numPreviouslyCommittedMeasurements() == 0) {
                     insertOps.push_back(_makeTimeseriesInsertOp(
-                        batch, metadata, std::move(stmtIds[batch.get()->bucketId()])));
+                        batch, metadata, std::move(stmtIds[batch.get()->bucket().id])));
                 } else {
                     updateOps.push_back(_makeTimeseriesUpdateOp(
-                        opCtx, batch, metadata, std::move(stmtIds[batch.get()->bucketId()])));
+                        opCtx, batch, metadata, std::move(stmtIds[batch.get()->bucket().id])));
                 }
             }
 
@@ -994,7 +994,7 @@ public:
                     const auto& batch = result.getValue().batch;
                     batches.emplace_back(batch, index);
                     if (isTimeseriesWriteRetryable(opCtx)) {
-                        stmtIds[batch->bucketId()].push_back(stmtId);
+                        stmtIds[batch->bucket().id].push_back(stmtId);
                     }
                 }
 
@@ -1195,7 +1195,7 @@ public:
                 auto& [batch, index] = batches[itr];
                 if (batch->claimCommitRights()) {
                     auto stmtIds = isTimeseriesWriteRetryable(opCtx)
-                        ? std::move(bucketStmtIds[batch->bucketId()])
+                        ? std::move(bucketStmtIds[batch->bucket().id])
                         : std::vector<StmtId>{};
 
                     canContinue = _commitTimeseriesBucket(opCtx,