SERVER-18024 Move collection metadata loading under the catalog manager

Cleans up the CollectionType parsing code and moves all the collection
metadata retrieval logic under the catalog manager.

Also moves type_collection.* under the catalog manager library.

1 files changed, 7 insertions, 3 deletions

diff --git a/jstests/sharding/shard1.js b/jstests/sharding/shard1.js
index 10dcafd6ec6..b14ec95f66f 100644
--- a/jstests/sharding/shard1.js
+++ b/jstests/sharding/shard1.js
@@ -23,14 +23,18 @@ s.adminCommand( shardCommand );
 assert.throws( function(){ s.adminCommand({ shardCollection: 'test', key: { x: 1 }}); });
 assert.throws( function(){ s.adminCommand({ shardCollection: '.foo', key: { x: 1 }}); });
 
-cconfig = s.config.collections.findOne( { _id : "test.foo" } );
+var cconfig = s.config.collections.findOne( { _id : "test.foo" } );
 assert( cconfig , "why no collection entry for test.foo" )
+
 delete cconfig.lastmod
 delete cconfig.dropped
 delete cconfig.lastmodEpoch
-assert.eq( cconfig , { _id : "test.foo" , key : { num : 1 } , unique : false } , "Sharded content" );
 
-s.config.collections.find().forEach( printjson )
+assert.eq(cconfig,
+          { _id : "test.foo" , key : { num : 1 } , unique : false },
+          "Sharded content mismatch");
+
+s.config.collections.find().forEach( printjson );
 
 assert.eq( 1 , s.config.chunks.count() , "num chunks A");
 si = s.config.chunks.findOne();