check the index range first before we go into the object on a query -- so we don't hit disk unnecessarily

fix index4.js test
check on index creation that index key pattern is ok

1 files changed, 5 insertions, 2 deletions

diff --git a/db/dbhelpers.cpp b/db/dbhelpers.cpp
index 8a1996f2025..822d6d77ff0 100644
--- a/db/dbhelpers.cpp
+++ b/db/dbhelpers.cpp
@@ -60,16 +60,19 @@ namespace mongo {
             c = DataFileMgr::findAll(ns);
         }
 
+        if( !c->ok() ) 
+            return false;
+
         JSMatcher matcher(query, c->indexKeyPattern());
 
-        while ( c->ok() ) {
+        do {
             BSONObj js = c->current();
             if( matcher.matches(js) ) { 
                 result = js;
                 return true;
             }
             c->advance();
-        }
+        } while( c->ok() );
 
         return false;
     }