diff options
| author | Mathias Stearn <mathias@10gen.com> | 2014-05-19 18:06:16 -0400 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2014-05-20 19:02:25 -0400 |
| commit | e15c084245fcd1262c55b6c8bc7e0bc979d302ec (patch) | |
| tree | a8143eec819740b705a91915810fb88535f6e34b /src/mongo/db/catalog | |
| parent | 8fb62e7324a21e1fac6405753735ddaa33587cb3 (diff) | |
| download | mongo-e15c084245fcd1262c55b6c8bc7e0bc979d302ec.tar.gz | |
SERVER-13635 Kill BSONObjExternalSorter and use Sorter directly
Diffstat (limited to 'src/mongo/db/catalog')
| -rw-r--r-- | src/mongo/db/catalog/index_create.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mongo/db/catalog/index_create.cpp b/src/mongo/db/catalog/index_create.cpp index 71c0cfe44a5..b2b89d74722 100644 --- a/src/mongo/db/catalog/index_create.cpp +++ b/src/mongo/db/catalog/index_create.cpp @@ -37,7 +37,6 @@ #include "mongo/db/catalog/collection.h" #include "mongo/db/clientcursor.h" #include "mongo/db/curop.h" -#include "mongo/db/extsort.h" #include "mongo/db/kill_current_op.h" #include "mongo/db/pdfile_private.h" #include "mongo/db/query/internal_plans.h" @@ -232,8 +231,7 @@ namespace mongo { status.isOK() ); IndexAccessMethod* bulk = doInBackground ? - NULL : btreeState->accessMethod()->initiateBulk(txn, - collection->numRecords()); + NULL : btreeState->accessMethod()->initiateBulk(txn); scoped_ptr<IndexAccessMethod> bulkHolder(bulk); IndexAccessMethod* iam = bulk ? bulk : btreeState->accessMethod(); @@ -341,7 +339,7 @@ namespace mongo { if ( !status.isOK() ) return status; - state.bulk = state.real->initiateBulk(_txn, _collection->numRecords() ); + state.bulk = state.real->initiateBulk(_txn); _states.push_back( state ); } |