SERVER-13084: more IndexDeails culling

1 files changed, 28 insertions, 2 deletions

diff --git a/src/mongo/db/structure/catalog/namespace_details.cpp b/src/mongo/db/structure/catalog/namespace_details.cpp
index 5d7df82db80..26051d41585 100644
--- a/src/mongo/db/structure/catalog/namespace_details.cpp
+++ b/src/mongo/db/structure/catalog/namespace_details.cpp
@@ -474,7 +474,33 @@ namespace mongo {
         return e->details[i];
     }
 
-    NamespaceDetails::IndexIterator::IndexIterator(NamespaceDetails *_d,
+
+    const IndexDetails& NamespaceDetails::idx(int idxNo, bool missingExpected) const {
+        if( idxNo < NIndexesBase ) {
+            const IndexDetails& id = _indexes[idxNo];
+            return id;
+        }
+        const Extra *e = extra();
+        if ( ! e ) {
+            if ( missingExpected )
+                throw MsgAssertionException( 17421 , "Missing Extra" );
+            massert(17422, "missing Extra", e);
+        }
+        int i = idxNo - NIndexesBase;
+        if( i >= NIndexesExtra ) {
+            e = e->next(this);
+            if ( ! e ) {
+                if ( missingExpected )
+                    throw MsgAssertionException( 17423 , "missing extra" );
+                massert(17424, "missing Extra", e);
+            }
+            i -= NIndexesExtra;
+        }
+        return e->details[i];
+    }
+
+
+    NamespaceDetails::IndexIterator::IndexIterator(const NamespaceDetails *_d,
                                                    bool includeBackgroundInProgress) {
         d = _d;
         i = 0;
@@ -724,7 +750,7 @@ namespace mongo {
     }
 
     int NamespaceDetails::_catalogFindIndexByName(const StringData& name,
-                                                  bool includeBackgroundInProgress) {
+                                                  bool includeBackgroundInProgress) const {
         IndexIterator i = ii(includeBackgroundInProgress);
         while( i.more() ) {
             if ( name == i.next().info.obj().getStringField("name") )