From 87c9442cc30d4101693bb8ccb6fd4509aa048558 Mon Sep 17 00:00:00 2001
From: Charlie Swanson <charlie.swanson@mongodb.com>
Date: Thu, 11 Jan 2018 14:00:27 -0500
Subject: SERVER-31785 Use 2 shards in sharded jscore passthrough.

---
 jstests/concurrency/fsm_workloads/explain_count.js    |  6 +++---
 jstests/concurrency/fsm_workloads/explain_distinct.js |  6 +++---
 jstests/concurrency/fsm_workloads/explain_find.js     | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'jstests/concurrency')

diff --git a/jstests/concurrency/fsm_workloads/explain_count.js b/jstests/concurrency/fsm_workloads/explain_count.js
index 948a108ca10..f33673eba97 100644
--- a/jstests/concurrency/fsm_workloads/explain_count.js
+++ b/jstests/concurrency/fsm_workloads/explain_count.js
@@ -25,14 +25,14 @@ var $config = extendWorkload($config, function($config, $super) {
         explainBasicCount: function explainBasicCount(db, collName) {
             var res = db[collName].explain().count();
             assertAlways.commandWorked(res);
-            assertAlways(planHasStage(res.queryPlanner.winningPlan, 'COUNT'));
+            assertAlways(planHasStage(db, res.queryPlanner.winningPlan, 'COUNT'));
         },
         explainCountHint: function explainCountHint(db, collName) {
             assertWhenOwnColl(function() {
                 var res = db[collName].explain().find({i: this.nInserted / 2}).hint({i: 1}).count();
                 assertWhenOwnColl.commandWorked(res);
-                assertWhenOwnColl(planHasStage(res.queryPlanner.winningPlan, 'COUNT'));
-                assertWhenOwnColl(planHasStage(res.queryPlanner.winningPlan, 'COUNT_SCAN'));
+                assertWhenOwnColl(planHasStage(db, res.queryPlanner.winningPlan, 'COUNT'));
+                assertWhenOwnColl(planHasStage(db, res.queryPlanner.winningPlan, 'COUNT_SCAN'));
             });
         },
         explainCountNoSkipLimit: function explainCountNoSkipLimit(db, collName) {
diff --git a/jstests/concurrency/fsm_workloads/explain_distinct.js b/jstests/concurrency/fsm_workloads/explain_distinct.js
index 1c14254daed..2786a7f80ec 100644
--- a/jstests/concurrency/fsm_workloads/explain_distinct.js
+++ b/jstests/concurrency/fsm_workloads/explain_distinct.js
@@ -14,13 +14,13 @@ var $config = extendWorkload($config, function($config, $super) {
         explainBasicDistinct: function(db, collName) {
             var res = db[collName].explain().distinct('i');
             assertAlways.commandWorked(res);
-            assertAlways(planHasStage(res.queryPlanner.winningPlan, 'COLLSCAN'));
+            assertAlways(planHasStage(db, res.queryPlanner.winningPlan, 'COLLSCAN'));
         },
         explainDistinctIndex: function(db, collName) {
             var res = db[collName].explain().distinct('_id');
             assertAlways.commandWorked(res);
-            assertAlways(planHasStage(res.queryPlanner.winningPlan, 'PROJECTION'));
-            assertAlways(planHasStage(res.queryPlanner.winningPlan, 'DISTINCT_SCAN'));
+            assertAlways(planHasStage(db, res.queryPlanner.winningPlan, 'PROJECTION'));
+            assertAlways(planHasStage(db, res.queryPlanner.winningPlan, 'DISTINCT_SCAN'));
         }
     },
                                    $super.states);
diff --git a/jstests/concurrency/fsm_workloads/explain_find.js b/jstests/concurrency/fsm_workloads/explain_find.js
index e338b00e516..3798a426d38 100644
--- a/jstests/concurrency/fsm_workloads/explain_find.js
+++ b/jstests/concurrency/fsm_workloads/explain_find.js
@@ -16,7 +16,7 @@ var $config = extendWorkload($config, function($config, $super) {
         explainLimit: function explainLimit(db, collName) {
             var res = db[collName].find().limit(3).explain();
             assertAlways.commandWorked(res);
-            assertAlways(planHasStage(res.queryPlanner.winningPlan, 'LIMIT'));
+            assertAlways(planHasStage(db, res.queryPlanner.winningPlan, 'LIMIT'));
         },
         explainBatchSize: function explainBatchSize(db, collName) {
             var res = db[collName].find().batchSize(3).explain();
@@ -29,18 +29,18 @@ var $config = extendWorkload($config, function($config, $super) {
         explainSkip: function explainSkip(db, collName) {
             var res = db[collName].explain().find().skip(3).finish();
             assertAlways.commandWorked(res);
-            assertAlways(planHasStage(res.queryPlanner.winningPlan, 'SKIP'));
+            assertAlways(planHasStage(db, res.queryPlanner.winningPlan, 'SKIP'));
         },
         explainSort: function explainSort(db, collName) {
             var res = db[collName].find().sort({i: -1}).explain();
             assertAlways.commandWorked(res);
-            assertAlways(planHasStage(res.queryPlanner.winningPlan, 'SORT'));
+            assertAlways(planHasStage(db, res.queryPlanner.winningPlan, 'SORT'));
         },
         explainHint: function explainHint(db, collName) {
             assertWhenOwnColl(function() {
                 var res = db[collName].find().hint({j: 1}).explain();
                 assertWhenOwnColl.commandWorked(res);
-                assertWhenOwnColl(isIxscan(res.queryPlanner.winningPlan));
+                assertWhenOwnColl(isIxscan(db, res.queryPlanner.winningPlan));
             });
         },
         explainMaxTimeMS: function explainMaxTimeMS(db, collName) {
@@ -50,7 +50,7 @@ var $config = extendWorkload($config, function($config, $super) {
         explainSnapshot: function explainSnapshot(db, collName) {
             var res = db[collName].find().snapshot().explain();
             assertAlways.commandWorked(res);
-            assertWhenOwnColl(isIxscan(res.queryPlanner.winningPlan));
+            assertWhenOwnColl(isIxscan(db, res.queryPlanner.winningPlan));
         }
     },
                                    $super.states);
-- 
cgit v1.2.1