diff options
author | Ian Whalen <ian.whalen@gmail.com> | 2016-04-12 11:19:52 -0400 |
---|---|---|
committer | Ian Whalen <ian.whalen@gmail.com> | 2016-04-12 11:19:52 -0400 |
commit | 574a4910e189536215d3e3ab3c206dd44f1d699d (patch) | |
tree | 2fbbb702a16418f6917c7c1b1d2d687d227db593 /jstests/core | |
parent | 89a3de326d0e6a999149e7eca5fbab5c77f559b6 (diff) | |
download | mongo-574a4910e189536215d3e3ab3c206dd44f1d699d.tar.gz |
Revert "SERVER-22588 make validate command work in a sharded collection"
This reverts commit 3caa06819ab544bf9e88f4413c363a6439fe1998.
Diffstat (limited to 'jstests/core')
-rw-r--r-- | jstests/core/apitest_dbcollection.js | 4 | ||||
-rw-r--r-- | jstests/core/index_partial_create_drop.js | 5 | ||||
-rw-r--r-- | jstests/core/index_partial_write_ops.js | 5 |
3 files changed, 5 insertions, 9 deletions
diff --git a/jstests/core/apitest_dbcollection.js b/jstests/core/apitest_dbcollection.js index 8f0129319f7..d542ad6d7e1 100644 --- a/jstests/core/apitest_dbcollection.js +++ b/jstests/core/apitest_dbcollection.js @@ -42,9 +42,7 @@ for (i = 0; i < 100; i++) { (function() { var validateResult = assert.commandWorked(db.getCollection("test_db").validate()); // Extract validation results from mongos output if running in a sharded context. - var isShardedNS = validateResult.hasOwnProperty('raw'); - - if (isShardedNS) { + if (jsTest.isMongos(db.getMongo())) { // Sample mongos format: // { // raw: { diff --git a/jstests/core/index_partial_create_drop.js b/jstests/core/index_partial_create_drop.js index 483dc26f5e5..34693ec9ae9 100644 --- a/jstests/core/index_partial_create_drop.js +++ b/jstests/core/index_partial_create_drop.js @@ -2,14 +2,13 @@ (function() { "use strict"; + var isMongos = (db.runCommand("isMaster").msg === "isdbgrid"); var coll = db.index_partial_create_drop; var getNumKeys = function(idxName) { var res = assert.commandWorked(coll.validate(true)); var kpi; - - var isShardedNS = res.hasOwnProperty('raw'); - if (isShardedNS) { + if (isMongos) { kpi = res.raw[Object.getOwnPropertyNames(res.raw)[0]].keysPerIndex; } else { kpi = res.keysPerIndex; diff --git a/jstests/core/index_partial_write_ops.js b/jstests/core/index_partial_write_ops.js index 2653a2edf00..b962347a26d 100644 --- a/jstests/core/index_partial_write_ops.js +++ b/jstests/core/index_partial_write_ops.js @@ -2,14 +2,13 @@ (function() { "use strict"; + var isMongos = (db.runCommand("isMaster").msg === "isdbgrid"); var coll = db.index_partial_write_ops; var getNumKeys = function(idxName) { var res = assert.commandWorked(coll.validate(true)); var kpi; - - var isShardedNS = res.hasOwnProperty('raw'); - if (isShardedNS) { + if (isMongos) { kpi = res.raw[Object.getOwnPropertyNames(res.raw)[0]].keysPerIndex; } else { kpi = res.keysPerIndex; |