SERVER-95335 Remove namespace from bucket catalog interfaces (#27694)

GitOrigin-RevId: 6fbbf8acf73554ff9cebab3266b71a8b5d96cfc4
lakamson · Oct 2, 2024 · b8163bb · b8163bb
1 parent 05afb89
commit b8163bb
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 123 deletions.
diff --git a/src/mongo/db/query/write_ops/write_ops_exec.cpp b/src/mongo/db/query/write_ops/write_ops_exec.cpp
@@ -2593,7 +2593,7 @@ bool commitTimeseriesBucket(OperationContext* opCtx,
         timeseries::bucket_catalog::GlobalBucketCatalog::get(opCtx->getServiceContext());
 
     auto metadata = getMetadata(bucketCatalog, batch->bucketId);
-    auto status = prepareCommit(bucketCatalog, request.getNamespace(), batch);
+    auto status = prepareCommit(bucketCatalog, batch);
     if (!status.isOK()) {
         invariant(timeseries::bucket_catalog::isWriteBatchFinished(*batch));
         docsToRetry->push_back(index);
@@ -2656,13 +2656,12 @@ bool commitTimeseriesBucket(OperationContext* opCtx,
     }
 
     timeseries::getOpTimeAndElectionId(opCtx, opTime, electionId);
-    auto bucketsNs = request.getNamespace().makeTimeseriesBucketsNamespace();
 
     auto closedBucket = finish(bucketCatalog,
-                               bucketsNs,
                                batch,
                                timeseries::bucket_catalog::CommitInfo{*opTime, *electionId},
-                               timeseries::getPostCommitDebugChecks(opCtx, bucketsNs));
+                               timeseries::getPostCommitDebugChecks(
+                                   opCtx, request.getNamespace().makeTimeseriesBucketsNamespace()));
 
     if (closedBucket) {
         // If this write closed a bucket, compress the bucket
@@ -2710,7 +2709,7 @@ bool commitTimeseriesBucketsAtomically(OperationContext* opCtx,
 
         for (auto batch : batchesToCommit) {
             auto metadata = getMetadata(bucketCatalog, batch.get()->bucketId);
-            auto prepareCommitStatus = prepareCommit(bucketCatalog, request.getNamespace(), batch);
+            auto prepareCommitStatus = prepareCommit(bucketCatalog, batch);
             if (!prepareCommitStatus.isOK()) {
                 abortStatus = prepareCommitStatus;
                 return false;
@@ -2741,7 +2740,6 @@ bool commitTimeseriesBucketsAtomically(OperationContext* opCtx,
 
         for (auto batch : batchesToCommit) {
             auto closedBucket = finish(bucketCatalog,
-                                       bucketsNs,
                                        batch,
                                        timeseries::bucket_catalog::CommitInfo{*opTime, *electionId},
                                        timeseries::getPostCommitDebugChecks(opCtx, bucketsNs));

diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog.cpp b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog.cpp
@@ -259,7 +259,6 @@ void getDetailedMemoryUsage(const BucketCatalog& catalog, BSONObjBuilder& builde
 }
 
 StatusWith<InsertResult> tryInsert(BucketCatalog& catalog,
-                                   const NamespaceString& nss,
                                    const StringDataComparator* comparator,
                                    const BSONObj& doc,
                                    OperationId opId,
@@ -280,7 +279,7 @@ StatusWith<InsertResult> tryInsert(BucketCatalog& catalog,
     stdx::lock_guard stripeLock{stripe.mutex};
 
     Bucket* bucket = internal::useBucket(
-        catalog, stripe, stripeLock, nss, insertContext, internal::AllowBucketCreation::kNo, time);
+        catalog, stripe, stripeLock, insertContext, internal::AllowBucketCreation::kNo, time);
     // If there are no open buckets for our measurement that we can use, we return a
     // reopeningContext to try reopening a closed bucket from disk.
     if (!bucket) {
@@ -320,8 +319,8 @@ StatusWith<InsertResult> tryInsert(BucketCatalog& catalog,
     // If we were time forward or backward, we might be able to "reopen" a bucket we still have
     // in memory that's set to be closed when pending operations finish.
     if ((*reason == RolloverReason::kTimeBackward || *reason == RolloverReason::kTimeForward)) {
-        if (Bucket* alternate = internal::useAlternateBucket(
-                catalog, stripe, stripeLock, nss, insertContext, time)) {
+        if (Bucket* alternate =
+                internal::useAlternateBucket(catalog, stripe, stripeLock, insertContext, time)) {
             insertionResult = insertIntoBucket(catalog,
                                                stripe,
                                                stripeLock,
@@ -356,7 +355,6 @@ StatusWith<InsertResult> tryInsert(BucketCatalog& catalog,
 }
 
 StatusWith<InsertResult> insertWithReopeningContext(BucketCatalog& catalog,
-                                                    const NamespaceString& nss,
                                                     const StringDataComparator* comparator,
                                                     const BSONObj& doc,
                                                     OperationId opId,
@@ -402,7 +400,6 @@ StatusWith<InsertResult> insertWithReopeningContext(BucketCatalog& catalog,
             swBucket = internal::reuseExistingBucket(catalog,
                                                      stripe,
                                                      stripeLock,
-                                                     nss,
                                                      insertContext.stats,
                                                      insertContext.key,
                                                      *existingBucket,
@@ -446,7 +443,7 @@ StatusWith<InsertResult> insertWithReopeningContext(BucketCatalog& catalog,
     }
 
     Bucket* bucket = useBucket(
-        catalog, stripe, stripeLock, nss, insertContext, internal::AllowBucketCreation::kYes, time);
+        catalog, stripe, stripeLock, insertContext, internal::AllowBucketCreation::kYes, time);
     invariant(bucket);
 
     auto insertionResult = insertIntoBucket(catalog,
@@ -466,7 +463,6 @@ StatusWith<InsertResult> insertWithReopeningContext(BucketCatalog& catalog,
 }
 
 StatusWith<InsertResult> insert(BucketCatalog& catalog,
-                                const NamespaceString& nss,
                                 const StringDataComparator* comparator,
                                 const BSONObj& doc,
                                 OperationId opId,
@@ -478,7 +474,7 @@ StatusWith<InsertResult> insert(BucketCatalog& catalog,
     stdx::lock_guard stripeLock{stripe.mutex};
 
     Bucket* bucket = useBucket(
-        catalog, stripe, stripeLock, nss, insertContext, internal::AllowBucketCreation::kYes, time);
+        catalog, stripe, stripeLock, insertContext, internal::AllowBucketCreation::kYes, time);
     invariant(bucket);
 
     auto insertionResult = insertIntoBucket(catalog,
@@ -506,9 +502,7 @@ void waitToInsert(InsertWaiter* waiter) {
     }
 }
 
-Status prepareCommit(BucketCatalog& catalog,
-                     const NamespaceString& nss,
-                     std::shared_ptr<WriteBatch> batch) {
+Status prepareCommit(BucketCatalog& catalog, std::shared_ptr<WriteBatch> batch) {
     auto getBatchStatus = [&] {
         return batch->promise.getFuture().getNoThrow().getStatus();
     };
@@ -542,7 +536,7 @@ Status prepareCommit(BucketCatalog& catalog,
                         stripe,
                         stripeLock,
                         batch,
-                        internal::getTimeseriesBucketClearedError(nss, batch->bucketId.oid));
+                        internal::getTimeseriesBucketClearedError(batch->bucketId.oid));
         return getBatchStatus();
     }
 
@@ -553,7 +547,6 @@ Status prepareCommit(BucketCatalog& catalog,
 
 boost::optional<ClosedBucket> finish(
     BucketCatalog& catalog,
-    const NamespaceString& nss,
     std::shared_ptr<WriteBatch> batch,
     const CommitInfo& info,
     const std::function<void(const timeseries::bucket_catalog::WriteBatch&, StringData)>&
@@ -627,7 +620,7 @@ boost::optional<ClosedBucket> finish(
                             stripeLock,
                             *bucket,
                             nullptr,
-                            internal::getTimeseriesBucketClearedError(nss, bucket->bucketId.oid));
+                            internal::getTimeseriesBucketClearedError(bucket->bucketId.oid));
         }
     } else if (allCommitted(*bucket)) {
         switch (bucket->rolloverAction) {

diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog.h b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog.h
@@ -263,7 +263,6 @@ void getDetailedMemoryUsage(const BucketCatalog& catalog, BSONObjBuilder& builde
  * 'insert' to insert 'doc', passing any fetched bucket back as a member of the 'ReopeningContext'.
  */
 StatusWith<InsertResult> tryInsert(BucketCatalog& catalog,
-                                   const NamespaceString& nss,
                                    const StringDataComparator* comparator,
                                    const BSONObj& doc,
                                    OperationId,
@@ -282,7 +281,6 @@ StatusWith<InsertResult> tryInsert(BucketCatalog& catalog,
  * bucket if none exists.
  */
 StatusWith<InsertResult> insertWithReopeningContext(BucketCatalog& catalog,
-                                                    const NamespaceString& nss,
                                                     const StringDataComparator* comparator,
                                                     const BSONObj& doc,
                                                     OperationId,
@@ -300,7 +298,6 @@ StatusWith<InsertResult> insertWithReopeningContext(BucketCatalog& catalog,
  * We will attempt to find a suitable open bucket, or open a new bucket if none exists.
  */
 StatusWith<InsertResult> insert(BucketCatalog& catalog,
-                                const NamespaceString& nss,
                                 const StringDataComparator* comparator,
                                 const BSONObj& doc,
                                 OperationId,
@@ -322,9 +319,7 @@ void waitToInsert(InsertWaiter* waiter);
  * on the same bucket, or there is an outstanding 'ReopeningRequest' for the same series (metaField
  * value), this operation will block waiting for it to complete.
  */
-Status prepareCommit(BucketCatalog& catalog,
-                     const NamespaceString& nss,
-                     std::shared_ptr<WriteBatch> batch);
+Status prepareCommit(BucketCatalog& catalog, std::shared_ptr<WriteBatch> batch);
 
 /**
  * Records the result of a batch commit. Caller must already have commit rights on batch, and batch
@@ -337,7 +332,6 @@ Status prepareCommit(BucketCatalog& catalog,
  */
 boost::optional<ClosedBucket> finish(
     BucketCatalog& catalog,
-    const NamespaceString& nss,
     std::shared_ptr<WriteBatch> batch,
     const CommitInfo& info,
     const std::function<void(const timeseries::bucket_catalog::WriteBatch&, StringData timeField)>&

diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_helpers.h b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_helpers.h
@@ -43,7 +43,6 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/oid.h"
 #include "mongo/db/catalog/collection.h"
-#include "mongo/db/namespace_string.h"
 #include "mongo/db/storage/kv/kv_engine.h"
 #include "mongo/db/storage/recovery_unit.h"
 #include "mongo/db/timeseries/bucket_catalog/bucket.h"

diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.cpp b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.cpp
@@ -277,7 +277,6 @@ Bucket* useBucketAndChangePreparedState(BucketStateRegistry& registry,
 Bucket* useBucket(BucketCatalog& catalog,
                   Stripe& stripe,
                   WithLock stripeLock,
-                  const NamespaceString& nss,
                   InsertContext& info,
                   AllowBucketCreation mode,
                   const Date_t& time) {
@@ -314,7 +313,7 @@ Bucket* useBucket(BucketCatalog& catalog,
           stripeLock,
           *bucket,
           nullptr,
-          getTimeseriesBucketClearedError(nss, bucket->bucketId.oid));
+          getTimeseriesBucketClearedError(bucket->bucketId.oid));
 
     return mode == AllowBucketCreation::kYes
         ? &allocateBucket(catalog, stripe, stripeLock, info, time)
@@ -324,7 +323,6 @@ Bucket* useBucket(BucketCatalog& catalog,
 Bucket* useAlternateBucket(BucketCatalog& catalog,
                            Stripe& stripe,
                            WithLock stripeLock,
-                           const NamespaceString& nss,
                            InsertContext& insertContext,
                            const Date_t& time) {
     auto it = stripe.openBucketsByKey.find(insertContext.key);
@@ -365,7 +363,7 @@ Bucket* useAlternateBucket(BucketCatalog& catalog,
                   stripeLock,
                   *potentialBucket,
                   nullptr,
-                  getTimeseriesBucketClearedError(nss, potentialBucket->bucketId.oid));
+                  getTimeseriesBucketClearedError(potentialBucket->bucketId.oid));
         }
     }
 
@@ -601,7 +599,6 @@ StatusWith<std::reference_wrapper<Bucket>> reopenBucket(BucketCatalog& catalog,
 StatusWith<std::reference_wrapper<Bucket>> reuseExistingBucket(BucketCatalog& catalog,
                                                                Stripe& stripe,
                                                                WithLock stripeLock,
-                                                               const NamespaceString& nss,
                                                                ExecutionStatsController& stats,
                                                                const BucketKey& key,
                                                                Bucket& existingBucket,
@@ -617,7 +614,7 @@ StatusWith<std::reference_wrapper<Bucket>> reuseExistingBucket(BucketCatalog& ca
               stripeLock,
               existingBucket,
               nullptr,
-              getTimeseriesBucketClearedError(nss, existingBucket.bucketId.oid));
+              getTimeseriesBucketClearedError(existingBucket.bucketId.oid));
         return {ErrorCodes::WriteConflict, "Bucket may be stale"};
     } else if (transientlyConflictsWithReopening(state.value())) {
         // Avoid reusing the bucket if it conflicts with reopening.
@@ -1358,13 +1355,9 @@ void mergeExecutionStatsToBucketCatalog(BucketCatalog& catalog,
     addCollectionExecutionStats(stats, *collStats);
 }
 
-Status getTimeseriesBucketClearedError(const NamespaceString& nss, const OID& oid) {
+Status getTimeseriesBucketClearedError(const OID& oid) {
     return {ErrorCodes::TimeseriesBucketCleared,
-            str::stream() << "Time-series bucket " << oid << " for collection "
-                          << (nss.isTimeseriesBucketsCollection()
-                                  ? nss.getTimeseriesViewNamespace().toStringForErrorMsg()
-                                  : nss.toStringForErrorMsg())
-                          << " was cleared"};
+            str::stream() << "Time-series bucket " << oid << " was cleared"};
 }
 
 void closeOpenBucket(BucketCatalog& catalog,

diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.h b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.h
@@ -44,7 +44,6 @@
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/oid.h"
-#include "mongo/db/namespace_string.h"
 #include "mongo/db/timeseries/bucket_catalog/bucket.h"
 #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h"
 #include "mongo/db/timeseries/bucket_catalog/bucket_identifiers.h"
@@ -144,7 +143,6 @@ Bucket* useBucketAndChangePreparedState(BucketStateRegistry& registry,
 Bucket* useBucket(BucketCatalog& catalog,
                   Stripe& stripe,
                   WithLock stripeLock,
-                  const NamespaceString& nss,
                   InsertContext& info,
                   AllowBucketCreation mode,
                   const Date_t& time);
@@ -156,7 +154,6 @@ Bucket* useBucket(BucketCatalog& catalog,
 Bucket* useAlternateBucket(BucketCatalog& catalog,
                            Stripe& stripe,
                            WithLock stripeLock,
-                           const NamespaceString& nss,
                            InsertContext& info,
                            const Date_t& time);
 
@@ -197,7 +194,6 @@ StatusWith<std::reference_wrapper<Bucket>> reopenBucket(BucketCatalog& catalog,
 StatusWith<std::reference_wrapper<Bucket>> reuseExistingBucket(BucketCatalog& catalog,
                                                                Stripe& stripe,
                                                                WithLock stripeLock,
-                                                               const NamespaceString& nss,
                                                                ExecutionStatsController& stats,
                                                                const BucketKey& key,
                                                                Bucket& existingBucket,
@@ -392,7 +388,7 @@ void mergeExecutionStatsToBucketCatalog(BucketCatalog& catalog,
 /**
  * Generates a status with code TimeseriesBucketCleared and an appropriate error message.
  */
-Status getTimeseriesBucketClearedError(const NamespaceString& nss, const OID& oid);
+Status getTimeseriesBucketClearedError(const OID& oid);
 
 /**
  * Close an open bucket, setting the state appropriately and removing it from the catalog.