diff options
| author | Anton Korshunov <anton.korshunov@mongodb.com> | 2019-06-19 10:57:07 +0100 |
|---|---|---|
| committer | Anton Korshunov <anton.korshunov@mongodb.com> | 2019-06-21 21:44:34 +0100 |
| commit | 8c4dfc2ba0568bd128a27f6481994758ce5f1c10 (patch) | |
| tree | 5e60fc9107780173c9fd1e1be16a77cdfb293a78 /src/mongo/db/matcher/schema/json_schema_parser.cpp | |
| parent | 491d4e528a91b04e8b20f2ddf0d1d88758599d6a (diff) | |
| download | mongo-8c4dfc2ba0568bd128a27f6481994758ce5f1c10.tar.gz | |
SERVER-41782 Enumerate and remove Query-related FeatureCompatibilityVersion 4.0-dependent code and tests
Diffstat (limited to 'src/mongo/db/matcher/schema/json_schema_parser.cpp')
| -rw-r--r-- | src/mongo/db/matcher/schema/json_schema_parser.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/mongo/db/matcher/schema/json_schema_parser.cpp b/src/mongo/db/matcher/schema/json_schema_parser.cpp index cd1ac4a4e47..cf258da98d6 100644 --- a/src/mongo/db/matcher/schema/json_schema_parser.cpp +++ b/src/mongo/db/matcher/schema/json_schema_parser.cpp @@ -1311,16 +1311,6 @@ Status translateEncryptionKeywords(StringMap<BSONElement>& keywordMap, auto encryptElt = keywordMap[JSONSchemaParser::kSchemaEncryptKeyword]; auto encryptMetadataElt = keywordMap[JSONSchemaParser::kSchemaEncryptMetadataKeyword]; - if ((encryptElt || encryptMetadataElt) && expCtx->maxFeatureCompatibilityVersion && - expCtx->maxFeatureCompatibilityVersion < - ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo42) { - return Status(ErrorCodes::QueryFeatureNotAllowed, - str::stream() << "The featureCompatiblityVersion must be 4.2 to use " - "encryption keywords in $jsonSchema. See " - << feature_compatibility_version_documentation::kUpgradeLink - << "."); - } - if (encryptElt && encryptMetadataElt) { return Status(ErrorCodes::FailedToParse, str::stream() << "Cannot specify both $jsonSchema keywords '" |