SERVER-52237: Enable feature flag for Approximate Median and Percentile Accumulators

10 files changed, 16 insertions, 8 deletions

diff --git a/jstests/aggregation/accumulators/median_approx.js b/jstests/aggregation/accumulators/median_approx.js
index a0216520dd2..0e0b1d6dbfa 100644
--- a/jstests/aggregation/accumulators/median_approx.js
+++ b/jstests/aggregation/accumulators/median_approx.js
@@ -2,9 +2,8 @@
  * Tests that the approximate median accumulator semantics matches the percentile semantics with the
  * field 'p':[0.5].
  * @tags: [
- *   featureFlagApproxPercentiles,
- *   # sharded collections aren't supported yet.
- *   assumes_unsharded_collection,
+ *   requires_fcv_70,
+ *   featureFlagApproxPercentiles
  * ]
  */
 (function() {
diff --git a/jstests/aggregation/accumulators/percentiles_approx.js b/jstests/aggregation/accumulators/percentiles_approx.js
index 33671203694..ee6b8db778a 100644
--- a/jstests/aggregation/accumulators/percentiles_approx.js
+++ b/jstests/aggregation/accumulators/percentiles_approx.js
@@ -1,7 +1,8 @@
 /**
  * Tests for the approximate percentile accumulator semantics.
  * @tags: [
- *   featureFlagApproxPercentiles,
+ *   requires_fcv_70,
+ *   featureFlagApproxPercentiles
  * ]
  */
 (function() {
diff --git a/jstests/aggregation/accumulators/percentiles_syntax.js b/jstests/aggregation/accumulators/percentiles_syntax.js
index c6e12136838..c1aa4a050fe 100644
--- a/jstests/aggregation/accumulators/percentiles_syntax.js
+++ b/jstests/aggregation/accumulators/percentiles_syntax.js
@@ -1,7 +1,8 @@
 /**
  * Tests for the $percentile accumulator syntax.
  * @tags: [
- *   featureFlagApproxPercentiles,
+ *   requires_fcv_70,
+ *   featureFlagApproxPercentiles
  * ]
  */
 (function() {
diff --git a/jstests/aggregation/expressions/median_expression_approx.js b/jstests/aggregation/expressions/median_expression_approx.js
index ce128b53d2c..dd05a9106ba 100644
--- a/jstests/aggregation/expressions/median_expression_approx.js
+++ b/jstests/aggregation/expressions/median_expression_approx.js
@@ -2,6 +2,7 @@
  * Tests that the approximate median expression semantics match the percentile expression semantics
  * with the field 'p':[0.5].
  * @tags: [
+ *   requires_fcv_70,
  *   featureFlagApproxPercentiles
  * ]
  */
diff --git a/jstests/aggregation/expressions/percentile_expression_approx.js b/jstests/aggregation/expressions/percentile_expression_approx.js
index 013dcbaa8a7..a50d4f50452 100644
--- a/jstests/aggregation/expressions/percentile_expression_approx.js
+++ b/jstests/aggregation/expressions/percentile_expression_approx.js
@@ -1,6 +1,7 @@
 /**
  * Tests for the approximate percentile expression semantics.
  * @tags: [
+ *   requires_fcv_70,
  *   featureFlagApproxPercentiles
  * ]
  */
diff --git a/jstests/aggregation/expressions/percentile_expression_syntax.js b/jstests/aggregation/expressions/percentile_expression_syntax.js
index 601229daef6..a156b599eec 100644
--- a/jstests/aggregation/expressions/percentile_expression_syntax.js
+++ b/jstests/aggregation/expressions/percentile_expression_syntax.js
@@ -1,6 +1,7 @@
 /**
  * Tests for the $percentile expression syntax.
  * @tags: [
+ *   requires_fcv_70,
  *   featureFlagApproxPercentiles
  * ]
  */
diff --git a/jstests/aggregation/sources/setWindowFields/percentile.js b/jstests/aggregation/sources/setWindowFields/percentile.js
index de36ef60f94..2121d9c7e5c 100644
--- a/jstests/aggregation/sources/setWindowFields/percentile.js
+++ b/jstests/aggregation/sources/setWindowFields/percentile.js
@@ -1,7 +1,8 @@
 /**
  * Test that $percentile and $median work as window functions.
  *  @tags: [
- *   featureFlagApproxPercentiles,
+ *   requires_fcv_70,
+ *   featureFlagApproxPercentiles
  * ]
  */
 (function() {
diff --git a/jstests/aggregation/sources/setWindowFields/spill_to_disk.js b/jstests/aggregation/sources/setWindowFields/spill_to_disk.js
index 4cf7f80a35a..2f687ae6ffc 100644
--- a/jstests/aggregation/sources/setWindowFields/spill_to_disk.js
+++ b/jstests/aggregation/sources/setWindowFields/spill_to_disk.js
@@ -1,6 +1,7 @@
 /*
  * Test that spilling to disk in $setWindowFields works and returns the correct results.
  * @tags: [
+ * requires_fcv_70,
  * requires_profiling,
  * assumes_read_concern_unchanged,
  * do_not_wrap_aggregations_in_facets,
diff --git a/jstests/sharding/query/agg_percentile.js b/jstests/sharding/query/agg_percentile.js
index e7b8ad5249c..0965073498e 100644
--- a/jstests/sharding/query/agg_percentile.js
+++ b/jstests/sharding/query/agg_percentile.js
@@ -1,7 +1,8 @@
 /**
  * Tests that $percentile is computed correctly for sharded collections.
  * @tags: [
- *   featureFlagApproxPercentiles,
+ *   requires_fcv_70,
+ *   featureFlagApproxPercentiles
  * ]
  */
 
diff --git a/src/mongo/db/query/query_feature_flags.idl b/src/mongo/db/query/query_feature_flags.idl
index 1274432404f..7891742993f 100644
--- a/src/mongo/db/query/query_feature_flags.idl
+++ b/src/mongo/db/query/query_feature_flags.idl
@@ -113,4 +113,5 @@ feature_flags:
     featureFlagApproxPercentiles:
       description: "Feature flag to enable approximate $percentile accumulator/expression."
       cpp_varname: gFeatureFlagApproxPercentiles
-      default: false
+      default: true
+      version: 7.0