diff options
author | Mihai Andrei <mihai.andrei@10gen.com> | 2022-06-21 15:24:26 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-21 16:40:08 +0000 |
commit | afc52bea57c8edb8769efa67c01ebbde5a87f50d (patch) | |
tree | 78c08e81653302171fa6b112699e106b28073248 /jstests | |
parent | 14e4a3f0521a6a7c1d65b549c013a9cd1c87bfed (diff) | |
download | mongo-afc52bea57c8edb8769efa67c01ebbde5a87f50d.tar.gz |
SERVER-67092 Delete 'featureFlagSBEGroupPushdown' and 'featureFlagSBELookupPushdown'
Diffstat (limited to 'jstests')
23 files changed, 42 insertions, 115 deletions
diff --git a/jstests/aggregation/optimize_away_pipeline.js b/jstests/aggregation/optimize_away_pipeline.js index cd5ba0a5258..a4235abc185 100644 --- a/jstests/aggregation/optimize_away_pipeline.js +++ b/jstests/aggregation/optimize_away_pipeline.js @@ -137,7 +137,7 @@ function testGetMore({command = null, expectedResult = null} = {}) { assert.sameMembers(documents, expectedResult); } -const groupPushdownEnabled = checkSBEEnabled(db, ["featureFlagSBEGroupPushdown"]); +const groupPushdownEnabled = checkSBEEnabled(db); // Calls 'assertPushdownEnabled' if groupPushdownEnabled is 'true'. Otherwise, it calls // 'assertPushdownDisabled'. diff --git a/jstests/aggregation/sources/lookup/lookup_equijoin_semantics_hj.js b/jstests/aggregation/sources/lookup/lookup_equijoin_semantics_hj.js index 3d5b0c73248..df26f4b6ffa 100644 --- a/jstests/aggregation/sources/lookup/lookup_equijoin_semantics_hj.js +++ b/jstests/aggregation/sources/lookup/lookup_equijoin_semantics_hj.js @@ -8,7 +8,7 @@ load("jstests/libs/fixture_helpers.js"); // For isSharded. load("jstests/libs/sbe_util.js"); // For checkSBEEnabled. load("jstests/aggregation/sources/lookup/lookup_equijoin_semantics_lib.js"); // For runTests. -if (!checkSBEEnabled(db, ["featureFlagSBELookupPushdown"])) { +if (!checkSBEEnabled(db)) { jsTestLog("Skipping the test because it only applies to $lookup in SBE"); return; } diff --git a/jstests/aggregation/sources/lookup/lookup_equijoin_semantics_lib.js b/jstests/aggregation/sources/lookup/lookup_equijoin_semantics_lib.js index 4710a162cdb..d6923cf5e79 100644 --- a/jstests/aggregation/sources/lookup/lookup_equijoin_semantics_lib.js +++ b/jstests/aggregation/sources/lookup/lookup_equijoin_semantics_lib.js @@ -49,7 +49,7 @@ function setupCollections(localRecords, foreignRecords, foreignField) { */ function checkJoinConfiguration(explain) { const eqLookupNodes = getAggPlanStages(explain, "EQ_LOOKUP"); - if (checkSBEEnabled(db, ["featureFlagSBELookupPushdown"])) { + if (checkSBEEnabled(db)) { if (eqLookupNodes.length > 0) { // The $lookup stage has been lowered. Check that it's using the expected join strategy. assert.eq(currentJoinAlgorithm.strategy, eqLookupNodes[0].strategy, "Join strategy"); @@ -258,7 +258,7 @@ function runTests() { {_id: 11, a: [[null, 1], 2]}, ]; - if (checkSBEEnabled(db, ["featureFlagSBELookupPushdown"])) { + if (checkSBEEnabled(db)) { // When lowered to SBE, "undefined" should only match "undefined". runTest_SingleForeignRecord({ testDescription: "Undefined in foreign, top-level field in local", diff --git a/jstests/aggregation/sources/lookup/lookup_query_stats.js b/jstests/aggregation/sources/lookup/lookup_query_stats.js index 77731d1df84..74e14964e5d 100644 --- a/jstests/aggregation/sources/lookup/lookup_query_stats.js +++ b/jstests/aggregation/sources/lookup/lookup_query_stats.js @@ -21,9 +21,8 @@ load("jstests/libs/sbe_util.js"); // For checkSBEEnabled. load("jstests/libs/sbe_explain_helpers.js"); // For getSbePlanStages and // getQueryInfoAtTopLevelOrFirstStage. -const isSBELookupEnabled = checkSBEEnabled(db, ["featureFlagSBELookupPushdown"]); -const isSBELookupNLJEnabled = - checkSBEEnabled(db, ["featureFlagSBELookupPushdown", "featureFlagSbeFull"]); +const isSBELookupEnabled = checkSBEEnabled(db); +const isSBELookupNLJEnabled = checkSBEEnabled(db, ["featureFlagSbeFull"]); const testDB = db.getSiblingDB("lookup_query_stats"); testDB.dropDatabase(); diff --git a/jstests/aggregation/sources/lookup/profile_lookup.js b/jstests/aggregation/sources/lookup/profile_lookup.js index fdd201d5521..fcfe48fa5cb 100644 --- a/jstests/aggregation/sources/lookup/profile_lookup.js +++ b/jstests/aggregation/sources/lookup/profile_lookup.js @@ -41,21 +41,13 @@ const actualCount = newTop.totals[foreignColl.getFullName()].commands.count - oldTop.totals[foreignColl.getFullName()].commands.count; // Compute the expected count as follows: -// 1) If the feature flag is enabled, add one to the count. This is because we will take a lock -// over 'foreignColl' and, even if we don't push down $lookup into SBE, this will still -// increment the top counter for 'foreignColl' by one. -// 2) If $lookup is NOT pushed down into SBE, then we increment the count by three. This is -// because when executing $lookup in the classic engine, we will add one entry to top for the -// foreign collection for each document in the local collection (of which there are three). -let expectedCount = 0; -const getFeatureFlagSBELookupPushdown = - db.adminCommand({getParameter: 1, featureFlagSBELookupPushdown: 1}); -const isSBELookupPushdownEnabled = - getFeatureFlagSBELookupPushdown.hasOwnProperty("featureFlagSBELookupPushdown") && - getFeatureFlagSBELookupPushdown["featureFlagSBELookupPushdown"]["value"]; -if (isSBELookupPushdownEnabled) { - expectedCount++; -} +// 1) We expect the count to be at least one. This is because we will take a lock over 'foreignColl' +// and, even if we don't push down $lookup into SBE, this will still increment the top counter for +// 'foreignColl' by one. +// 2) If $lookup is NOT pushed down into SBE, then we increment the count by three. This is because +// when executing $lookup in the classic engine, we will add one entry to top for the foreign +// collection for each document in the local collection (of which there are three). +let expectedCount = 1; const eqLookupNodes = getAggPlanStages(localColl.explain().aggregate(pipeline), "EQ_LOOKUP"); if (eqLookupNodes.length === 0) { expectedCount += 3; diff --git a/jstests/aggregation/sources/project/remove_redundant_projects.js b/jstests/aggregation/sources/project/remove_redundant_projects.js index fe31fade134..512efdd2546 100644 --- a/jstests/aggregation/sources/project/remove_redundant_projects.js +++ b/jstests/aggregation/sources/project/remove_redundant_projects.js @@ -18,7 +18,7 @@ assert.commandWorked(coll.insert({_id: {a: 1, b: 1}, a: 1, c: {d: 1}, e: ['elem1 let indexSpec = {a: 1, 'c.d': 1, 'e.0': 1}; -const groupPushdownEnabled = checkSBEEnabled(db, ["featureFlagSBEGroupPushdown"]); +const groupPushdownEnabled = checkSBEEnabled(db); /** * Helper to test that for a given pipeline, the same results are returned whether or not an diff --git a/jstests/aggregation/sources/unionWith/unionWith_explain.js b/jstests/aggregation/sources/unionWith/unionWith_explain.js index 60d6a7ae4a4..a1db4d975e7 100644 --- a/jstests/aggregation/sources/unionWith/unionWith_explain.js +++ b/jstests/aggregation/sources/unionWith/unionWith_explain.js @@ -13,8 +13,6 @@ load("jstests/libs/fixture_helpers.js"); // For FixtureHelpers. load("jstests/libs/analyze_plan.js"); // For getAggPlanStage. load("jstests/libs/sbe_util.js"); // For checkSBEEnabled. -const groupPushdownEnabled = checkSBEEnabled(db, ["featureFlagSBEGroupPushdown"]); - const testDB = db.getSiblingDB(jsTestName()); const collA = testDB.A; collA.drop(); diff --git a/jstests/aggregation/spill_to_disk.js b/jstests/aggregation/spill_to_disk.js index e89a1a8ef31..df33065ea1f 100644 --- a/jstests/aggregation/spill_to_disk.js +++ b/jstests/aggregation/spill_to_disk.js @@ -27,7 +27,7 @@ const sharded = FixtureHelpers.isSharded(coll); const memoryLimitMB = sharded ? 200 : 100; -const isSBELookupEnabled = checkSBEEnabled(db, ["featureFlagSBELookupPushdown"]); +const isSBELookupEnabled = checkSBEEnabled(db); const bigStr = Array(1024 * 1024 + 1).toString(); // 1MB of ',' for (let i = 0; i < memoryLimitMB + 1; i++) diff --git a/jstests/concurrency/fsm_workloads/agg_lookup.js b/jstests/concurrency/fsm_workloads/agg_lookup.js index 9395c503d3c..2b78703b96c 100644 --- a/jstests/concurrency/fsm_workloads/agg_lookup.js +++ b/jstests/concurrency/fsm_workloads/agg_lookup.js @@ -70,12 +70,8 @@ var $config = (function() { function setup(db, collName, cluster) { // Do not run the rest of the tests if the foreign collection is implicitly sharded but the // flag to allow $lookup into a sharded collection is disabled. - const getParam = db.adminCommand({ - getParameter: 1, - featureFlagShardedLookup: 1, - featureFlagSBELookupPushdown: 1, - internalQueryForceClassicEngine: 1 - }); + const getParam = db.adminCommand( + {getParameter: 1, featureFlagShardedLookup: 1, internalQueryForceClassicEngine: 1}); const isShardedLookupEnabled = getParam.hasOwnProperty("featureFlagShardedLookup") && getParam.featureFlagShardedLookup.value; if (FixtureHelpers.isSharded(db[collName]) && !isShardedLookupEnabled) { @@ -96,9 +92,8 @@ var $config = (function() { assertWhenOwnColl.eq(this.numDocs, res.nInserted); assertWhenOwnColl.eq(this.numDocs, db[collName].find().itcount()); - const isLookupPushdownEnabled = getParam.hasOwnProperty("featureFlagSBELookupPushdown") && + const isLookupPushdownEnabled = getParam.hasOwnProperty("internalQueryForceClassicEngine") && - getParam.featureFlagSBELookupPushdown.value && !getParam.internalQueryForceClassicEngine.value; this.allowDiskUse = true; diff --git a/jstests/core/index_stats.js b/jstests/core/index_stats.js index 7e88fec9c83..cae76c1ec28 100644 --- a/jstests/core/index_stats.js +++ b/jstests/core/index_stats.js @@ -235,7 +235,7 @@ assert.eq(2, ]) .itcount()); assert.eq(1, getUsageCount("_id_", col), "Expected aggregation to use _id index"); -if (!checkSBEEnabled(db, ["featureFlagSBELookupPushdown"])) { +if (!checkSBEEnabled(db)) { assert.eq(2, getUsageCount("_id_", foreignCollection), "Expected each lookup to be tracked as an index use"); @@ -273,7 +273,7 @@ const pipeline = [ ]; assert.eq(2, col.aggregate(pipeline).itcount()); assert.eq(1, getUsageCount("_id_", col), "Expected aggregation to use _id index"); -if (!checkSBEEnabled(db, ["featureFlagSBELookupPushdown"])) { +if (!checkSBEEnabled(db)) { assert.eq(2, getUsageCount("_id_", foreignCollection), "Expected each lookup to be tracked as an index use"); diff --git a/jstests/noPassthrough/agg_group.js b/jstests/noPassthrough/agg_group.js index 234237baf72..6d186946ae9 100644 --- a/jstests/noPassthrough/agg_group.js +++ b/jstests/noPassthrough/agg_group.js @@ -18,24 +18,13 @@ load("jstests/libs/analyze_plan.js"); -// As of now, $group pushdown to SBE feature is not enabled by default. So, enables it with a -// minimal configuration of a sharded cluster. -// -// TODO Remove {setParameter: "featureFlagSBEGroupPushdown=true"} when the feature is enabled by -// default. -const st = new ShardingTest( - {config: 1, shards: 1, shardOptions: {setParameter: "featureFlagSBEGroupPushdown=true"}}); +const st = new ShardingTest({config: 1, shards: 1}); // This database name can provide multiple similar test cases with a good separate namespace and // each test case may create a separate collection for its own dataset. const db = st.getDB(jsTestName()); const dbAtShard = st.shard0.getDB(jsTestName()); -// Makes sure that $group pushdown to SBE feature is enabled. -assert( - assert.commandWorked(dbAtShard.adminCommand({getParameter: 1, featureFlagSBEGroupPushdown: 1})) - .featureFlagSBEGroupPushdown.value); - // Makes sure that the test db is sharded and the data is stored into the only shard. assert.commandWorked(st.s0.adminCommand({enableSharding: db.getName()})); st.ensurePrimaryShard(db.getName(), st.shard0.shardName); diff --git a/jstests/noPassthrough/check_sbe_lookup_feature.js b/jstests/noPassthrough/check_sbe_lookup_feature.js deleted file mode 100644 index 9841522c806..00000000000 --- a/jstests/noPassthrough/check_sbe_lookup_feature.js +++ /dev/null @@ -1,15 +0,0 @@ -(function() { -'use strict'; - -const conn = MongoRunner.runMongod(); - -const res = assert.commandWorked( - conn.getDB("admin").adminCommand({getParameter: 1, featureFlagSBELookupPushdown: 1}), - "featureFlagSBELookupPushdown must have been turned on by default since 6.0"); -assert(res.hasOwnProperty("featureFlagSBELookupPushdown"), res); -const featureFlag = res.featureFlagSBELookupPushdown; -assert(featureFlag.hasOwnProperty("value") && featureFlag.value, res); -assert(featureFlag.hasOwnProperty("version") && featureFlag.version == "6.0", res); - -MongoRunner.stopMongod(conn); -}()); diff --git a/jstests/noPassthrough/explain_group_stage_exec_stats.js b/jstests/noPassthrough/explain_group_stage_exec_stats.js index 2a171485424..a1cef128ace 100644 --- a/jstests/noPassthrough/explain_group_stage_exec_stats.js +++ b/jstests/noPassthrough/explain_group_stage_exec_stats.js @@ -13,7 +13,7 @@ const testDB = conn.getDB('test'); const coll = testDB.explain_group_stage_exec_stats; coll.drop(); -if (checkSBEEnabled(testDB, ["featureFlagSBEGroupPushdown"])) { +if (checkSBEEnabled(testDB)) { // When the SBE $group pushdown feature is enabled, a $group alone is pushed down and the // memory usage tracking isn't on a per-accumulator basis so this test is exercising // spilling behavior of the classic DocumentSourceGroup stage. diff --git a/jstests/noPassthrough/lookup_max_intermediate_size.js b/jstests/noPassthrough/lookup_max_intermediate_size.js index f2d5704c7da..939bfa93a57 100644 --- a/jstests/noPassthrough/lookup_max_intermediate_size.js +++ b/jstests/noPassthrough/lookup_max_intermediate_size.js @@ -93,9 +93,7 @@ const db = standalone.getDB("test"); db.lookUp.drop(); const expectedErrorCode = - (checkSBEEnabled(db, ["featureFlagSBELookupPushdown", "featureFlagSbeFull"])) - ? ErrorCodes.ExceededMemoryLimit - : 4568; + (checkSBEEnabled(db, ["featureFlagSbeFull"])) ? ErrorCodes.ExceededMemoryLimit : 4568; runTest(db.lookUp, db.from, expectedErrorCode); MongoRunner.stopMongod(standalone); diff --git a/jstests/noPassthrough/lookup_pushdown.js b/jstests/noPassthrough/lookup_pushdown.js index 9497e9d135c..09ad334a16c 100644 --- a/jstests/noPassthrough/lookup_pushdown.js +++ b/jstests/noPassthrough/lookup_pushdown.js @@ -18,10 +18,8 @@ const JoinAlgorithm = { }; // Standalone cases. -const conn = MongoRunner.runMongod({ - setParameter: - {featureFlagSBELookupPushdown: true, featureFlagSbeFull: true, allowDiskUseByDefault: false} -}); +const conn = + MongoRunner.runMongod({setParameter: {featureFlagSbeFull: true, allowDiskUseByDefault: false}}); assert.neq(null, conn, "mongod was unable to start up"); const name = "lookup_pushdown"; const foreignCollName = "foreign_lookup_pushdown"; @@ -118,7 +116,7 @@ function runTest(coll, } let db = conn.getDB(name); -if (!checkSBEEnabled(db, ["featureFlagSBELookupPushdown"])) { +if (!checkSBEEnabled(db)) { jsTestLog("Skipping test because either the sbe lookup pushdown feature flag is disabled or" + " sbe itself is disabled"); MongoRunner.stopMongod(conn); @@ -742,8 +740,7 @@ MongoRunner.stopMongod(conn); // Verify that pipeline stages get pushed down according to the subset of SBE that is enabled. (function verifyPushdownLogicSbePartiallyEnabled() { - const conn = MongoRunner.runMongod( - {setParameter: {featureFlagSBELookupPushdown: true, allowDiskUseByDefault: false}}); + const conn = MongoRunner.runMongod({setParameter: {allowDiskUseByDefault: false}}); const db = conn.getDB(name); if (checkSBEEnabled(db, ["featureFlagSbeFull"])) { jsTestLog("Skipping test case because SBE is fully enabled, but this test case assumes" + @@ -826,8 +823,7 @@ MongoRunner.stopMongod(conn); (function testHashJoinQueryKnobs() { // Create a new scope and start a new mongod so that the mongod-wide global state changes do not // affect subsequent tests if any. - const conn = MongoRunner.runMongod( - {setParameter: {featureFlagSBELookupPushdown: true, featureFlagSbeFull: true}}); + const conn = MongoRunner.runMongod({setParameter: {featureFlagSbeFull: true}}); const db = conn.getDB(name); const lcoll = db.query_knobs_local; const fcoll = db.query_knobs_foreign; @@ -1002,15 +998,7 @@ MongoRunner.stopMongod(conn); const st = new ShardingTest({ shards: 2, mongos: 1, - other: { - shardOptions: { - setParameter: { - featureFlagSBELookupPushdown: true, - featureFlagSbeFull: true, - allowDiskUseByDefault: false - } - } - } + other: {shardOptions: {setParameter: {featureFlagSbeFull: true, allowDiskUseByDefault: false}}} }); db = st.s.getDB(name); diff --git a/jstests/noPassthrough/lookup_with_limit_sharded.js b/jstests/noPassthrough/lookup_with_limit_sharded.js index cb4d6953d1e..6846db7f0f8 100644 --- a/jstests/noPassthrough/lookup_with_limit_sharded.js +++ b/jstests/noPassthrough/lookup_with_limit_sharded.js @@ -19,7 +19,7 @@ load("jstests/libs/sbe_util.js"); // For checkSBEEnabled. const st = new ShardingTest({shards: 2, config: 1}); const db = st.s.getDB("test"); -if (!checkSBEEnabled(db, ["featureFlagSBELookupPushdown"])) { +if (!checkSBEEnabled(db)) { jsTestLog("Skipping test because SBE $lookup is not enabled."); st.stop(); return; diff --git a/jstests/noPassthrough/plan_cache_replan_group_lookup.js b/jstests/noPassthrough/plan_cache_replan_group_lookup.js index 2f749227316..e6b2dd13abd 100644 --- a/jstests/noPassthrough/plan_cache_replan_group_lookup.js +++ b/jstests/noPassthrough/plan_cache_replan_group_lookup.js @@ -163,9 +163,8 @@ function dropLookupForeignColl() { assert(db[foreignCollName].drop()); } -const lookupPushdownEnabled = checkSBEEnabled(db, ["featureFlagSBELookupPushdown"]); -const lookupPushdownNLJEnabled = - checkSBEEnabled(db, ["featureFlagSBELookupPushdown", "featureFlagSbeFull"]); +const lookupPushdownEnabled = checkSBEEnabled(db); +const lookupPushdownNLJEnabled = checkSBEEnabled(db, ["featureFlagSbeFull"]); function verifyCorrectLookupAlgorithmUsed(targetJoinAlgorithm, pipeline, aggOptions = {}) { if (!lookupPushdownEnabled) { return; @@ -407,7 +406,7 @@ coll.getPlanCache().clear(); // Verify that $group gets pushed down, provided that SBE is enabled. let groupNodes; -if (checkSBEEnabled(db, ["featureFlagSBEGroupPushdown"])) { +if (checkSBEEnabled(db)) { explain = coll.explain().aggregate(avoidReplanGroupPipeline); let groupNodes = getAggPlanStages(explain, "GROUP"); assert.eq(groupNodes.length, 1); diff --git a/jstests/noPassthrough/profile_operation_metrics.js b/jstests/noPassthrough/profile_operation_metrics.js index e94a3933bfa..3dd372cad65 100644 --- a/jstests/noPassthrough/profile_operation_metrics.js +++ b/jstests/noPassthrough/profile_operation_metrics.js @@ -24,10 +24,7 @@ const isGroupPushdownEnabled = (db) => { const internalQueryForceClassicEngine = assert.commandWorked(db.adminCommand({getParameter: 1, internalQueryForceClassicEngine: 1})) .internalQueryForceClassicEngine; - const featureFlagSBEGroupPushdown = - assert.commandWorked(db.adminCommand({getParameter: 1, featureFlagSBEGroupPushdown: 1})) - .featureFlagSBEGroupPushdown.value; - return !internalQueryForceClassicEngine && featureFlagSBEGroupPushdown; + return !internalQueryForceClassicEngine; }; const assertMetricsExist = (profilerEntry) => { diff --git a/jstests/noPassthrough/spill_to_disk_secondary_read.js b/jstests/noPassthrough/spill_to_disk_secondary_read.js index f4c2ef20104..242620b987b 100644 --- a/jstests/noPassthrough/spill_to_disk_secondary_read.js +++ b/jstests/noPassthrough/spill_to_disk_secondary_read.js @@ -35,7 +35,7 @@ const readColl = secondary.getDB("test").foo; * Test spilling of $group, when explicitly run on a secondary. */ (function testGroupSpilling() { - if (!checkSBEEnabled(secondary.getDB("test"), ["featureFlagSBEGroupPushdown"])) { + if (!checkSBEEnabled(secondary.getDB("test"))) { jsTestLog("Skipping test for HashAgg stage: $group lowering into SBE isn't enabled"); return; } @@ -100,7 +100,7 @@ const readColl = secondary.getDB("test").foo; * Test spilling of $lookup when explicitly run on a secondary. */ (function testLookupSpillingInSbe() { - if (!checkSBEEnabled(secondary.getDB("test"), ["featureFlagSBELookupPushdown"])) { + if (!checkSBEEnabled(secondary.getDB("test"))) { jsTestLog("Skipping test for HashLookup stage: $lookup lowering into SBE isn't enabled"); return; } diff --git a/jstests/noPassthroughWithMongod/group_pushdown.js b/jstests/noPassthroughWithMongod/group_pushdown.js index a8b2df80620..8cf292ec3a9 100644 --- a/jstests/noPassthroughWithMongod/group_pushdown.js +++ b/jstests/noPassthroughWithMongod/group_pushdown.js @@ -7,7 +7,7 @@ load("jstests/libs/analyze_plan.js"); load("jstests/libs/sbe_util.js"); // For checkSBEEnabled. -if (!checkSBEEnabled(db, ["featureFlagSBEGroupPushdown"])) { +if (!checkSBEEnabled(db)) { jsTestLog("Skipping test because the sbe group pushdown feature flag is disabled"); return; } diff --git a/jstests/noPassthroughWithMongod/lookup_with_limit.js b/jstests/noPassthroughWithMongod/lookup_with_limit.js index 28dbb4f4702..ba5c3ae9529 100644 --- a/jstests/noPassthroughWithMongod/lookup_with_limit.js +++ b/jstests/noPassthroughWithMongod/lookup_with_limit.js @@ -7,7 +7,7 @@ load('jstests/libs/analyze_plan.js'); // For getWinningPlan(). load("jstests/libs/sbe_util.js"); // For checkSBEEnabled. -if (!checkSBEEnabled(db, ["featureFlagSBELookupPushdown"])) { +if (!checkSBEEnabled(db)) { jsTestLog("Skipping test because SBE $lookup is not enabled."); return; } diff --git a/jstests/sharding/query/lookup_graph_lookup_foreign_becomes_sharded.js b/jstests/sharding/query/lookup_graph_lookup_foreign_becomes_sharded.js index c3924654a74..ae525d14c17 100644 --- a/jstests/sharding/query/lookup_graph_lookup_foreign_becomes_sharded.js +++ b/jstests/sharding/query/lookup_graph_lookup_foreign_becomes_sharded.js @@ -116,12 +116,10 @@ const isShardedLookupEnabled = getShardedLookupParam.hasOwnProperty("featureFlag let res = st.getPrimaryShard(jsTestName()).getDB("admin").adminCommand({ getParameter: 1, - featureFlagSBELookupPushdown: 1, internalQueryForceClassicEngine: 1 }); -let isSBELookupEnabled = res.ok && res.hasOwnProperty("featureFlagSBELookupPushdown") && - res.hasOwnProperty("internalQueryForceClassicEngine") && - res.featureFlagSBELookupPushdown.value && !res.internalQueryForceClassicEngine; +let isSBELookupEnabled = res.ok && res.hasOwnProperty("internalQueryForceClassicEngine") && + !res.internalQueryForceClassicEngine; // Now run a getMore for each of the test cases. The collection has become sharded mid-iteration, so // we should observe the error code associated with the test case. @@ -198,13 +196,6 @@ assert.commandWorked(shard0.getPrimary().adminCommand({fsync: 1})); // both the source and foreign collections. shard0.restart(shard0.getPrimary()); -// Refreshes the SBE lookup feature availability just in case that a different version of mongod -// is running after restart. -res = shard0.getPrimary().getDB("admin").adminCommand( - {getParameter: 1, featureFlagSBELookupPushdown: 1}); -isSBELookupEnabled = res.ok && res.hasOwnProperty("featureFlagSBELookupPushdown") && - res.featureFlagSBELookupPushdown.value; - // Enable profiling on shard0 to capture stale shard version exceptions. const primaryDB = shard0.getPrimary().getDB(jsTestName()); assert.commandWorked(primaryDB.setProfilingLevel(2)); diff --git a/jstests/sharding/query/lookup_unionWith_subpipeline_local_read.js b/jstests/sharding/query/lookup_unionWith_subpipeline_local_read.js index 894e094bc4c..c5018e52c6a 100644 --- a/jstests/sharding/query/lookup_unionWith_subpipeline_local_read.js +++ b/jstests/sharding/query/lookup_unionWith_subpipeline_local_read.js @@ -14,7 +14,6 @@ load('jstests/libs/profiler.js'); // For various profiler helpers. load('jstests/aggregation/extras/utils.js'); // For arrayEq() load("jstests/libs/fail_point_util.js"); // for configureFailPoint. load("jstests/libs/log.js"); // For findMatchingLogLines. -load("jstests/libs/feature_flag_util.js"); // For isEnabled. const st = new ShardingTest({name: jsTestName(), mongos: 1, shards: 2, rs: {nodes: 2}}); @@ -510,15 +509,12 @@ assertAggResultAndRouting(pipeline, expectedRes, {comment: "lookup_foreign_does_ // collection and needs to target shards to properly resolve it. Then, it can use the local // read path for each subpipeline query. subPipelineLocal: [4, 0], - // If the $lookup is pushed down, we will try to take a lock on the foreign collection to check + // Because $lookup is pushed down, we will try to take a lock on the foreign collection to check // foreign collection's sharding state. Given that the stale shard version is resolved earlier // and we've figured out that the foreign collection is unsharded, we no longer need to target a // shard and instead can read locally. As such, we will not generate an entry in the profiler // for querying the foreign collection. - subPipelineRemote: - FeatureFlagUtil.isEnabled(st.configRS.getPrimary().getDB(dbName), "SBELookupPushdown") - ? [0, 0] - : [1, 0], + subPipelineRemote: [0, 0], }); // |