Changeset 2655

Timestamp:

08/03/2010 21:22:42 (6 months ago)

Author:

chris

Message:

Merge [2647] into 0.11rc7.

Files:

• box/RELEASE/0.11rc7/bin/bbstored/HousekeepStoreAccount.cpp (modified) (3 diffs)

box/RELEASE/0.11rc7/bin/bbstored/HousekeepStoreAccount.cpp

@@ -417 +417 @@
                 mEmptyDirectories.push_back(dir.GetObjectID());
         }
-        
+
+        // Calculate reference counts first, before we start requesting
+        // files to be deleted.
+        // BLOCK
+        {
+                BackupStoreDirectory::Iterator i(dir);
+                BackupStoreDirectory::Entry *en = 0;
+
+                while((en = i.Next()) != 0)
+                {
+                        // This directory references this object
+                        if (mNewRefCounts.size() <= en->GetObjectID())
+                        {
+                                mNewRefCounts.resize(en->GetObjectID() + 1, 0);
+                        }
+                        mNewRefCounts[en->GetObjectID()]++;
+                }
+        }
+
         // BLOCK
         {
@@ -464 +482 @@
                 while((en = i.Next(BackupStoreDirectory::Entry::Flags_File)) != 0)
                 {
-                        // This directory references this object
-                        if (mNewRefCounts.size() <= en->GetObjectID())
-                        {
-                                mNewRefCounts.resize(en->GetObjectID() + 1, 0);
-                        }
-                        mNewRefCounts[en->GetObjectID()]++;
-
                         // Update recalculated usage sizes
                         int16_t enFlags = en->GetFlags();
@@ -579 +590 @@
                 while((en = i.Next(BackupStoreDirectory::Entry::Flags_Dir)) != 0)
                 {
-                        // This parent directory references this child
-                        if (mNewRefCounts.size() <= en->GetObjectID())
-                        {
-                                mNewRefCounts.resize(en->GetObjectID() + 1, 0);
-                        }
-                        mNewRefCounts[en->GetObjectID()]++;
-
                         // Next level
                         ASSERT((en->GetFlags() & BackupStoreDirectory::Entry::Flags_Dir) == BackupStoreDirectory::Entry::Flags_Dir);