Changeset 2631 for box/trunk/bin/bbackupd/BackupDaemon.cpp

Timestamp:

22/02/2010 22:10:04 (2 years ago)

Author:

chris

Message:

Remove all references to bdb databases, use QDBM instead.

File:

• box/trunk/bin/bbackupd/BackupDaemon.cpp (modified) (5 diffs)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -1785 +1785 @@
 void BackupDaemon::SetupIDMapsForSync()
 {
-        // Need to do different things depending on whether it's an
-        // in memory implementation, or whether it's all stored on disc.
-        
-#ifdef BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION
-
-        // Make sure we have some blank, empty ID maps
-        DeleteIDMapVector(mNewIDMaps);
-        FillIDMapVector(mNewIDMaps, true /* new maps */);
-
-        // Then make sure that the current maps have objects,
-        // even if they are empty (for the very first run)
-        if(mCurrentIDMaps.empty())
-        {
-                FillIDMapVector(mCurrentIDMaps, false /* current maps */);
-        }
-
-#else
-
         // Make sure we have some blank, empty ID maps
         DeleteIDMapVector(mNewIDMaps);
@@ -1808 +1790 @@
         DeleteIDMapVector(mCurrentIDMaps);
         FillIDMapVector(mCurrentIDMaps, false /* new maps */);
-
-#endif
 }
 
@@ -1936 +1916 @@
 void BackupDaemon::CommitIDMapsAfterSync()
 {
-        // Need to do different things depending on whether it's an in memory implementation,
-        // or whether it's all stored on disc.
-        
-#ifdef BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION
-        // Remove the current ID maps
-        DeleteIDMapVector(mCurrentIDMaps);
-
-        // Copy the (pointers to) "new" maps over to be the new "current" maps
-        mCurrentIDMaps = mNewIDMaps;
-        
-        // Clear the new ID maps vector (not delete them!)
-        mNewIDMaps.clear();
-
-#else
-
         // Get rid of the maps in memory (leaving them on disc of course)
         DeleteIDMapVector(mCurrentIDMaps);
@@ -1974 +1939 @@
                 }
         }
-
-#endif
 }
 
@@ -1997 +1960 @@
                 
                 // Close and delete
-                toDel->Close();
-                delete toDel;
+win32 rename            delete toDel;
         }
         ASSERT(rVector.size() == 0);