diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2022-07-11 13:51:44 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-07-15 19:08:21 +0000 |
| commit | 49802bc44a41271ae1dac871b28bdf1146f77ece (patch) | |
| tree | 9f2d3a91a5d3aac7f8a8dd2ab754bac072f03d4a /src/mongo/db/fle_crud.h | |
| parent | 6f06862f5d76a46f3570ff3a6ed2d616991d8e5a (diff) | |
| download | mongo-49802bc44a41271ae1dac871b28bdf1146f77ece.tar.gz | |
SERVER-65077 Remove FCV gating logic for FLE 2 after branching 6.0
Diffstat (limited to 'src/mongo/db/fle_crud.h')
| -rw-r--r-- | src/mongo/db/fle_crud.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mongo/db/fle_crud.h b/src/mongo/db/fle_crud.h index 7c8d93ae1f9..c91f7c1eee4 100644 --- a/src/mongo/db/fle_crud.h +++ b/src/mongo/db/fle_crud.h @@ -218,18 +218,12 @@ std::unique_ptr<Pipeline, PipelineDeleter> processFLEPipelineD( */ template <typename T> bool shouldDoFLERewrite(const std::unique_ptr<T>& cmd) { - // TODO (SERVER-65077): Remove FCV check once 6.0 is released - return (!serverGlobalParams.featureCompatibility.isVersionInitialized() || - gFeatureFlagFLE2.isEnabled(serverGlobalParams.featureCompatibility)) && - cmd->getEncryptionInformation(); + return cmd->getEncryptionInformation().has_value(); } template <typename T> bool shouldDoFLERewrite(const T& cmd) { - // TODO (SERVER-65077): Remove FCV check once 6.0 is released - return (!serverGlobalParams.featureCompatibility.isVersionInitialized() || - gFeatureFlagFLE2.isEnabled(serverGlobalParams.featureCompatibility)) && - cmd.getEncryptionInformation(); + return cmd.getEncryptionInformation().has_value(); } /** |