diff options
-rw-r--r-- | jstests/core/null_query_semantics.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jstests/core/null_query_semantics.js b/jstests/core/null_query_semantics.js index 34e605db283..cf4cc836412 100644 --- a/jstests/core/null_query_semantics.js +++ b/jstests/core/null_query_semantics.js @@ -1,4 +1,7 @@ // Tests the behavior of queries with a {$eq: null} or {$ne: null} predicate. +// @tags: [ +// uses_column_store_index, +// ] // (function() { "use strict"; @@ -6,6 +9,7 @@ load("jstests/aggregation/extras/utils.js"); // For 'resultsEq'. // For areAllCollectionsClustered. load("jstests/libs/clustered_collections/clustered_collection_util.js"); +load("jstests/libs/sbe_util.js"); // For checkSBEEnabled. function extractAValues(results) { return results.map(function(res) { @@ -701,9 +705,11 @@ const keyPatterns = [ {keyPattern: {"$**": 1}}, {keyPattern: {"a.$**": 1}} ]; + // Include Columnstore Index only if FF is enabled and collection is not clustered. -if (TestData.setParameters.hasOwnProperty("featureFlagColumnstoreIndexes") && - !ClusteredCollectionUtil.areAllCollectionsClustered(db.getMongo())) { +const columnstoreEnabled = checkSBEEnabled( + db, ["featureFlagColumnstoreIndexes", "featureFlagSbeFull"], true /* checkAllNodes */); +if (columnstoreEnabled && !ClusteredCollectionUtil.areAllCollectionsClustered(db.getMongo())) { keyPatterns.push({keyPattern: {"$**": "columnstore"}}); } |