From c7d7ad5dd7d158866da84edce1b2adb4a77d517c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 9 Feb 2014 16:39:40 +0000 Subject: Rename BackupStoreInfo variable NumFiles to NumCurrentFiles. Will hopefully prevent future confusion about the meaning of this info variable. --- lib/backupstore/BackupCommands.cpp | 2 +- lib/backupstore/BackupStoreAccounts.cpp | 2 +- lib/backupstore/BackupStoreCheck.cpp | 4 ++-- lib/backupstore/BackupStoreCheck.h | 2 +- lib/backupstore/BackupStoreCheck2.cpp | 4 ++-- lib/backupstore/BackupStoreContext.cpp | 4 ++-- lib/backupstore/BackupStoreInfo.cpp | 20 ++++++++++---------- lib/backupstore/BackupStoreInfo.h | 6 +++--- test/backupstore/testbackupstore.cpp | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/backupstore/BackupCommands.cpp b/lib/backupstore/BackupCommands.cpp index 43f7c4a2..471ed56a 100644 --- a/lib/backupstore/BackupCommands.cpp +++ b/lib/backupstore/BackupCommands.cpp @@ -990,7 +990,7 @@ std::auto_ptr BackupProtocolGetAccountUsage2::DoCommand( COPY(BlocksInDirectories); COPY(BlocksSoftLimit); COPY(BlocksHardLimit); - usage->SetNumCurrentFiles(info.GetNumFiles()); + COPY(NumCurrentFiles); COPY(NumOldFiles); COPY(NumDeletedFiles); COPY(NumDirectories); diff --git a/lib/backupstore/BackupStoreAccounts.cpp b/lib/backupstore/BackupStoreAccounts.cpp index 6a4d846c..5aed4a6d 100644 --- a/lib/backupstore/BackupStoreAccounts.cpp +++ b/lib/backupstore/BackupStoreAccounts.cpp @@ -410,7 +410,7 @@ int BackupStoreAccountsControl::PrintAccountInfo(int32_t ID) std::cout << FormatUsageLineStart("Client store marker", mMachineReadableOutput) << info->GetLastObjectIDUsed() << std::endl; std::cout << FormatUsageLineStart("Current Files", mMachineReadableOutput) << - info->GetNumFiles() << std::endl; + info->GetNumCurrentFiles() << std::endl; std::cout << FormatUsageLineStart("Old Files", mMachineReadableOutput) << info->GetNumOldFiles() << std::endl; std::cout << FormatUsageLineStart("Deleted Files", mMachineReadableOutput) << diff --git a/lib/backupstore/BackupStoreCheck.cpp b/lib/backupstore/BackupStoreCheck.cpp index 957475e4..de49c3e1 100644 --- a/lib/backupstore/BackupStoreCheck.cpp +++ b/lib/backupstore/BackupStoreCheck.cpp @@ -58,7 +58,7 @@ BackupStoreCheck::BackupStoreCheck(const std::string &rStoreRoot, int DiscSetNum mBlocksInOldFiles(0), mBlocksInDeletedFiles(0), mBlocksInDirectories(0), - mNumFiles(0), + mNumCurrentFiles(0), mNumOldFiles(0), mNumDeletedFiles(0), mNumDirectories(0) @@ -764,7 +764,7 @@ void BackupStoreCheck::CheckDirectories() if(!en->IsDeleted() && !en->IsOld()) { - mNumFiles++; + mNumCurrentFiles++; mBlocksInCurrentFiles += en->GetSizeInBlocks(); } } diff --git a/lib/backupstore/BackupStoreCheck.h b/lib/backupstore/BackupStoreCheck.h index 178a873a..feecf05c 100644 --- a/lib/backupstore/BackupStoreCheck.h +++ b/lib/backupstore/BackupStoreCheck.h @@ -206,7 +206,7 @@ private: int64_t mBlocksInOldFiles; int64_t mBlocksInDeletedFiles; int64_t mBlocksInDirectories; - int64_t mNumFiles; + int64_t mNumCurrentFiles; int64_t mNumOldFiles; int64_t mNumDeletedFiles; int64_t mNumDirectories; diff --git a/lib/backupstore/BackupStoreCheck2.cpp b/lib/backupstore/BackupStoreCheck2.cpp index 0e3502d4..ae3ca919 100644 --- a/lib/backupstore/BackupStoreCheck2.cpp +++ b/lib/backupstore/BackupStoreCheck2.cpp @@ -589,7 +589,7 @@ void BackupStoreCheck::WriteNewStoreInfo() ++mNumberErrorsFound; } - BOX_INFO("Current files: " << mNumFiles << ", " + BOX_INFO("Current files: " << mNumCurrentFiles << ", " "old files: " << mNumOldFiles << ", " "deleted files: " << mNumDeletedFiles << ", " "directories: " << mNumDirectories); @@ -657,7 +657,7 @@ void BackupStoreCheck::WriteNewStoreInfo() hardLimit, (pOldInfo.get() ? pOldInfo->IsAccountEnabled() : true), *extra_data)); - info->AdjustNumFiles(mNumFiles); + info->AdjustNumCurrentFiles(mNumCurrentFiles); info->AdjustNumOldFiles(mNumOldFiles); info->AdjustNumDeletedFiles(mNumDeletedFiles); info->AdjustNumDirectories(mNumDirectories); diff --git a/lib/backupstore/BackupStoreContext.cpp b/lib/backupstore/BackupStoreContext.cpp index e3de2232..f55b1dc8 100644 --- a/lib/backupstore/BackupStoreContext.cpp +++ b/lib/backupstore/BackupStoreContext.cpp @@ -699,7 +699,7 @@ int64_t BackupStoreContext::AddFile(IOStream &rFile, int64_t InDirectory, if(DiffFromFileID == 0) { - mapStoreInfo->AdjustNumFiles(1); + mapStoreInfo->AdjustNumCurrentFiles(1); } else { @@ -794,7 +794,7 @@ bool BackupStoreContext::DeleteFile(const BackupStoreFilename &rFilename, int64_ // Modify the store info, and write // It definitely wasn't an old or deleted version - mapStoreInfo->AdjustNumFiles(-1); + mapStoreInfo->AdjustNumCurrentFiles(-1); mapStoreInfo->AdjustNumDeletedFiles(1); mapStoreInfo->ChangeBlocksInDeletedFiles(blocksDel); diff --git a/lib/backupstore/BackupStoreInfo.cpp b/lib/backupstore/BackupStoreInfo.cpp index b6714709..bf672e69 100644 --- a/lib/backupstore/BackupStoreInfo.cpp +++ b/lib/backupstore/BackupStoreInfo.cpp @@ -45,7 +45,7 @@ BackupStoreInfo::BackupStoreInfo() mBlocksInOldFiles(0), mBlocksInDeletedFiles(0), mBlocksInDirectories(0), - mNumFiles(0), + mNumCurrentFiles(0), mNumOldFiles(0), mNumDeletedFiles(0), mNumDirectories(0), @@ -205,11 +205,11 @@ std::auto_ptr BackupStoreInfo::Load(int32_t AccountID, archive.Read(info->mBlocksInDirectories); archive.Read(info->mBlocksSoftLimit); archive.Read(info->mBlocksHardLimit); - archive.Read(info->mNumFiles); - archive.Read(info->mNumOldFiles); - archive.Read(info->mNumDeletedFiles); - archive.Read(info->mNumDirectories); - archive.Read(numDelObj); + archive.Read(info->mNumCurrentFiles); + archive.Read(info->mNumOldFiles); + archive.Read(info->mNumDeletedFiles); + archive.Read(info->mNumDirectories); + archive.Read(numDelObj); } // Then load the list of deleted directories @@ -362,7 +362,7 @@ void BackupStoreInfo::Save(bool allowOverwrite) archive.Write(mBlocksInDirectories); archive.Write(mBlocksSoftLimit); archive.Write(mBlocksHardLimit); - archive.Write(mNumFiles); + archive.Write(mNumCurrentFiles); archive.Write(mNumOldFiles); archive.Write(mNumDeletedFiles); archive.Write(mNumDirectories); @@ -434,7 +434,7 @@ int BackupStoreInfo::ReportChangesTo(BackupStoreInfo& rOldInfo) COMPARE(BlocksInDirectories); COMPARE(BlocksSoftLimit); COMPARE(BlocksHardLimit); - COMPARE(NumFiles); + COMPARE(NumCurrentFiles); COMPARE(NumOldFiles); COMPARE(NumDeletedFiles); COMPARE(NumDirectories); @@ -527,9 +527,9 @@ void BackupStoreInfo::ChangeBlocksInDirectories(int64_t Delta) APPLY_DELTA(mBlocksInDirectories, Delta); } -void BackupStoreInfo::AdjustNumFiles(int64_t increase) +void BackupStoreInfo::AdjustNumCurrentFiles(int64_t increase) { - APPLY_DELTA(mNumFiles, increase); + APPLY_DELTA(mNumCurrentFiles, increase); } void BackupStoreInfo::AdjustNumOldFiles(int64_t increase) diff --git a/lib/backupstore/BackupStoreInfo.h b/lib/backupstore/BackupStoreInfo.h index 752cc44a..8246ed21 100644 --- a/lib/backupstore/BackupStoreInfo.h +++ b/lib/backupstore/BackupStoreInfo.h @@ -102,7 +102,7 @@ public: const std::vector &GetDeletedDirectories() const {return mDeletedDirectories;} int64_t GetBlocksSoftLimit() const {return mBlocksSoftLimit;} int64_t GetBlocksHardLimit() const {return mBlocksHardLimit;} - int64_t GetNumFiles() const {return mNumFiles;} + int64_t GetNumCurrentFiles() const {return mNumCurrentFiles;} int64_t GetNumOldFiles() const {return mNumOldFiles;} int64_t GetNumDeletedFiles() const {return mNumDeletedFiles;} int64_t GetNumDirectories() const {return mNumDirectories;} @@ -122,7 +122,7 @@ public: void AddDeletedDirectory(int64_t DirID); void RemovedDeletedDirectory(int64_t DirID); void ChangeLimits(int64_t BlockSoftLimit, int64_t BlockHardLimit); - void AdjustNumFiles(int64_t increase); + void AdjustNumCurrentFiles(int64_t increase); void AdjustNumOldFiles(int64_t increase); void AdjustNumDeletedFiles(int64_t increase); void AdjustNumDirectories(int64_t increase); @@ -175,7 +175,7 @@ private: int64_t mBlocksInDirectories; int64_t mBlocksSoftLimit; int64_t mBlocksHardLimit; - int64_t mNumFiles; + int64_t mNumCurrentFiles; int64_t mNumOldFiles; int64_t mNumDeletedFiles; int64_t mNumDirectories; diff --git a/test/backupstore/testbackupstore.cpp b/test/backupstore/testbackupstore.cpp index 5dcd8802..c787c50a 100644 --- a/test/backupstore/testbackupstore.cpp +++ b/test/backupstore/testbackupstore.cpp @@ -2432,7 +2432,7 @@ int test_read_old_backupstoreinfo_files() apArchive->Write(apInfo->GetBlocksInDirectories()); apArchive->Write(apInfo->GetBlocksSoftLimit()); apArchive->Write(apInfo->GetBlocksHardLimit()); - apArchive->Write(apInfo->GetNumFiles()); + apArchive->Write(apInfo->GetNumCurrentFiles()); apArchive->Write(apInfo->GetNumOldFiles()); apArchive->Write(apInfo->GetNumDeletedFiles()); apArchive->Write(apInfo->GetNumDirectories()); -- cgit v1.2.3