SERVER-97917 Move $rankFusion to be guarded under FeatureFlagRankFusion (#30385)

shaargtz · MongoDB Bot · commit 8b65a1ad932f · 2024-12-18T22:14:48.000Z
GitOrigin-RevId: c72f860
diff --git a/jstests/aggregation/expressions/sigmoid.js b/jstests/aggregation/expressions/sigmoid.js
@@ -1,6 +1,6 @@
 /**
  * Tests the $sigmoid aggregation expression.
- * @tags: [ featureFlagRankFusionFull, requires_fcv_81 ]
+ * @tags: [ featureFlagRankFusionBasic, requires_fcv_81 ]
  */
 import {anyEq, assertErrorCode, testExpression} from "jstests/aggregation/extras/utils.js";
 
diff --git a/jstests/auth/lib/commands_lib.js b/jstests/auth/lib/commands_lib.js
@@ -8342,7 +8342,7 @@ export const authCommandsLib = {
         skipSharded: false,
         disableSearch: true,
         skipTest: (conn) => {
-          return !TestData.setParameters.featureFlagRankFusionFull;
+          return !TestData.setParameters.featureFlagRankFusionBasic;
         },
         // Expect this to fail since there's no mongot set up to execute the $search/vectorSearch.
         testcases: testcases_transformationOnlyExpectFail,
diff --git a/jstests/core/query/api/api_version_hybrid_search.js b/jstests/core/query/api/api_version_hybrid_search.js
@@ -1,7 +1,7 @@
 /**
  * Tests hybrid search syntax that isn't supported in API Version 1.
  *
- * @tags: [featureFlagRankFusionFull, uses_api_parameters, requires_fcv_81]
+ * @tags: [featureFlagRankFusionBasic, uses_api_parameters, requires_fcv_81]
  */
 
 import {APIVersionHelpers} from "jstests/libs/api_version_helpers.js";
diff --git a/jstests/core/query/api/api_version_pipeline_stages.js b/jstests/core/query/api/api_version_pipeline_stages.js
@@ -31,6 +31,7 @@ const unstablePipelines = [
 ];
 
 // TODO SERVER-94570 $rankFusion can always be included when it's enabled by default.
+// TODO SERVER-98591 Change RankFusionFull to RankFusionBasic.
 if (FeatureFlagUtil.isPresentAndEnabled(testDb.getMongo(), 'RankFusionFull')) {
     unstablePipelines.push([{$rankFusion: {input: {pipelines: {field1: [{$sort: {foo: 1}}]}}}}]);
 }
diff --git a/jstests/with_mongot/e2e/hybridSearch/ranked_fusion_test.js b/jstests/with_mongot/e2e/hybridSearch/ranked_fusion_test.js
@@ -1,6 +1,6 @@
 /*
  * Tests hybrid search with the rank fusion using the $rankFusion stage.
- * @tags: [ featureFlagRankFusionFull, requires_fcv_81 ]
+ * @tags: [ featureFlagRankFusionBasic, requires_fcv_81 ]
  */
 
 import {createSearchIndex, dropSearchIndex} from "jstests/libs/search.js";
diff --git a/jstests/with_mongot/e2e/hybridSearch/ranked_fusion_verbose_test.js b/jstests/with_mongot/e2e/hybridSearch/ranked_fusion_verbose_test.js
@@ -2,7 +2,7 @@
  * Tests hybrid search with rank fusion using verbose syntax without the $rankFusion
  * stage. The collection used in this test includes no search score ties.
  *
- * @tags: [featureFlagRankFusionFull, requires_fcv_81]
+ * @tags: [featureFlagRankFusionBasic, requires_fcv_81]
  */
 
 import {createSearchIndex, dropSearchIndex} from "jstests/libs/search.js";
diff --git a/src/mongo/db/exec/document_value/document_metadata_fields_test.cpp b/src/mongo/db/exec/document_value/document_metadata_fields_test.cpp
@@ -454,8 +454,7 @@ TEST(DocumentMetadataFieldsTest, MetadataIsMarkedModifiedOnMergeWith) {
 // Tests involving manipulating only 'score' metadata field.
 // This is currently seperated out because setting it is guarded by a feature flag.
 TEST(DocumentMetadataFieldsTest, ScoreMetadataTest) {
-    RAIIServerParameterControllerForTest searchHybridScoringPrerequisitesController(
-        "featureFlagRankFusionFull", true);
+    RAIIServerParameterControllerForTest featureFlagController("featureFlagRankFusionFull", true);
 
     {
         DocumentMetadataFields metadata;
@@ -516,8 +515,7 @@ TEST(DocumentMetadataFieldsTest, ScoreMetadataTest) {
 TEST(DocumentMetadataFieldsTest, ScoreMetadataSetOnOtherMetadataTest) {
     // Tests that for certain types of metadata fields, related to a score,
     // the 'score' metadata is also set.
-    RAIIServerParameterControllerForTest searchHybridScoringPrerequisitesController(
-        "featureFlagRankFusionFull", true);
+    RAIIServerParameterControllerForTest featureFlagController("featureFlagRankFusionFull", true);
 
     // 'searchScore'
     {
diff --git a/src/mongo/db/exec/document_value/document_value_test.cpp b/src/mongo/db/exec/document_value/document_value_test.cpp
@@ -976,8 +976,7 @@ TEST(MetaFields, FromBsonWithMetadataHandlesEmptyFieldName) {
 
 TEST(MetaFields, CopyMetadataFromCopiesAllMetadata) {
     // Used to set 'score' metadata.
-    RAIIServerParameterControllerForTest searchHybridScoringPrerequisitesController(
-        "featureFlagRankFusionFull", true);
+    RAIIServerParameterControllerForTest featureFlagController("featureFlagRankFusionFull", true);
     Document source = Document::fromBsonWithMetaData(
         BSON("a" << 1 << "$textScore" << 9.9 << "b" << 1 << "$randVal" << 42.0 << "c" << 1
                  << "$sortKey" << BSON("x" << 1) << "d" << 1 << "$dis" << 3.2 << "e" << 1 << "$pt"
@@ -1105,7 +1104,7 @@ TEST_F(SerializationTest, MetaSerializationSearchHighlightsNonArray) {
 
 TEST(MetaFields, ToAndFromBson) {
     // Used to set 'score' metadata.
-    RAIIServerParameterControllerForTest prerequisitesController("featureFlagRankFusionFull", true);
+    RAIIServerParameterControllerForTest featureFlagController("featureFlagRankFusionFull", true);
     MutableDocument docBuilder;
     docBuilder.metadata().setTextScore(10.0);
     docBuilder.metadata().setRandVal(20.0);
diff --git a/src/mongo/db/exec/exclusion_projection_executor_test.cpp b/src/mongo/db/exec/exclusion_projection_executor_test.cpp
@@ -362,8 +362,7 @@ TEST(ExclusionProjectionExecutionTest, ShouldAlwaysKeepMetadataFromOriginalDoc)
 
 TEST(ExclusionProjectionExecutionTest, ShouldEvaluateMetaExpressions) {
     // Used to set 'score' metadata.
-    RAIIServerParameterControllerForTest searchHybridScoringPrerequisitesController(
-        "featureFlagRankFusionFull", true);
+    RAIIServerParameterControllerForTest featureFlagController("featureFlagRankFusionFull", true);
     auto exclusion =
         makeExclusionProjectionWithDefaultPolicies(fromjson("{a: 0, c: {$meta: 'textScore'}, "
                                                             "d: {$meta: 'randVal'}, "
diff --git a/src/mongo/db/exec/inclusion_projection_executor_test.cpp b/src/mongo/db/exec/inclusion_projection_executor_test.cpp
@@ -859,8 +859,7 @@ TEST_F(InclusionProjectionExecutionTestWithFallBackToDefault,
 
 TEST_F(InclusionProjectionExecutionTestWithFallBackToDefault, ShouldEvaluateMetaExpressions) {
     // Used to set 'score' metadata.
-    RAIIServerParameterControllerForTest searchHybridScoringPrerequisitesController(
-        "featureFlagRankFusionFull", true);
+    RAIIServerParameterControllerForTest featureFlagController("featureFlagRankFusionFull", true);
     auto inclusion =
         makeInclusionProjectionWithDefaultPolicies(fromjson("{a: 1, c: {$meta: 'textScore'}, "
                                                             "d: {$meta: 'randVal'}, "
diff --git a/src/mongo/db/pipeline/document_source_rank_fusion.cpp b/src/mongo/db/pipeline/document_source_rank_fusion.cpp
@@ -67,7 +67,7 @@ REGISTER_DOCUMENT_SOURCE_WITH_FEATURE_FLAG(rankFusion,
                                            DocumentSourceRankFusion::LiteParsed::parse,
                                            DocumentSourceRankFusion::createFromBson,
                                            AllowedWithApiStrict::kNeverInVersion1,
-                                           feature_flags::gFeatureFlagRankFusionFull);
+                                           feature_flags::gFeatureFlagRankFusionBasic);
 
 namespace {
 /**
diff --git a/src/mongo/db/pipeline/document_source_score_test.cpp b/src/mongo/db/pipeline/document_source_score_test.cpp
diff --git a/src/mongo/db/pipeline/expression.cpp b/src/mongo/db/pipeline/expression.cpp
diff --git a/src/mongo/db/pipeline/expression_test.cpp b/src/mongo/db/pipeline/expression_test.cpp
diff --git a/src/mongo/db/query/sort_pattern_test.cpp b/src/mongo/db/query/sort_pattern_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`* Tests hybrid search syntax that isn't supported in API Version 1.`
`3`	`3`	`*`
`4`		`- * @tags: [featureFlagRankFusionFull, uses_api_parameters, requires_fcv_81]`
	`4`	`+ * @tags: [featureFlagRankFusionBasic, uses_api_parameters, requires_fcv_81]`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`import {APIVersionHelpers} from "jstests/libs/api_version_helpers.js";`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ const unstablePipelines = [`
`31`	`31`	`];`
`32`	`32`
`33`	`33`	`// TODO SERVER-94570 $rankFusion can always be included when it's enabled by default.`
	`34`	`+// TODO SERVER-98591 Change RankFusionFull to RankFusionBasic.`
`34`	`35`	`if (FeatureFlagUtil.isPresentAndEnabled(testDb.getMongo(), 'RankFusionFull')) {`
`35`	`36`	`unstablePipelines.push([{$rankFusion: {input: {pipelines: {field1: [{$sort: {foo: 1}}]}}}}]);`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Tests hybrid search with rank fusion using verbose syntax without the $rankFusion`
`3`	`3`	`* stage. The collection used in this test includes no search score ties.`
`4`	`4`	`*`
`5`		`- * @tags: [featureFlagRankFusionFull, requires_fcv_81]`
	`5`	`+ * @tags: [featureFlagRankFusionBasic, requires_fcv_81]`
`6`	`6`	`*/`
`7`	`7`
`8`	`8`	`import {createSearchIndex, dropSearchIndex} from "jstests/libs/search.js";`