diff options
| author | samontea <merciers.merciers@gmail.com> | 2022-05-09 23:22:31 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-05-10 02:12:57 +0000 |
| commit | 9c6a831a9ae2a02cb0d1e49232a69f350eab0c0c (patch) | |
| tree | be7846122ba47e09192498240290ef1c7b2d90b5 /src/mongo/db/pipeline | |
| parent | 7f55c457738556cf96236ef9c7aa4b30bbe07390 (diff) | |
| download | mongo-9c6a831a9ae2a02cb0d1e49232a69f350eab0c0c.tar.gz | |
SERVER-52286 Enable feature flag for Bucket Unpacking with Sorting, reduce FCV to 6.0
Diffstat (limited to 'src/mongo/db/pipeline')
| -rw-r--r-- | src/mongo/db/pipeline/document_source_sort.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/db/pipeline/pipeline_d.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/pipeline/document_source_sort.cpp b/src/mongo/db/pipeline/document_source_sort.cpp index 3080259a883..c4b0ede94f3 100644 --- a/src/mongo/db/pipeline/document_source_sort.cpp +++ b/src/mongo/db/pipeline/document_source_sort.cpp @@ -147,8 +147,7 @@ REGISTER_DOCUMENT_SOURCE_CONDITIONALLY( DocumentSourceSort::parseBoundedSort, AllowedWithApiStrict::kNeverInVersion1, AllowedWithClientType::kAny, - boost:: - none /* TODO SERVER-52286 feature_flags::gFeatureFlagBucketUnpackWithSort.getVersion() */, + feature_flags::gFeatureFlagBucketUnpackWithSort.getVersion(), feature_flags::gFeatureFlagBucketUnpackWithSort.isEnabledAndIgnoreFCV()); DocumentSource::GetNextResult::ReturnStatus DocumentSourceSort::timeSorterPeek() { diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp index 016419b9dce..fbba650d37d 100644 --- a/src/mongo/db/pipeline/pipeline_d.cpp +++ b/src/mongo/db/pipeline/pipeline_d.cpp @@ -1181,7 +1181,7 @@ PipelineD::buildInnerQueryExecutorGeneric(const MultipleCollectionAccessor& coll auto [unpack, sort] = findUnpackThenSort(pipeline->_sources); if (serverGlobalParams.featureCompatibility.isVersionInitialized() && serverGlobalParams.featureCompatibility.isGreaterThanOrEqualTo( - multiversion::FeatureCompatibilityVersion::kVersion_6_1) && + multiversion::FeatureCompatibilityVersion::kVersion_6_0) && feature_flags::gFeatureFlagBucketUnpackWithSort.isEnabled( serverGlobalParams.featureCompatibility) && unpack && sort) { |