summaryrefslogtreecommitdiff
path: root/src/mongo/db/fle_crud.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/fle_crud.h')
-rw-r--r--src/mongo/db/fle_crud.h10
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();
}
/**