enhance DbSet

1 files changed, 22 insertions, 3 deletions

diff --git a/db/dbhelpers.cpp b/db/dbhelpers.cpp
index 7d0b69e7716..3941dd591c9 100644
--- a/db/dbhelpers.cpp
+++ b/db/dbhelpers.cpp
@@ -143,18 +143,37 @@ namespace mongo {
         deleteObjects(ns, BSONObj(), false);
     }
 
-    void DbSet::reset() {
+    DbSet::~DbSet() {
+        if ( name_.empty() )
+            return;
+        try {
+            DBContext c( name_.c_str() );
+            if ( nsdetails( name_.c_str() ) ) {
+                string errmsg;
+                BSONObjBuilder result;
+                dropCollection( name_, errmsg, result );
+            }
+        } catch ( ... ) {
+            problem() << "exception cleaning up DbSet" << endl;
+        }
+    }
+    
+    void DbSet::reset( const string &name, const BSONObj &key ) {
+        if ( !name.empty() )
+            name_ = name;
+        if ( !key.isEmpty() )
+            key_ = key.getOwned();
         DBContext c( name_.c_str() );
         if ( nsdetails( name_.c_str() ) ) {
             Helpers::emptyCollection( name_.c_str() );
         } else {
             string err;
-            massert( err, userCreateNS( name_.c_str(), BSONObj(), err, false ) );
+            massert( err, userCreateNS( name_.c_str(), fromjson( "{autoIndexId:false}" ), err, false ) );
         }
         Helpers::ensureIndex( name_.c_str(), key_, true, "setIdx" );            
     }
     
-    bool DbSet::get( const BSONObj &obj ) {
+    bool DbSet::get( const BSONObj &obj ) const {
         DBContext c( name_.c_str() );
         BSONObj temp;
         return Helpers::findOne( name_.c_str(), obj, temp, true );