[Box Backup-commit] COMMIT r3216 - box/trunk/lib/backupstore

[subversion at boxbackup.org]

Author: chris
Date: 2014-02-07 20:30:43 +0000 (Fri, 07 Feb 2014)
New Revision: 3216

Modified:
   box/trunk/lib/backupstore/BackupStoreAccounts.cpp
Log:
Revert "Revert "Fix compile error introduced by bbstoreaccounts refactor.""

This reverts commit b3bc7ad5be2c5b2588793aaa9fbc05e4a1c0aea5.

Should not have been applied in SVN (not just yet, anyway).

Modified: box/trunk/lib/backupstore/BackupStoreAccounts.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreAccounts.cpp	2014-02-07 20:22:51 UTC (rev 3215)
+++ box/trunk/lib/backupstore/BackupStoreAccounts.cpp	2014-02-07 20:30:43 UTC (rev 3216)
@@ -120,7 +120,10 @@
 		info->Save();
 
 		// Create the refcount database
-		BackupStoreRefCountDatabase::Create(Entry)->Commit();
+		BackupStoreRefCountDatabase::CreateNew(Entry);
+		std::auto_ptr<BackupStoreRefCountDatabase> refcount(
+			BackupStoreRefCountDatabase::Load(Entry, false));
+		refcount->AddReference(BACKUPSTORE_ROOT_DIRECTORY_ID);
 	}
 
 	// As the original user...
@@ -410,7 +413,7 @@
 	std::cout << FormatUsageLineStart("Client store marker", mMachineReadableOutput) <<
 		info->GetLastObjectIDUsed() << std::endl;
 	std::cout << FormatUsageLineStart("Current Files", mMachineReadableOutput) <<
-		info->GetNumCurrentFiles() << std::endl;
+		info->GetNumFiles() << std::endl;
 	std::cout << FormatUsageLineStart("Old Files", mMachineReadableOutput) <<
 		info->GetNumOldFiles() << std::endl;
 	std::cout << FormatUsageLineStart("Deleted Files", mMachineReadableOutput) <<