implemented dropIndexes for alt rec store

db/btree.cpp

@@ -750,7 +750,12 @@ namespace mongo {
             _KeyNode& kn = k(pos);
             if ( kn.isUnused() ) {
                 DEBUGGING out() << "reusing unused key" << endl;
-                massert( "btree reuse unused key error?", kn.prevChildBucket == lChild );
+                if( kn.prevChildBucket != lChild ) {
+                    /* is it ok if they don't match, and we just need to update??? */
+                    log() << "pcb:" << kn.prevChildBucket.toString() << " lChild:" << lChild.toString() << '\n';
+                    log() << "rChild:" << rChild.toString() << '\n';
+                    massert( "btree reuse unused key error?", false);
+                }
                 // check rchild too?
                 kn.setUsed();
                 return 0;

db/dbcommands.cpp

@@ -630,6 +630,7 @@ namespace mongo {
 
                     d->aboutToDeleteAnIndex();
 
+                    /* there may be pointers pointing at keys in the btree(s).  kill them. */
                     ClientCursor::invalidate(toDeleteNs.c_str());
 
                     // delete a specific index or all?

db/javajs.cpp

@@ -728,8 +728,6 @@ namespace mongo {
 
     }
 
-} // namespace mongo
-
 #if defined(_MAIN)
 int main() {
     return javajstest();
@@ -738,3 +736,4 @@ int main() {
 
 #endif
 
+} // namespace mongo

db/pdfile.cpp

@@ -584,7 +584,8 @@ assert( !eloc.isNull() );
             wassert( n == 1 );
         }
 
-        dropNS(ns);
+        BtreeStore::drop(ns.c_str());
+        //        dropNS(ns); 
         //	database->namespaceIndex.kill(ns.c_str());
         head.setInvalid();
         info.setInvalid();

db/query.cpp

@@ -433,7 +433,7 @@ namespace mongo {
         try {
             return _runCommands(ns, jsobj, ss, b, anObjBuilder, fromRepl, queryOptions);
         }
-        catch ( AssertionException e ) {
+        catch ( AssertionException& e ) {
             if ( !e.msg.empty() )
                 anObjBuilder.append("assertion", e.msg);
         }

db/rec.h

@@ -30,6 +30,10 @@ class MongoMemMapped_RecStore : public RecStoreInterface {
     }
 
     static void modified(DiskLoc d) { }
+
+    static void drop(const char *ns) { 
+        dropNS(ns);
+    }
 };
 
 /* An in memory RecStoreInterface implementation ----------------------------
@@ -63,6 +67,10 @@ class InMem_RecStore : public RecStoreInterface {
     }
 
     static void modified(DiskLoc d) { }
+
+    static void drop(const char *ns) { 
+        log() << "warning: drop() not yet implemented for InMem_RecStore" << endl;
+    }
 };
 
 /* Glue btree to RecStoreInterface: ---------------------------- */

db/reccache.cpp

@@ -187,6 +187,7 @@ void RecCache::writeDirty( set<DiskLoc>::iterator startAt, bool rawLog ) {
     }
     catch(...) {
         const char *message = "Problem: bad() in RecCache::writeDirty, file io error\n";
+
         if ( rawLog )
             rawOut( message );
         else
@@ -260,6 +261,62 @@ void RecCache::dump() {
 //    cout << endl;
 }
 
+void RecCache::closeStore(BasicRecStore *rs) { 
+    for( set<DiskLoc>::iterator i = dirtyl.begin(); i != dirtyl.end(); ) { 
+        DiskLoc k = *i++;
+        if( k.a() == rs->fileNumber )
+            dirtyl.erase(k);
+    }
+
+    for( map<DiskLoc,Node*>::iterator i = m.begin(); i != m.end(); ) { 
+        DiskLoc k = i->first;
+        i++;
+        if( k.a() == rs->fileNumber )
+            m.erase(k);
+    }
+
+    for( unsigned i = 0; i < stores.size(); i++ ) { 
+        if( stores[i] == rs ) { 
+            stores[i] = 0;
+            break;
+        }
+    }
+    delete rs; // closes file
+}
+
+void RecCache::drop(const char *ns) { 
+    // todo: test with a non clean shutdown file
+    boostlock lk(rcmutex);
+
+    char buf[256];
+    {
+        char *p = buf;
+        while( 1 ) {
+            if( *ns == '$' ) *p = '_';
+            else
+                *p = *ns;
+            if( *ns == 0 )
+                break;
+            p++; ns++;
+        }
+        assert( p - buf < (int) sizeof(buf) );
+    }
+    BasicRecStore *&rs = storesByNs[buf];
+    if( rs == 0 )
+        initStoreByNs(buf); // load -- creates if DNE which is slightly bad. 
+    {
+        string fname = rs->filename;
+        closeStore(rs);
+        rs = 0;
+        try { 
+            boost::filesystem::remove(fname);
+        } 
+        catch(...) { 
+            log() << "couldn't remove file " << fname << endl;
+        }
+    }
+}
+
 void dbunlocking() { 
     dassert( dbMutexInfo.isLocked() );
     theRecCache.ejectOld();

db/reccache.h

@@ -46,6 +46,7 @@ class RecCache {
     BasicRecStore* _initStore(string fname);
     BasicRecStore* initStore(int n);
     void initStoreByNs(const char *ns);
+    void closeStore(BasicRecStore *rs);
 
     /* get the right file for a given diskloc */
     BasicRecStore& store(DiskLoc& d) { 
@@ -164,6 +165,8 @@ class RecCache {
         return n->data;
     }
 
+    void drop(const char *ns);
+
     DiskLoc insert(const char *ns, const void *obuf, int len, bool god) {
         boostlock lk(rcmutex);
         BasicRecStore& rs = store(ns);
@@ -197,6 +200,10 @@ class Cached_RecStore : public RecStoreInterface {
     static void modified(DiskLoc d) { 
         theRecCache.dirty(d);
     }
+
+    static void drop(const char *ns) { 
+        theRecCache.drop(ns);
+    }
 };
 
 } /*namespace*/

db/reci.h

@@ -22,6 +22,8 @@ class RecStoreInterface {
     /* insert specified data as a record */
     static DiskLoc insert(const char *ns, const void *obuf, int len, bool god) { assert(false); return DiskLoc(); }
 
+    /* drop the collection */
+    static void drop(const char *ns) { assert(false); }
 };
 
 }

db/recstore.h

@@ -40,6 +40,8 @@ class BasicRecStore {
 
     int fileNumber; // this goes in DiskLoc::a
 
+    string filename;
+
 private:
 
     void writeHeader();

db/storage.cpp

@@ -15,6 +15,7 @@ static int inited;
 void BasicRecStore::init(const char *fn, unsigned recsize)
 { 
     massert( "compile packing problem recstore?", sizeof(RecStoreHeader) == 8192);
+    filename = fn;
     f.open(fn);
     uassert( string("couldn't open file:")+fn, f.is_open() );
     len = f.len();

s/dbgrid.vcproj

@@ -503,6 +503,14 @@
 							UsePrecompiledHeader="0"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="release_nojni|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug Recstore|Win32"
 						>

tools/importJSON.cpp

@@ -89,7 +89,7 @@ class ImportJSON : public Tool {
                 BSONObj o = fromjson( line );
                 _conn.insert( ns.c_str() , o );
             }
-            catch ( MsgAssertionException ma ){
+            catch ( MsgAssertionException& ma ){
                 cout << "exception:" << ma.toString() << endl;
                 cout << line << endl;
             }