diff options
author | Bernard Gorman <bernard.gorman@gmail.com> | 2021-03-24 14:07:04 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-04-02 21:51:14 +0000 |
commit | ea51edf33aa685e8b8d4692ee42b8c0e8e9cfb98 (patch) | |
tree | a3866340e9e80201eb9c9b675200700cc30ad53d /src/mongo/db/ops/write_ops.cpp | |
parent | 0198bcfb938ccd788f90a2f5e6156871cf18330f (diff) | |
download | mongo-ea51edf33aa685e8b8d4692ee42b8c0e8e9cfb98.tar.gz |
SERVER-54975 Rename IDL parser classes to use CommandRequest and CommandReply suffixes
Diffstat (limited to 'src/mongo/db/ops/write_ops.cpp')
-rw-r--r-- | src/mongo/db/ops/write_ops.cpp | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/src/mongo/db/ops/write_ops.cpp b/src/mongo/db/ops/write_ops.cpp index ae6ba44727b..8e00f19713a 100644 --- a/src/mongo/db/ops/write_ops.cpp +++ b/src/mongo/db/ops/write_ops.cpp @@ -43,10 +43,10 @@ namespace mongo { -using write_ops::Delete; +using write_ops::DeleteCommandRequest; using write_ops::DeleteOpEntry; -using write_ops::Insert; -using write_ops::Update; +using write_ops::InsertCommandRequest; +using write_ops::UpdateCommandRequest; using write_ops::UpdateOpEntry; namespace { @@ -58,7 +58,7 @@ void checkOpCountForCommand(const T& op, size_t numOps) { << write_ops::kMaxWriteBatchSize << ". Got " << numOps << " operations.", numOps != 0 && numOps <= write_ops::kMaxWriteBatchSize); - if (const auto& stmtIds = op.getWriteCommandBase().getStmtIds()) { + if (const auto& stmtIds = op.getWriteCommandRequestBase().getStmtIds()) { uassert( ErrorCodes::InvalidLength, str::stream() << "Number of statement ids must match the number of batch entries. Got " @@ -68,10 +68,10 @@ void checkOpCountForCommand(const T& op, size_t numOps) { stmtIds->size() == numOps); uassert(ErrorCodes::InvalidOptions, str::stream() << "May not specify both stmtId and stmtIds in write command. Got " - << BSON("stmtId" << *op.getWriteCommandBase().getStmtId() << "stmtIds" - << *stmtIds) + << BSON("stmtId" << *op.getWriteCommandRequestBase().getStmtId() + << "stmtIds" << *stmtIds) << ". Write command: " << redact(op.toBSON({})), - !op.getWriteCommandBase().getStmtId()); + !op.getWriteCommandRequestBase().getStmtId()); } } @@ -114,7 +114,7 @@ repl::OpTime opTimeParser(BSONElement elem) { << BSONType::bsonTimestamp << ", but found " << elem.type()); } -int32_t getStmtIdForWriteAt(const WriteCommandBase& writeCommandBase, size_t writePos) { +int32_t getStmtIdForWriteAt(const WriteCommandRequestBase& writeCommandBase, size_t writePos) { const auto& stmtIds = writeCommandBase.getStmtIds(); if (stmtIds) { @@ -128,23 +128,23 @@ int32_t getStmtIdForWriteAt(const WriteCommandBase& writeCommandBase, size_t wri } // namespace write_ops -write_ops::Insert InsertOp::parse(const OpMsgRequest& request) { - auto insertOp = Insert::parse(IDLParserErrorContext("insert"), request); +write_ops::InsertCommandRequest InsertOp::parse(const OpMsgRequest& request) { + auto insertOp = InsertCommandRequest::parse(IDLParserErrorContext("insert"), request); validate(insertOp); return insertOp; } -write_ops::Insert InsertOp::parseLegacy(const Message& msgRaw) { +write_ops::InsertCommandRequest InsertOp::parseLegacy(const Message& msgRaw) { DbMessage msg(msgRaw); - Insert op(NamespaceString(msg.getns())); + InsertCommandRequest op(NamespaceString(msg.getns())); { - write_ops::WriteCommandBase writeCommandBase; + write_ops::WriteCommandRequestBase writeCommandBase; writeCommandBase.setBypassDocumentValidation(false); writeCommandBase.setOrdered(!(msg.reservedField() & InsertOption_ContinueOnError)); - op.setWriteCommandBase(std::move(writeCommandBase)); + op.setWriteCommandRequestBase(std::move(writeCommandBase)); } uassert(ErrorCodes::InvalidLength, "Need at least one object to insert", msg.moreJSObjs()); @@ -162,28 +162,28 @@ write_ops::Insert InsertOp::parseLegacy(const Message& msgRaw) { return op; } -void InsertOp::validate(const write_ops::Insert& insertOp) { +void InsertOp::validate(const write_ops::InsertCommandRequest& insertOp) { const auto& docs = insertOp.getDocuments(); checkOpCountForCommand(insertOp, docs.size()); } -write_ops::Update UpdateOp::parse(const OpMsgRequest& request) { - auto updateOp = Update::parse(IDLParserErrorContext("update"), request); +write_ops::UpdateCommandRequest UpdateOp::parse(const OpMsgRequest& request) { + auto updateOp = UpdateCommandRequest::parse(IDLParserErrorContext("update"), request); checkOpCountForCommand(updateOp, updateOp.getUpdates().size()); return updateOp; } -write_ops::Update UpdateOp::parseLegacy(const Message& msgRaw) { +write_ops::UpdateCommandRequest UpdateOp::parseLegacy(const Message& msgRaw) { DbMessage msg(msgRaw); - Update op(NamespaceString(msg.getns())); + UpdateCommandRequest op(NamespaceString(msg.getns())); { - write_ops::WriteCommandBase writeCommandBase; + write_ops::WriteCommandRequestBase writeCommandBase; writeCommandBase.setBypassDocumentValidation(false); writeCommandBase.setOrdered(true); - op.setWriteCommandBase(std::move(writeCommandBase)); + op.setWriteCommandRequestBase(std::move(writeCommandBase)); } op.setUpdates([&] { @@ -205,39 +205,40 @@ write_ops::Update UpdateOp::parseLegacy(const Message& msgRaw) { return op; } -write_ops::UpdateReply UpdateOp::parseResponse(const BSONObj& obj) { +write_ops::UpdateCommandReply UpdateOp::parseResponse(const BSONObj& obj) { uassertStatusOK(getStatusFromCommandResult(obj)); - return write_ops::UpdateReply::parse(IDLParserErrorContext("updateReply"), obj); + return write_ops::UpdateCommandReply::parse(IDLParserErrorContext("updateReply"), obj); } -void UpdateOp::validate(const Update& updateOp) { +void UpdateOp::validate(const UpdateCommandRequest& updateOp) { checkOpCountForCommand(updateOp, updateOp.getUpdates().size()); } -write_ops::FindAndModifyReply FindAndModifyOp::parseResponse(const BSONObj& obj) { +write_ops::FindAndModifyCommandReply FindAndModifyOp::parseResponse(const BSONObj& obj) { uassertStatusOK(getStatusFromCommandResult(obj)); - return write_ops::FindAndModifyReply::parse(IDLParserErrorContext("findAndModifyReply"), obj); + return write_ops::FindAndModifyCommandReply::parse(IDLParserErrorContext("findAndModifyReply"), + obj); } -write_ops::Delete DeleteOp::parse(const OpMsgRequest& request) { - auto deleteOp = Delete::parse(IDLParserErrorContext("delete"), request); +write_ops::DeleteCommandRequest DeleteOp::parse(const OpMsgRequest& request) { + auto deleteOp = DeleteCommandRequest::parse(IDLParserErrorContext("delete"), request); checkOpCountForCommand(deleteOp, deleteOp.getDeletes().size()); return deleteOp; } -write_ops::Delete DeleteOp::parseLegacy(const Message& msgRaw) { +write_ops::DeleteCommandRequest DeleteOp::parseLegacy(const Message& msgRaw) { DbMessage msg(msgRaw); - Delete op(NamespaceString(msg.getns())); + DeleteCommandRequest op(NamespaceString(msg.getns())); { - write_ops::WriteCommandBase writeCommandBase; + write_ops::WriteCommandRequestBase writeCommandBase; writeCommandBase.setBypassDocumentValidation(false); writeCommandBase.setOrdered(true); - op.setWriteCommandBase(std::move(writeCommandBase)); + op.setWriteCommandRequestBase(std::move(writeCommandBase)); } op.setDeletes([&] { @@ -256,7 +257,7 @@ write_ops::Delete DeleteOp::parseLegacy(const Message& msgRaw) { return op; } -void DeleteOp::validate(const Delete& deleteOp) { +void DeleteOp::validate(const DeleteCommandRequest& deleteOp) { checkOpCountForCommand(deleteOp, deleteOp.getDeletes().size()); } |