From d1fbeed2f867f9c51e6f4e0c3739fcd771567fb2 Mon Sep 17 00:00:00 2001 From: mathisbessamdb Date: Thu, 9 Feb 2023 18:02:15 +0000 Subject: SERVER-73525 adding extra testing for FLE2 and NTDI --- src/mongo/db/query/fle/server_rewrite.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mongo/db/query/fle/server_rewrite.cpp b/src/mongo/db/query/fle/server_rewrite.cpp index 2896bb87a85..9158f5eba97 100644 --- a/src/mongo/db/query/fle/server_rewrite.cpp +++ b/src/mongo/db/query/fle/server_rewrite.cpp @@ -141,7 +141,7 @@ public: RewriteBase(boost::intrusive_ptr expCtx, const NamespaceString& nss, const EncryptionInformation& encryptInfo) - : expCtx(expCtx), db(nss.db()) { + : expCtx(expCtx), dbName(nss.dbName()) { auto efc = EncryptionInformationHelpers::getAndValidateSchema(nss, encryptInfo); esc = efc.getEscCollection()->toString(); ecc = efc.getEccCollection()->toString(); @@ -154,7 +154,7 @@ public: boost::intrusive_ptr expCtx; std::string esc; std::string ecc; - std::string db; + DatabaseName dbName; }; // This class handles rewriting of an entire pipeline. @@ -218,8 +218,8 @@ void doFLERewriteInTxn(OperationContext* opCtx, auto txn = getTxn(opCtx); auto swCommitResult = txn->runNoThrow( opCtx, [sharedBlock](const txn_api::TransactionClient& txnClient, auto txnExec) { - NamespaceString nssEsc(sharedBlock->db, sharedBlock->esc); - NamespaceString nssEcc(sharedBlock->db, sharedBlock->ecc); + NamespaceString nssEsc(sharedBlock->dbName, sharedBlock->esc); + NamespaceString nssEcc(sharedBlock->dbName, sharedBlock->ecc); // Construct FLE rewriter from the transaction client and encryptionInformation. auto queryInterface = FLEQueryInterfaceImpl(txnClient, getGlobalServiceContext()); -- cgit v1.2.1