diff options
| author | Vishnu Kaushik <vishnu.kaushik@mongodb.com> | 2021-09-01 21:36:37 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-01 22:56:22 +0000 |
| commit | 1a0f9486eb228065434d439fc417762c33aab4b7 (patch) | |
| tree | dfbae9a0391a1a1f04dddade347e418edb1b030e /src/mongo/db/update | |
| parent | 41bb7c7fb877f475f73265fe7c811e4e811ad174 (diff) | |
| download | mongo-1a0f9486eb228065434d439fc417762c33aab4b7.tar.gz | |
SERVER-58344 Remove ServerGlobalParams::FeatureCompatibility and replace references with generated FCV constants
Diffstat (limited to 'src/mongo/db/update')
| -rw-r--r-- | src/mongo/db/update/pipeline_executor.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/update/storage_validation.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/update/pipeline_executor.cpp b/src/mongo/db/update/pipeline_executor.cpp index c2e77fb1e90..ac6df9ca086 100644 --- a/src/mongo/db/update/pipeline_executor.cpp +++ b/src/mongo/db/update/pipeline_executor.cpp @@ -104,7 +104,7 @@ UpdateExecutor::ApplyResult PipelineExecutor::applyUpdate(ApplyParams applyParam bool allowTopLevelDollarPrefixedFields = serverGlobalParams.featureCompatibility.isVersionInitialized() && serverGlobalParams.featureCompatibility.isGreaterThanOrEqualTo( - FeatureCompatibilityParams::Version::kFullyDowngradedTo50); + multiversion::FeatureCompatibilityVersion::kFullyDowngradedTo_5_0); auto ret = ObjectReplaceExecutor::applyReplacementUpdate( applyParams, transformedDoc, transformedDocHasIdField, allowTopLevelDollarPrefixedFields); diff --git a/src/mongo/db/update/storage_validation.cpp b/src/mongo/db/update/storage_validation.cpp index 444637470f3..3e04bf45f35 100644 --- a/src/mongo/db/update/storage_validation.cpp +++ b/src/mongo/db/update/storage_validation.cpp @@ -115,7 +115,7 @@ void validateDollarPrefixElement(mutablebson::ConstElement elem) { const auto replaceWithHint = serverGlobalParams.featureCompatibility.isVersionInitialized() && serverGlobalParams.featureCompatibility.isGreaterThanOrEqualTo( - FeatureCompatibilityParams::Version::kFullyDowngradedTo50) + multiversion::FeatureCompatibilityVersion::kFullyDowngradedTo_5_0) ? "' is not allowed in the context of an update's replacement document. Consider using " "an aggregation pipeline with $replaceWith." : "' is not valid for storage."; @@ -140,7 +140,7 @@ Status storageValidIdField(const mongo::BSONElement& element) { if (!status.isOK() && status.code() == ErrorCodes::DollarPrefixedFieldName && serverGlobalParams.featureCompatibility.isVersionInitialized() && serverGlobalParams.featureCompatibility.isGreaterThanOrEqualTo( - FeatureCompatibilityParams::Version::kFullyDowngradedTo50)) { + multiversion::FeatureCompatibilityVersion::kFullyDowngradedTo_5_0)) { return Status(status.code(), str::stream() << "_id fields may not contain '$'-prefixed fields: " << status.reason()); @@ -203,7 +203,7 @@ void storageValid(mutablebson::ConstElement elem, const bool dotsAndDollarsFeatureEnabled = serverGlobalParams.featureCompatibility.isVersionInitialized() && serverGlobalParams.featureCompatibility.isGreaterThanOrEqualTo( - FeatureCompatibilityParams::Version::kFullyDowngradedTo50); + multiversion::FeatureCompatibilityVersion::kFullyDowngradedTo_5_0); const bool checkFields = !dotsAndDollarsFeatureEnabled || checkTopLevelFields; auto fieldName = elem.getFieldName(); |