SERVER-69767 Robustify feature flag checks for columnstore index tests

8 files changed, 15 insertions, 66 deletions

diff --git a/jstests/core/columnstore_eligibility.js b/jstests/core/columnstore_eligibility.js
index 22c1960ac88..2a3da7c9053 100644
--- a/jstests/core/columnstore_eligibility.js
+++ b/jstests/core/columnstore_eligibility.js
@@ -6,23 +6,16 @@
  *   does_not_support_stepdowns,
  *   # Cannot run aggregate with explain in a transaction.
  *   does_not_support_transactions,
- *   # columnstore indexes are new in 6.2.
  *   requires_fcv_62,
  *   uses_column_store_index,
+ *   featureFlagColumnstoreIndexes,
+ *   featureFlagSbeFull,
  * ]
  */
 (function() {
 "use strict";
 
 load("jstests/libs/analyze_plan.js");
-load("jstests/libs/sbe_util.js");  // For checkSBEEnabled.
-
-const columnstoreEnabled =
-    checkSBEEnabled(db, ["featureFlagColumnstoreIndexes", "featureFlagSbeFull"]);
-if (!columnstoreEnabled) {
-    jsTestLog("Skipping columnstore index validation test since the feature flag is not enabled.");
-    return;
-}
 
 const coll = db.columnstore_eligibility;
 coll.drop();
diff --git a/jstests/core/columnstore_index.js b/jstests/core/columnstore_index.js
index 8d1b23a75c4..023fe9b8a03 100644
--- a/jstests/core/columnstore_index.js
+++ b/jstests/core/columnstore_index.js
@@ -3,23 +3,16 @@
  * @tags: [
  *   # Uses $indexStats which is not supported inside a transaction.
  *   does_not_support_transactions,
- *   # columnstore indexes are new in 6.2.
  *   requires_fcv_62,
  *   uses_column_store_index,
+ *   featureFlagColumnstoreIndexes,
+ *   featureFlagSbeFull,
  * ]
  */
 (function() {
 "use strict";
 
 load("jstests/libs/analyze_plan.js");
-load("jstests/libs/sbe_util.js");  // For checkSBEEnabled.
-
-const columnstoreEnabled =
-    checkSBEEnabled(db, ["featureFlagColumnstoreIndexes", "featureFlagSbeFull"]);
-if (!columnstoreEnabled) {
-    jsTestLog("Skipping columnstore index validation test since the feature flag is not enabled.");
-    return;
-}
 
 const coll = db.columnstore_index;
 coll.drop();
diff --git a/jstests/core/columnstore_index_correctness.js b/jstests/core/columnstore_index_correctness.js
index f725bf82543..900533e0cd6 100644
--- a/jstests/core/columnstore_index_correctness.js
+++ b/jstests/core/columnstore_index_correctness.js
@@ -1,11 +1,12 @@
 /**
  * Testing of just the query layer's integration for columnar index.
  * @tags: [
- *   # columnstore indexes are new in 6.2.
  *   requires_fcv_62,
  *   # Runs explain on an aggregate command which is only compatible with readConcern local.
  *   assumes_read_concern_unchanged,
  *   uses_column_store_index,
+ *   featureFlagColumnstoreIndexes,
+ *   featureFlagSbeFull,
  * ]
  */
 (function() {
@@ -14,14 +15,6 @@
 load("jstests/libs/fail_point_util.js");
 load("jstests/libs/analyze_plan.js");         // For "planHasStage."
 load("jstests/aggregation/extras/utils.js");  // For "resultsEq."
-load("jstests/libs/sbe_util.js");             // For "checkSBEEnabled.""
-
-const columnstoreEnabled =
-    checkSBEEnabled(db, ["featureFlagColumnstoreIndexes", "featureFlagSbeFull"]);
-if (!columnstoreEnabled) {
-    jsTestLog("Skipping columnstore index validation test since the feature flag is not enabled.");
-    return;
-}
 
 const coll = db.columnstore_index_correctness;
 coll.drop();
diff --git a/jstests/core/columnstore_index_per_path_filters.js b/jstests/core/columnstore_index_per_path_filters.js
index 92c1f51fba5..3e8c279b872 100644
--- a/jstests/core/columnstore_index_per_path_filters.js
+++ b/jstests/core/columnstore_index_per_path_filters.js
@@ -3,14 +3,12 @@
  * might be pushed down into the column scan stage.
  *
  * @tags: [
- *   # columnstore indexes are new in 6.2.
  *   requires_fcv_62,
  *   # Runs explain on an aggregate command which is only compatible with readConcern local.
  *   assumes_read_concern_unchanged,
- *   # TODO SERVER-66925 We could potentially need to resume an index build in the event of a
- *   # stepdown, which is not yet implemented.
- *   does_not_support_stepdowns,
  *   uses_column_store_index,
+ *   featureFlagColumnstoreIndexes,
+ *   featureFlagSbeFull,
  * ]
  */
 (function() {
@@ -19,14 +17,6 @@
 load("jstests/aggregation/extras/utils.js");  // For "resultsEq."
 load("jstests/libs/analyze_plan.js");         // For "planHasStage."
 load("jstests/libs/sbe_explain_helpers.js");  // For getSbePlanStages.
-load("jstests/libs/sbe_util.js");             // For "checkSBEEnabled.""
-
-const columnstoreEnabled =
-    checkSBEEnabled(db, ["featureFlagColumnstoreIndexes", "featureFlagSbeFull"]);
-if (!columnstoreEnabled) {
-    jsTestLog("Skipping columnstore index validation test since the feature flag is not enabled.");
-    return;
-}
 
 const coll_filters = db.columnstore_index_per_path_filters;
 function runPerPathFiltersTest({docs, query, projection, expected, testDescription}) {
diff --git a/jstests/core/columnstore_large_array_index_correctness.js b/jstests/core/columnstore_large_array_index_correctness.js
index fbcc51e7811..ae537d600c0 100644
--- a/jstests/core/columnstore_large_array_index_correctness.js
+++ b/jstests/core/columnstore_large_array_index_correctness.js
@@ -3,23 +3,15 @@
  * @tags: [
  *   # columnstore indexes are new in 6.1.
  *   requires_fcv_61,
- *   # Columnstore indexes are incompatible with clustered collections.
- *   incompatible_with_clustered_collection,
+ *   uses_column_store_index,
+ *   featureFlagColumnstoreIndexes,
+ *   featureFlagSbeFull,
  * ]
  */
 (function() {
 "use strict";
 
 load("jstests/libs/analyze_plan.js");  // For "planHasStage."
-load("jstests/libs/sbe_util.js");      // For "checkSBEEnabled.""
-
-const columnstoreEnabled = checkSBEEnabled(
-    db, ["featureFlagColumnstoreIndexes", "featureFlagSbeFull"], true /* checkAllNodes */);
-if (!columnstoreEnabled) {
-    jsTestLog(
-        "Skipping columnstore large array index validation test since the feature flag is not enabled.");
-    return;
-}
 
 const coll = db.columnstore_index_correctness;
 coll.drop();
diff --git a/jstests/core/columnstore_validindex.js b/jstests/core/columnstore_validindex.js
index cf59af47bce..b1830a860f8 100644
--- a/jstests/core/columnstore_validindex.js
+++ b/jstests/core/columnstore_validindex.js
@@ -3,9 +3,9 @@
  * @tags: [
  *   # Uses index building in background.
  *   requires_background_index,
- *   # Columnstore indexes are new in 6.2.
  *   requires_fcv_62,
  *   uses_column_store_index,
+ *   featureFlagColumnstoreIndexes,
  * ]
  */
 (function() {
@@ -14,16 +14,6 @@
 load("jstests/libs/index_catalog_helpers.js");     // For "IndexCatalogHelpers."
 load("jstests/libs/collection_drop_recreate.js");  // For "assertDropCollection."
 
-const getParamResponse =
-    assert.commandWorked(db.adminCommand({getParameter: 1, featureFlagColumnstoreIndexes: 1}));
-const columnstoreEnabled = getParamResponse.hasOwnProperty("featureFlagColumnstoreIndexes") &&
-    getParamResponse.featureFlagColumnstoreIndexes.value;
-if (!columnstoreEnabled) {
-    jsTestLog("Skipping test about validating columnstore index specifications since the" +
-              " columnstore index feature flag is not enabled.");
-    return;
-}
-
 const kCollectionName = "columnstore_validindex";
 const coll = db.getCollection(kCollectionName);
 
diff --git a/jstests/core/hidden_index.js b/jstests/core/hidden_index.js
index 3eafa3968e7..959310ba6c1 100644
--- a/jstests/core/hidden_index.js
+++ b/jstests/core/hidden_index.js
@@ -6,7 +6,6 @@
  *   # CollMod is not retryable.
  *   requires_non_retryable_commands,
  *   uses_column_store_index,
- *   # Columnstore indexes are new in 6.2.
  *   requires_fcv_62,
  * ]
  */
diff --git a/jstests/core/projection_semantics.js b/jstests/core/projection_semantics.js
index f9e289048fd..0ce019885b5 100644
--- a/jstests/core/projection_semantics.js
+++ b/jstests/core/projection_semantics.js
@@ -10,16 +10,15 @@
  *   # We could potentially need to resume an index build in the event of a stepdown, which is not
  *   # yet implemented.
  *   does_not_support_stepdowns,
- *   # Columnstore indexes are incompatible with clustered collections.
- *   incompatible_with_clustered_collection,
+ *   uses_column_store_index,
  * ]
  */
 (function() {
 "use strict";
 
 load("jstests/libs/sbe_util.js");  // For checkSBEEnabled.
-const columnstoreEnabled =
-    checkSBEEnabled(db, ["featureFlagColumnstoreIndexes", "featureFlagSbeFull"]);
+const columnstoreEnabled = checkSBEEnabled(
+    db, ["featureFlagColumnstoreIndexes", "featureFlagSbeFull"], true /* checkAllNodes */);
 
 const coll = db.projection_semantics;
 coll.drop();