SERVER-33873 change StorageInterface methods to accept NamespaceStringOrUUID

This updates the following functions to take a NamespaceStringOrUUID to
specify the collection:

- insertDocuments
- findById
- deleteById
- upsertById

This leaves other methods unchanged; if we decide to keep the
StorageInterface around and require more methods to accept a UUID, they
could conceivably be updated in a similar manner.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/mongo/db/repl/storage_interface_mock.h b/src/mongo/db/repl/storage_interface_mock.h
index cd02935179f..b2b3d22f276 100644
--- a/src/mongo/db/repl/storage_interface_mock.h
+++ b/src/mongo/db/repl/storage_interface_mock.h
@@ -91,11 +91,11 @@ public:
             const BSONObj idIndexSpec,
             const std::vector<BSONObj>& secondaryIndexSpecs)>;
     using InsertDocumentFn = stdx::function<Status(OperationContext* opCtx,
-                                                   const NamespaceString& nss,
+                                                   const NamespaceStringOrUUID& nsOrUUID,
                                                    const TimestampedBSONObj& doc,
                                                    long long term)>;
     using InsertDocumentsFn = stdx::function<Status(OperationContext* opCtx,
-                                                    const NamespaceString& nss,
+                                                    const NamespaceStringOrUUID& nsOrUUID,
                                                     const std::vector<InsertStatement>& docs)>;
     using DropUserDatabasesFn = stdx::function<Status(OperationContext* opCtx)>;
     using CreateOplogFn =
@@ -141,16 +141,16 @@ public:
     };
 
     Status insertDocument(OperationContext* opCtx,
-                          const NamespaceString& nss,
+                          const NamespaceStringOrUUID& nsOrUUID,
                           const TimestampedBSONObj& doc,
                           long long term) override {
-        return insertDocumentFn(opCtx, nss, doc, term);
+        return insertDocumentFn(opCtx, nsOrUUID, doc, term);
     };
 
     Status insertDocuments(OperationContext* opCtx,
-                           const NamespaceString& nss,
+                           const NamespaceStringOrUUID& nsOrUUID,
                            const std::vector<InsertStatement>& docs) override {
-        return insertDocumentsFn(opCtx, nss, docs);
+        return insertDocumentsFn(opCtx, nsOrUUID, docs);
     }
 
     Status dropReplicatedDatabases(OperationContext* opCtx) override {
@@ -238,19 +238,19 @@ public:
     }
 
     StatusWith<BSONObj> findById(OperationContext* opCtx,
-                                 const NamespaceString& nss,
+                                 const NamespaceStringOrUUID&,
                                  const BSONElement& idKey) override {
         return Status{ErrorCodes::IllegalOperation, "findById not implemented."};
     }
 
     StatusWith<BSONObj> deleteById(OperationContext* opCtx,
-                                   const NamespaceString& nss,
+                                   const NamespaceStringOrUUID&,
                                    const BSONElement& idKey) override {
         return Status{ErrorCodes::IllegalOperation, "deleteById not implemented."};
     }
 
     Status upsertById(OperationContext* opCtx,
-                      const NamespaceString& nss,
+                      const NamespaceStringOrUUID& nsOrUUID,
                       const BSONElement& idKey,
                       const BSONObj& update) override {
         return Status{ErrorCodes::IllegalOperation, "upsertById not implemented."};
@@ -315,13 +315,13 @@ public:
         return Status{ErrorCodes::IllegalOperation, "CreateCollectionForBulkFn not implemented."};
     };
     InsertDocumentFn insertDocumentFn = [](OperationContext* opCtx,
-                                           const NamespaceString& nss,
+                                           const NamespaceStringOrUUID& nsOrUUID,
                                            const TimestampedBSONObj& doc,
                                            long long term) {
         return Status{ErrorCodes::IllegalOperation, "InsertDocumentFn not implemented."};
     };
     InsertDocumentsFn insertDocumentsFn = [](OperationContext* opCtx,
-                                             const NamespaceString& nss,
+                                             const NamespaceStringOrUUID& nsOrUUID,
                                              const std::vector<InsertStatement>& docs) {
         return Status{ErrorCodes::IllegalOperation, "InsertDocumentsFn not implemented."};
     };