summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/executor_registry.cpp
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2014-10-11 21:23:32 -0400
committerEliot Horowitz <eliot@10gen.com>2014-10-11 23:26:50 -0400
commit81c227fe23f5487bd8c54bbb918e82c4aa3ac147 (patch)
tree8ebb311cb5e734d333aa0297e5697312c8f6479c /src/mongo/dbtests/executor_registry.cpp
parent00e695acb824bcf047b671c6649678056873804b (diff)
downloadmongo-81c227fe23f5487bd8c54bbb918e82c4aa3ac147.tar.gz
SERVER-13635: make capped dbtests more generic
Diffstat (limited to 'src/mongo/dbtests/executor_registry.cpp')
-rw-r--r--src/mongo/dbtests/executor_registry.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mongo/dbtests/executor_registry.cpp b/src/mongo/dbtests/executor_registry.cpp
index f018119f149..6ad15d20cbb 100644
--- a/src/mongo/dbtests/executor_registry.cpp
+++ b/src/mongo/dbtests/executor_registry.cpp
@@ -37,6 +37,7 @@
#include "mongo/db/dbdirectclient.h"
#include "mongo/db/exec/collection_scan.h"
#include "mongo/db/exec/plan_stage.h"
+#include "mongo/db/global_environment_experiment.h"
#include "mongo/db/json.h"
#include "mongo/db/matcher/expression_parser.h"
#include "mongo/db/operation_context_impl.h"
@@ -111,6 +112,10 @@ namespace ExecutorRegistry {
class ExecutorRegistryDiskLocInvalid : public ExecutorRegistryBase {
public:
void run() {
+ if ( supportsDocLocking() ) {
+ return;
+ }
+
auto_ptr<PlanExecutor> run(getCollscan());
BSONObj obj;