diff options
author | Suganthi Mani <suganthi.mani@mongodb.com> | 2020-10-29 22:50:40 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-11-06 18:24:35 +0000 |
commit | 259cf7048a5625541af815911192ae61fbbd52df (patch) | |
tree | 874ddcd80b06bb78eb41fae20d46a59a26bc24b6 /src/mongo/db/catalog | |
parent | 3c179e493589356f16641c40647cfd1418473d06 (diff) | |
download | mongo-259cf7048a5625541af815911192ae61fbbd52df.tar.gz |
SERVER-52602 OplogBufferCollection uses write_ops_exec::performInserts() to insert documents to comply with "multi-timestamp" rules.
Diffstat (limited to 'src/mongo/db/catalog')
-rw-r--r-- | src/mongo/db/catalog/collection_impl.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/catalog/document_validation.cpp | 6 | ||||
-rw-r--r-- | src/mongo/db/catalog/document_validation.h | 91 |
3 files changed, 78 insertions, 21 deletions
diff --git a/src/mongo/db/catalog/collection_impl.cpp b/src/mongo/db/catalog/collection_impl.cpp index b5dff5774c0..1ede05ecd60 100644 --- a/src/mongo/db/catalog/collection_impl.cpp +++ b/src/mongo/db/catalog/collection_impl.cpp @@ -426,7 +426,7 @@ Status CollectionImpl::checkValidation(OperationContext* opCtx, const BSONObj& d if (_validationLevel == ValidationLevel::OFF) return Status::OK(); - if (documentValidationDisabled(opCtx)) + if (DocumentValidationSettings::get(opCtx).isSchemaValidationDisabled()) return Status::OK(); if (ns().isTemporaryReshardingCollection()) { diff --git a/src/mongo/db/catalog/document_validation.cpp b/src/mongo/db/catalog/document_validation.cpp index 004173f5014..3d660de21ca 100644 --- a/src/mongo/db/catalog/document_validation.cpp +++ b/src/mongo/db/catalog/document_validation.cpp @@ -32,6 +32,6 @@ #include "mongo/db/catalog/document_validation.h" namespace mongo { -const OperationContext::Decoration<bool> documentValidationDisabled = - OperationContext::declareDecoration<bool>(); -} +const OperationContext::Decoration<DocumentValidationSettings> DocumentValidationSettings::get = + OperationContext::declareDecoration<DocumentValidationSettings>(); +} // namespace mongo diff --git a/src/mongo/db/catalog/document_validation.h b/src/mongo/db/catalog/document_validation.h index e27dfb11b66..f236deccd56 100644 --- a/src/mongo/db/catalog/document_validation.h +++ b/src/mongo/db/catalog/document_validation.h @@ -33,12 +33,6 @@ #include "mongo/db/operation_context.h" namespace mongo { -/** - * If true, Collection should do no validation of writes from this OperationContext. - * - * Note that Decorations are value-constructed so this defaults to false. - */ -extern const OperationContext::Decoration<bool> documentValidationDisabled; inline StringData bypassDocumentValidationCommandOption() { return "bypassDocumentValidation"; @@ -49,6 +43,64 @@ inline bool shouldBypassDocumentValidationForCommand(const BSONObj& cmdObj) { } /** + * This container decorates an OperationContext object. It stores the document validation + * settings for writes associated with an OperationContext. By default, document validation (both + * schema and internal) is enabled. DocumentValidationSettings objects are not thread-safe. + * + */ +class DocumentValidationSettings { +public: + enum flag : std::uint8_t { + /* + * Enables document validation (both schema and internal). + */ + kEnableValidation = 0x00, + /* + * Disables the schema validation during document inserts and updates. + * This flag should be enabled if WriteCommandBase::_bypassDocumentValidation + * is set to true. + */ + kDisableSchemaValidation = 0x01, + /* + * Disables any internal validation (like fixDocumentForInsert()). This flag + * should be enabled only for trusted internal writes or internal writes that + * doesn't comply with internal validation rules. + */ + kDisableInternalValidation = 0x02, + }; + + using Flags = std::uint8_t; + + static const OperationContext::Decoration<DocumentValidationSettings> get; + + DocumentValidationSettings() = default; + + void setFlags(Flags flags) { + invariant(flags != kEnableValidation); + _flags |= flags; + } + + void clearFlags() { + _flags = kEnableValidation; + } + + bool isSchemaValidationDisabled() const { + return _flags & kDisableSchemaValidation; + } + + bool isInternalValidationDisabled() const { + return _flags & kDisableInternalValidation; + } + + bool isDocumentValidationEnabled() const { + return _flags == kEnableValidation; + } + +private: + Flags _flags = kEnableValidation; +}; + +/** * Disables document validation on a single OperationContext while in scope. * Resets to original value when leaving scope so they are safe to nest. */ @@ -57,31 +109,36 @@ class DisableDocumentValidation { DisableDocumentValidation& operator=(const DisableDocumentValidation&) = delete; public: - DisableDocumentValidation(OperationContext* opCtx) - : _opCtx(opCtx), _initialState(documentValidationDisabled(_opCtx)) { - documentValidationDisabled(_opCtx) = true; + DisableDocumentValidation(OperationContext* opCtx, + DocumentValidationSettings::Flags flags = + DocumentValidationSettings::kDisableSchemaValidation) + : _opCtx(opCtx) { + auto& documentValidationSettings = DocumentValidationSettings::get(_opCtx); + _initialState = documentValidationSettings; + documentValidationSettings.setFlags(flags); } ~DisableDocumentValidation() { - documentValidationDisabled(_opCtx) = _initialState; + DocumentValidationSettings::get(_opCtx) = _initialState; } private: OperationContext* const _opCtx; - const bool _initialState; + DocumentValidationSettings _initialState; }; /** - * Disables document validation while in scope if the constructor is passed true. + * Disables document schema validation while in scope if the constructor is passed true. */ -class DisableDocumentValidationIfTrue { +class DisableDocumentSchemaValidationIfTrue { public: - DisableDocumentValidationIfTrue(OperationContext* opCtx, bool shouldDisableValidation) { - if (shouldDisableValidation) - _documentValidationDisabler.emplace(opCtx); + DisableDocumentSchemaValidationIfTrue(OperationContext* opCtx, + bool shouldDisableSchemaValidation) { + if (shouldDisableSchemaValidation) + _documentSchemaValidationDisabler.emplace(opCtx); } private: - boost::optional<DisableDocumentValidation> _documentValidationDisabler; + boost::optional<DisableDocumentValidation> _documentSchemaValidationDisabler; }; } // namespace mongo |