SERVER-67585: first changes

7 files changed, 4 insertions, 30 deletions

diff --git a/jstests/aggregation/sources/fill/fill.js b/jstests/aggregation/sources/fill/fill.js
index a0e400547f1..874cc2dd55e 100644
--- a/jstests/aggregation/sources/fill/fill.js
+++ b/jstests/aggregation/sources/fill/fill.js
@@ -14,10 +14,6 @@ load("jstests/libs/fixture_helpers.js");
 load("jstests/libs/feature_flag_util.js");    // For isEnabled.
 load("jstests/aggregation/extras/utils.js");  // For arrayEq.
 
-if (!FeatureFlagUtil.isEnabled(db, "Fill")) {
-    jsTestLog("Skipping as featureFlagFill is not enabled");
-    return;
-}
 const coll = db[jsTestName()];
 coll.drop();
 const documents = [
diff --git a/jstests/aggregation/sources/fill/fill_and_densify.js b/jstests/aggregation/sources/fill/fill_and_densify.js
index db600c3c33b..e374481e5a2 100644
--- a/jstests/aggregation/sources/fill/fill_and_densify.js
+++ b/jstests/aggregation/sources/fill/fill_and_densify.js
@@ -11,10 +11,6 @@ load("jstests/libs/fixture_helpers.js");
 load("jstests/libs/feature_flag_util.js");    // For isEnabled.
 load("jstests/aggregation/extras/utils.js");  // For arrayEq.
 
-if (!FeatureFlagUtil.isEnabled(db, "Fill")) {
-    jsTestLog("Skipping as featureFlagFill is not enabled");
-    return;
-}
 const coll = db[jsTestName()];
 coll.drop();
 
diff --git a/jstests/aggregation/sources/fill/fill_parse.js b/jstests/aggregation/sources/fill/fill_parse.js
index f25c1530307..ccb7f460b92 100644
--- a/jstests/aggregation/sources/fill/fill_parse.js
+++ b/jstests/aggregation/sources/fill/fill_parse.js
@@ -12,10 +12,6 @@ load("jstests/libs/fixture_helpers.js");
 load("jstests/libs/feature_flag_util.js");    // For isEnabled.
 load("jstests/aggregation/extras/utils.js");  // For anyEq and desugarSingleStageAggregation.
 
-if (!FeatureFlagUtil.isEnabled(db, "Fill")) {
-    jsTestLog("Skipping as featureFlagFill is not enabled");
-    return;
-}
 const coll = db[jsTestName()];
 coll.drop();
 
diff --git a/jstests/aggregation/sources/setWindowFields/linear_fill.js b/jstests/aggregation/sources/setWindowFields/linear_fill.js
index 9fd1cade6e1..2f742db70f2 100644
--- a/jstests/aggregation/sources/setWindowFields/linear_fill.js
+++ b/jstests/aggregation/sources/setWindowFields/linear_fill.js
@@ -11,10 +11,6 @@ load("jstests/aggregation/extras/window_function_helpers.js");
 load("jstests/aggregation/extras/utils.js");  // For arrayEq.
 load("jstests/libs/feature_flag_util.js");    // For isEnabled.
 
-if (!FeatureFlagUtil.isEnabled(db, "Fill")) {
-    jsTestLog("Skipping as featureFlagFill is not enabled");
-    return;
-}
 const coll = db.linear_fill;
 coll.drop();
 
diff --git a/src/mongo/db/pipeline/document_source_fill.cpp b/src/mongo/db/pipeline/document_source_fill.cpp
index 755b1f397df..870e719325b 100644
--- a/src/mongo/db/pipeline/document_source_fill.cpp
+++ b/src/mongo/db/pipeline/document_source_fill.cpp
@@ -47,8 +47,8 @@ REGISTER_DOCUMENT_SOURCE_CONDITIONALLY(fill,
                                        document_source_fill::createFromBson,
                                        AllowedWithApiStrict::kNeverInVersion1,
                                        AllowedWithClientType::kAny,
-                                       feature_flags::gFeatureFlagFill.getVersion(),
-                                       feature_flags::gFeatureFlagFill.isEnabledAndIgnoreFCV());
+                                       boost::none,
+                                       true);
 namespace document_source_fill {
 
 std::list<boost::intrusive_ptr<DocumentSource>> createFromBson(
diff --git a/src/mongo/db/pipeline/window_function/window_function_expression.cpp b/src/mongo/db/pipeline/window_function/window_function_expression.cpp
index ac82c24ab25..47a9db887fe 100644
--- a/src/mongo/db/pipeline/window_function/window_function_expression.cpp
+++ b/src/mongo/db/pipeline/window_function/window_function_expression.cpp
@@ -58,11 +58,7 @@ using namespace window_function_n_traits;
 REGISTER_STABLE_WINDOW_FUNCTION(derivative, ExpressionDerivative::parse);
 REGISTER_STABLE_WINDOW_FUNCTION(first, ExpressionFirst::parse);
 REGISTER_STABLE_WINDOW_FUNCTION(last, ExpressionLast::parse);
-REGISTER_WINDOW_FUNCTION_CONDITIONALLY(linearFill,
-                                       (ExpressionLinearFill::parse),
-                                       feature_flags::gFeatureFlagFill.getVersion(),
-                                       AllowedWithApiStrict::kNeverInVersion1,
-                                       feature_flags::gFeatureFlagFill.isEnabledAndIgnoreFCV());
+REGISTER_STABLE_WINDOW_FUNCTION(linearFill, ExpressionLinearFill::parse);
 REGISTER_STABLE_WINDOW_FUNCTION(minN, (ExpressionN<WindowFunctionMinN, AccumulatorMinN>::parse));
 REGISTER_STABLE_WINDOW_FUNCTION(maxN, (ExpressionN<WindowFunctionMaxN, AccumulatorMaxN>::parse));
 REGISTER_STABLE_WINDOW_FUNCTION(firstN,
diff --git a/src/mongo/db/query/query_feature_flags.idl b/src/mongo/db/query/query_feature_flags.idl
index 48c3f791886..df2bb74890b 100644
--- a/src/mongo/db/query/query_feature_flags.idl
+++ b/src/mongo/db/query/query_feature_flags.idl
@@ -70,13 +70,7 @@ feature_flags:
         cpp_varname: gFeatureFlagLocf
         default: true
         version: 5.2
-
-    featureFlagFill:
-        description: "Feature flag for allowing $fill and $linearFill window functions"
-        cpp_varname: gFeatureFlagFill
-        default: true
-        version: 5.3
-
+        
     featureFlagCommonQueryFramework:
       description: "Feature flag for allowing use of Cascades-based query optimizer"
       cpp_varname: gFeatureFlagCommonQueryFramework