some cleaning of userCreateNs

erh · erh · commit dc05a58dac1e · 2014-04-03T13:31:49.000-04:00
diff --git a/src/mongo/db/cloner.cpp b/src/mongo/db/cloner.cpp
@@ -314,9 +314,13 @@ namespace mongo {
         // config
         string temp = ctx.ctx().db()->name() + ".system.namespaces";
         BSONObj config = _conn->findOne(temp , BSON("name" << ns));
-        if (config["options"].isABSONObj())
-            if (!userCreateNS(ns.c_str(), config["options"].Obj(), errmsg, logForRepl, 0))
+        if (config["options"].isABSONObj()) {
+            Status status = userCreateNS(ns.c_str(), config["options"].Obj(), logForRepl, 0);
+            if ( !status.isOK() ) {
+                errmsg = status.toString();
                 return false;
+            }
+        }
 
         // main data
         copy(ctx.ctx(),
@@ -464,10 +468,8 @@ namespace mongo {
             string to_name = todb + p;
 
             {
-                string err;
-                const char *toname = to_name.c_str();
                 /* we defer building id index for performance - building it in batch is much faster */
-                userCreateNS(toname, options, err, opts.logForRepl, false);
+                userCreateNS(to_name, options, opts.logForRepl, false);
             }
             LOG(1) << "\t\t cloning " << from_name << " -> " << to_name << endl;
             Query q;
diff --git a/src/mongo/db/commands/collection_to_capped.cpp b/src/mongo/db/commands/collection_to_capped.cpp
@@ -66,9 +66,9 @@ namespace mongo {
             if ( temp )
                 spec.appendBool( "temp", true );
 
-            string errmsg;
-            if ( !userCreateNS( toNs.c_str(), spec.done(), errmsg, logForReplication ) )
-                return Status( ErrorCodes::InternalError, errmsg );
+            Status status = userCreateNS( toNs.c_str(), spec.done(), logForReplication );
+            if ( !status.isOK() )
+                return status;
         }
 
         Collection* toCollection = db->getCollection( toNs );
diff --git a/src/mongo/db/commands/rename_collection.cpp b/src/mongo/db/commands/rename_collection.cpp
@@ -209,12 +209,12 @@ namespace mongo {
                 // Create the target collection.
                 Collection* targetColl = NULL;
                 if ( capped ) {
-                    BSONObjBuilder spec;
-                    spec.appendBool( "capped", true );
-                    spec.append( "size", double( size ) );
-                    spec.appendBool( "autoIndexId", false );
-                    userCreateNS( target.c_str(), spec.obj(), errmsg, false );
-                    targetColl = ctx.db()->getCollection( target );
+                    CollectionOptions options;
+                    options.capped = true;
+                    options.cappedSize = size;
+                    options.setNoIdIndex();
+
+                    targetColl = ctx.db()->createCollection( target, options );
                 }
                 else {
                     CollectionOptions options;
diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
@@ -591,12 +591,8 @@ namespace mongo {
                         options.hasField("$nExtents"));
 
             // Create collection.
-            string err;
-            bool ok = userCreateNS(ns.c_str(), options, err, !fromRepl);
-            if (!ok && !err.empty()) {
-                errmsg = err;
-            }
-            return ok;
+            return appendCommandStatus( result,
+                                        userCreateNS(ns.c_str(), options, !fromRepl) );
         }
     } cmdCreate;
 
diff --git a/src/mongo/db/introspect.cpp b/src/mongo/db/introspect.cpp
@@ -181,18 +181,13 @@ namespace {
 
         // system.profile namespace doesn't exist; create it
         log() << "creating profile collection: " << profileName << endl;
-        string myerrmsg;
-        if (!userCreateNS(profileName,
-                          BSON("capped" << true << "size" << 1024 * 1024), myerrmsg , false)) {
-            myerrmsg = str::stream() << "could not create ns " << profileName << ": " << myerrmsg;
-            log() << myerrmsg << endl;
-            if ( errmsg )
-                *errmsg = myerrmsg;
-            return NULL;
-        }
 
-        collection = db->getCollection( profileName );
-        verify( collection );
+        CollectionOptions collectionOptions;
+        collectionOptions.capped = true;
+        collectionOptions.cappedSize = 1024 * 1024;
+
+        collection = db->createCollection( profileName, collectionOptions );
+        invariant( collection );
         return collection;
     }
 
diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp
@@ -107,30 +107,29 @@ namespace mongo {
      * @param createDefaultIndexes - if false, defers id (and other) index creation.
      * @return true if successful
     */
-    bool userCreateNS(const char *ns, BSONObj options, string& err,
-                      bool logForReplication, bool createDefaultIndexes ) {
+    Status userCreateNS( const StringData& ns,
+                         BSONObj options,
+                         bool logForReplication,
+                         bool createDefaultIndexes ) {
 
         LOG(1) << "create collection " << ns << ' ' << options;
 
-        massert(10356 ,
-                str::stream() << "invalid ns: " << ns,
-                NamespaceString::validCollectionComponent(ns));
+        if ( !NamespaceString::validCollectionComponent(ns) )
+            return Status( ErrorCodes::InvalidNamespace,
+                           str::stream() << "invalid ns: " << ns );
 
         Database* db = cc().database();
 
         Collection* collection = db->getCollection( ns );
 
-        if ( collection ) {
-            err = "collection already exists";
-            return false;
-        }
+        if ( collection )
+            return Status( ErrorCodes::NamespaceExists,
+                           "collection already exists" );
 
         CollectionOptions collectionOptions;
         Status status = collectionOptions.parse( options );
-        if ( !status.isOK() ) {
-            err = status.toString();
-            return false;
-        }
+        if ( !status.isOK() )
+            return status;
 
         invariant( db->createCollection( ns, collectionOptions, true, createDefaultIndexes ) );
 
@@ -144,7 +143,8 @@ namespace mongo {
             string logNs = nsToDatabase(ns) + ".$cmd";
             logOp("c", logNs.c_str(), options);
         }
-        return true;
+
+        return Status::OK();
     }
 
     void dropAllDatabasesExceptLocal() {
diff --git a/src/mongo/db/pdfile.h b/src/mongo/db/pdfile.h
@@ -39,14 +39,17 @@
 
 #include <string>
 
+#include "mongo/base/status.h"
 #include "mongo/db/jsobj.h"
 
 namespace mongo {
 
     void dropDatabase(const std::string& db);
 
-    bool userCreateNS(const char *ns, BSONObj j, std::string& err,
-                      bool logForReplication, bool createDefaultIndexes = true );
+    Status userCreateNS( const StringData& ns,
+                         BSONObj options,
+                         bool logForReplication,
+                         bool createDefaultIndexes = true );
 
 
 } // namespace mongo
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
@@ -418,7 +418,6 @@ namespace mongo {
         }
 
         /* create an oplog collection, if it doesn't yet exist. */
-        BSONObjBuilder b;
         double sz;
         if (replSettings.oplogSize != 0)
             sz = (double)replSettings.oplogSize;
@@ -447,13 +446,12 @@ namespace mongo {
         log() << "******" << endl;
         log() << "creating replication oplog of size: " << (int)( sz / ( 1024 * 1024 ) ) << "MB..." << endl;
 
-        b.append("size", sz);
-        b.appendBool("capped", 1);
-        b.appendBool("autoIndexId", false);
+        CollectionOptions options;
+        options.capped = true;
+        options.cappedSize = sz;
+        options.autoIndexId = CollectionOptions::NO;
 
-        string err;
-        BSONObj o = b.done();
-        userCreateNS(ns, o, err, false);
+        invariant( ctx.db()->createCollection( ns, options ) );
         if( !rs )
             logOp( "n", "", BSONObj() );
 
diff --git a/src/mongo/dbtests/namespacetests.cpp b/src/mongo/dbtests/namespacetests.cpp
@@ -1043,8 +1043,7 @@ namespace NamespaceTests {
         protected:
             void create() {
                 Lock::GlobalWrite lk;
-                string err;
-                ASSERT( userCreateNS( ns(), fromjson( spec() ), err, false ) );
+                ASSERT( userCreateNS( ns(), fromjson( spec() ), false ).isOK() );
             }
             virtual string spec() const {
                 return "{\"capped\":true,\"size\":512,\"$nExtents\":1}";
diff --git a/src/mongo/dbtests/query_stage_collscan.cpp b/src/mongo/dbtests/query_stage_collscan.cpp
@@ -61,8 +61,7 @@ namespace QueryStageCollectionScan {
             stringstream spec;
             spec << "{\"capped\":true,\"size\":2000,\"$nExtents\":" << nExtents() << "}";
 
-            string err;
-            ASSERT( userCreateNS( ns(), fromjson( spec.str() ), err, false ) );
+            ASSERT( userCreateNS( ns(), fromjson( spec.str() ), false ).isOK() );
 
             // Tell the test to add data/extents/etc.
             insertTestData();
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
@@ -1171,7 +1171,7 @@ namespace QueryTests {
             Client::WriteContext ctx( "unittests" );
 
             // note that extents are always at least 4KB now - so this will get rounded up a bit.
-            ASSERT( userCreateNS( ns() , fromjson( "{ capped : true , size : 2000 }" ) , err , false ) );
+            ASSERT( userCreateNS( ns(), fromjson( "{ capped : true, size : 2000 }" ), false ).isOK() );
             for ( int i=0; i<200; i++ ) {
                 insertNext();
 //                cout << count() << endl;
diff --git a/src/mongo/dbtests/queryutiltests.cpp b/src/mongo/dbtests/queryutiltests.cpp
@@ -1586,8 +1586,7 @@ namespace QueryUtilTests {
             Client::Context _ctx;
         public:
             IndexBase() : _lk(ns()), _ctx( ns() ) , indexNum_( 0 ) {
-                string err;
-                userCreateNS( ns(), BSONObj(), err, false );
+                userCreateNS( ns(), BSONObj(), false );
             }
             ~IndexBase() {
                 if ( !nsd() )
diff --git a/src/mongo/dbtests/replsettests.cpp b/src/mongo/dbtests/replsettests.cpp
@@ -316,8 +316,7 @@ namespace ReplSetTests {
 
         void create() {
             Client::Context c(_cappedNs);
-            string err;
-            ASSERT(userCreateNS( _cappedNs.c_str(), fromjson( spec() ), err, false ));
+            ASSERT( userCreateNS( _cappedNs, fromjson( spec() ), false ).isOK() );
         }
 
         void dropCapped() {
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp
@@ -1648,10 +1648,11 @@ namespace mongo {
                     string system_namespaces = nsToDatabase(ns) + ".system.namespaces";
                     BSONObj entry = conn->findOne( system_namespaces, BSON( "name" << ns ) );
                     if ( entry["options"].isABSONObj() ) {
-                        string errmsg;
-                        if ( ! userCreateNS( ns.c_str(), entry["options"].Obj(), errmsg, true, 0 ) )
-                            warning() << "failed to create collection with options: " << errmsg
-                                      << endl;
+                        Status status = userCreateNS( ns, entry["options"].Obj(), true, 0 );
+                        if ( !status.isOK() ) {
+                            warning() << "failed to create collection [" << ns << "] "
+                                      << " with options: " << status;
+                        }
                     }
                     else {
                         db->createCollection( ns );
