diff options
Diffstat (limited to 'src/mongo/shell/encrypted_dbclient_base.cpp')
| -rw-r--r-- | src/mongo/shell/encrypted_dbclient_base.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/mongo/shell/encrypted_dbclient_base.cpp b/src/mongo/shell/encrypted_dbclient_base.cpp index 96bf43f83a4..c547e51df59 100644 --- a/src/mongo/shell/encrypted_dbclient_base.cpp +++ b/src/mongo/shell/encrypted_dbclient_base.cpp @@ -508,15 +508,23 @@ JS::Value EncryptedDBClientBase::getCollection() const { std::unique_ptr<DBClientCursor> EncryptedDBClientBase::query( const NamespaceStringOrUUID& nsOrUuid, - Query query, + const BSONObj& filter, + const Query& querySettings, int limit, int nToSkip, const BSONObj* fieldsToReturn, int queryOptions, int batchSize, boost::optional<BSONObj> readConcernObj) { - return _conn->query( - nsOrUuid, query, limit, nToSkip, fieldsToReturn, queryOptions, batchSize, readConcernObj); + return _conn->query(nsOrUuid, + filter, + querySettings, + limit, + nToSkip, + fieldsToReturn, + queryOptions, + batchSize, + readConcernObj); } bool EncryptedDBClientBase::isFailed() const { @@ -616,8 +624,12 @@ std::shared_ptr<SymmetricKey> EncryptedDBClientBase::getDataKey(const UUID& uuid std::shared_ptr<SymmetricKey> EncryptedDBClientBase::getDataKeyFromDisk(const UUID& uuid) { NamespaceString fullNameNS = getCollectionNS(); - BSONObj dataKeyObj = _conn->findOne( - fullNameNS.ns(), QUERY("_id" << uuid), nullptr, 0, repl::ReadConcernArgs::kImplicitDefault); + BSONObj dataKeyObj = _conn->findOne(fullNameNS.ns(), + BSON("_id" << uuid), + Query(), + nullptr, + 0, + repl::ReadConcernArgs::kImplicitDefault); if (dataKeyObj.isEmpty()) { uasserted(ErrorCodes::BadValue, "Invalid keyID."); } |