summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog
diff options
context:
space:
mode:
authorDavid Storch <david.storch@10gen.com>2014-07-22 15:50:23 -0400
committerDavid Storch <david.storch@10gen.com>2014-07-23 12:40:20 -0400
commit5e4f3fef24ca76b6a6516e7379b72ae3310029fd (patch)
tree52ef6dddd9ffd1eb4d832d4b224a70caefd5c220 /src/mongo/db/catalog
parent26aff1dcc9a45e72a91a206119c12cc280148175 (diff)
downloadmongo-5e4f3fef24ca76b6a6516e7379b72ae3310029fd.tar.gz
SERVER-14407 delete runner.h
Replaces Runner::RunnerState with PlanExecutor::ExecState.
Diffstat (limited to 'src/mongo/db/catalog')
-rw-r--r--src/mongo/db/catalog/index_catalog.cpp6
-rw-r--r--src/mongo/db/catalog/index_create.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/catalog/index_catalog.cpp b/src/mongo/db/catalog/index_catalog.cpp
index edb6219f607..a0587ef0c9d 100644
--- a/src/mongo/db/catalog/index_catalog.cpp
+++ b/src/mongo/db/catalog/index_catalog.cpp
@@ -227,8 +227,8 @@ namespace mongo {
db->getCollection(txn, db->_indexesName)));
BSONObj index;
- Runner::RunnerState state;
- while ( Runner::RUNNER_ADVANCED == (state = exec->getNext(&index, NULL)) ) {
+ PlanExecutor::ExecState state;
+ while ( PlanExecutor::ADVANCED == (state = exec->getNext(&index, NULL)) ) {
const BSONObj key = index.getObjectField("key");
const string plugin = IndexNames::findPluginName(key);
if ( IndexNames::existedBefore24(plugin) )
@@ -243,7 +243,7 @@ namespace mongo {
return Status( ErrorCodes::CannotCreateIndex, errmsg );
}
- if ( Runner::RUNNER_EOF != state ) {
+ if ( PlanExecutor::IS_EOF != state ) {
warning() << "Internal error while reading system.indexes collection";
}
diff --git a/src/mongo/db/catalog/index_create.cpp b/src/mongo/db/catalog/index_create.cpp
index 96bf25f1c94..b369b98ca61 100644
--- a/src/mongo/db/catalog/index_create.cpp
+++ b/src/mongo/db/catalog/index_create.cpp
@@ -114,7 +114,7 @@ namespace mongo {
BSONObj js;
DiskLoc loc;
- while (Runner::RUNNER_ADVANCED == exec->getNext(&js, &loc)) {
+ while (PlanExecutor::ADVANCED == exec->getNext(&js, &loc)) {
try {
if ( !dupsAllowed && dropDups ) {
LastError::Disabled led( lastError.get() );