SERVER-12550: use Context instead of ReadContext and don't check shard version

              this happens later

3 files changed, 7 insertions, 29 deletions

diff --git a/src/mongo/db/catalog/index_catalog.cpp b/src/mongo/db/catalog/index_catalog.cpp
index 98af09d95eb..c2561597700 100644
--- a/src/mongo/db/catalog/index_catalog.cpp
+++ b/src/mongo/db/catalog/index_catalog.cpp
@@ -121,6 +121,9 @@ namespace mongo {
         }
 
         _magic = INDEX_CATALOG_INIT;
+
+        GeneratorHolder::getInstance()->reset( _collection );
+
         return Status::OK();
     }
 
diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp
index 48743cc8090..25aa02746f1 100644
--- a/src/mongo/db/commands/write_commands/batch_executor.cpp
+++ b/src/mongo/db/commands/write_commands/batch_executor.cpp
@@ -777,25 +777,9 @@ namespace mongo {
                 insertDoc = normalInsert.getValue();
 
             pregen->push_back( PregeneratedKeys() );
-            bool hasEntry = GeneratorHolder::getInstance()->prepare( request.getTargetingNS(),
-                                                                     insertDoc,
-                                                                     &pregen->back() );
-
-            if ( !hasEntry && i == 0 ) {
-                string ns = request.getTargetingNS();
-                try {
-                    Client::ReadContext ctx(ns);
-                    Database* db = ctx.ctx().db();
-                    Collection * c = db->getCollection( ns );
-                    if ( c ) {
-                        GeneratorHolder::getInstance()->reset( c );
-                    }
-                }
-                catch ( DBException& e ) {
-                    log() << "normalizeInserts failde to pregen keys: " << e;
-                }
-            }
-
+            GeneratorHolder::getInstance()->prepare( request.getTargetingNS(),
+                                                     insertDoc,
+                                                     &pregen->back() );
         }
     }
 
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index a7451fd95a8..f5919f3b9ee 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -899,16 +899,7 @@ namespace mongo {
             if ( !fixed.getValue().isEmpty() )
                 multi[0] = fixed.getValue();
 
-            bool hasEntry = GeneratorHolder::getInstance()->prepare( ns, multi[0], &tempHack );
-            if ( !hasEntry ) {
-                // lets load!
-                Client::ReadContext ctx(ns);
-                Database* db = ctx.ctx().db();
-                Collection * c = db->getCollection( ns );
-                if ( c ) {
-                    GeneratorHolder::getInstance()->reset( c );
-                }
-            }
+            GeneratorHolder::getInstance()->prepare( ns, multi[0], &tempHack );
         }
 
         PageFaultRetryableSection s;