diff options
Diffstat (limited to 'lib/backupstore/BackupStoreInfo.h')
| -rw-r--r-- | lib/backupstore/BackupStoreInfo.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/lib/backupstore/BackupStoreInfo.h b/lib/backupstore/BackupStoreInfo.h index db2a62ef..752cc44a 100644 --- a/lib/backupstore/BackupStoreInfo.h +++ b/lib/backupstore/BackupStoreInfo.h @@ -14,10 +14,6 @@ #include <string> #include <vector> -<<<<<<< HEAD -class BackupStoreCheck; - -======= #include "CollectInBufferStream.h" class BackupStoreCheck; @@ -63,7 +59,6 @@ END_STRUCTURE_PACKING_FOR_WIRE #define INFO_FILENAME "info" ->>>>>>> 0.12 // -------------------------------------------------------------------------- // // Class @@ -94,33 +89,19 @@ public: bool IsModified() const {return mIsModified;} // Save modified infomation back to store -<<<<<<< HEAD - void Save(); -======= void Save(bool allowOverwrite = true); ->>>>>>> 0.12 // Data access functions int32_t GetAccountID() const {return mAccountID;} int64_t GetLastObjectIDUsed() const {return mLastObjectIDUsed;} int64_t GetBlocksUsed() const {return mBlocksUsed;} -<<<<<<< HEAD -======= int64_t GetBlocksInCurrentFiles() const {return mBlocksInCurrentFiles;} ->>>>>>> 0.12 int64_t GetBlocksInOldFiles() const {return mBlocksInOldFiles;} int64_t GetBlocksInDeletedFiles() const {return mBlocksInDeletedFiles;} int64_t GetBlocksInDirectories() const {return mBlocksInDirectories;} const std::vector<int64_t> &GetDeletedDirectories() const {return mDeletedDirectories;} int64_t GetBlocksSoftLimit() const {return mBlocksSoftLimit;} int64_t GetBlocksHardLimit() const {return mBlocksHardLimit;} -<<<<<<< HEAD - bool IsReadOnly() const {return mReadOnly;} - int GetDiscSetNumber() const {return mDiscSet;} - - // Data modification functions - void ChangeBlocksUsed(int64_t Delta); -======= int64_t GetNumFiles() const {return mNumFiles;} int64_t GetNumOldFiles() const {return mNumOldFiles;} int64_t GetNumDeletedFiles() const {return mNumDeletedFiles;} @@ -134,7 +115,6 @@ public: // Data modification functions void ChangeBlocksUsed(int64_t Delta); void ChangeBlocksInCurrentFiles(int64_t Delta); ->>>>>>> 0.12 void ChangeBlocksInOldFiles(int64_t Delta); void ChangeBlocksInDeletedFiles(int64_t Delta); void ChangeBlocksInDirectories(int64_t Delta); @@ -142,31 +122,15 @@ public: void AddDeletedDirectory(int64_t DirID); void RemovedDeletedDirectory(int64_t DirID); void ChangeLimits(int64_t BlockSoftLimit, int64_t BlockHardLimit); -<<<<<<< HEAD -======= void AdjustNumFiles(int64_t increase); void AdjustNumOldFiles(int64_t increase); void AdjustNumDeletedFiles(int64_t increase); void AdjustNumDirectories(int64_t increase); ->>>>>>> 0.12 // Object IDs int64_t AllocateObjectID(); // Client marker set and get -<<<<<<< HEAD - int64_t GetClientStoreMarker() {return mClientStoreMarker;} - void SetClientStoreMarker(int64_t ClientStoreMarker); - -private: - static std::auto_ptr<BackupStoreInfo> CreateForRegeneration(int32_t AccountID, const std::string &rRootDir, - int DiscSet, int64_t LastObjectID, int64_t BlocksUsed, int64_t BlocksInOldFiles, - int64_t BlocksInDeletedFiles, int64_t BlocksInDirectories, int64_t BlockSoftLimit, int64_t BlockHardLimit); - -private: - // Location information - int32_t mAccountID; -======= int64_t GetClientStoreMarker() const {return mClientStoreMarker;} void SetClientStoreMarker(int64_t ClientStoreMarker); @@ -194,7 +158,6 @@ private: // they now define the sizes of fields on disk (via Archive). int32_t mAccountID; std::string mAccountName; ->>>>>>> 0.12 int mDiscSet; std::string mFilename; bool mReadOnly; @@ -206,21 +169,12 @@ private: // Account information int64_t mLastObjectIDUsed; int64_t mBlocksUsed; -<<<<<<< HEAD -======= int64_t mBlocksInCurrentFiles; ->>>>>>> 0.12 int64_t mBlocksInOldFiles; int64_t mBlocksInDeletedFiles; int64_t mBlocksInDirectories; int64_t mBlocksSoftLimit; int64_t mBlocksHardLimit; -<<<<<<< HEAD - std::vector<int64_t> mDeletedDirectories; -}; - - -======= int64_t mNumFiles; int64_t mNumOldFiles; int64_t mNumDeletedFiles; @@ -230,7 +184,6 @@ private: CollectInBufferStream mExtraData; }; ->>>>>>> 0.12 #endif // BACKUPSTOREINFO__H |