diff options
| author | Dan Engelbrecht <[email protected]> | 2022-03-15 10:48:30 +0100 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2022-03-31 11:28:31 +0200 |
| commit | 6c654174bd5bcbdd694fc78a9923714a9a32d796 (patch) | |
| tree | 38dd3290ddd6788395538705b7da75e7cd46cc66 | |
| parent | block files (diff) | |
| download | zen-6c654174bd5bcbdd694fc78a9923714a9a32d796.tar.xz zen-6c654174bd5bcbdd694fc78a9923714a9a32d796.zip | |
clang format
| -rw-r--r-- | zenstore/chunkbundler.h | 14 | ||||
| -rw-r--r-- | zenstore/compactcas.cpp | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/zenstore/chunkbundler.h b/zenstore/chunkbundler.h index 4b24ec958..f32245ad1 100644 --- a/zenstore/chunkbundler.h +++ b/zenstore/chunkbundler.h @@ -76,7 +76,7 @@ private: ChunkBundlerValidator* m_Validator; spdlog::logger& m_Log; uint64_t m_PayloadAlignment = 1 << 4; - uint64_t m_MaxBlockSize = 1L << 30; // 1 Gb + uint64_t m_MaxBlockSize = 1L << 30; // 1 Gb bool m_IsInitialized = false; BasicFile m_SmallObjectIndex; std::filesystem::path RootDirectory; @@ -87,14 +87,14 @@ private: RwLock m_LocationMapLock; std::unordered_map<IoHash, CompactDiskLocation, IoHash::Hasher> m_LocationMap; std::unordered_map<uint16_t, std::shared_ptr<BasicFile>> m_OpenBlocks; - uint16_t m_CurrentFileIndex = 0; + uint16_t m_CurrentBlockIndex = 0; - RwLock m_InsertLock; // used to serialize inserts - std::weak_ptr<BasicFile> m_CurrentBlock; - std::atomic_uint32_t m_CurrentInsertOffset{}; + RwLock m_InsertLock; // used to serialize inserts + std::weak_ptr<BasicFile> m_CurrentBlock; + std::atomic_uint32_t m_CurrentInsertOffset{}; - std::atomic_uint64_t m_CurrentIndexOffset{}; - std::atomic_uint64_t m_TotalSize{}; + std::atomic_uint64_t m_CurrentIndexOffset{}; + std::atomic_uint64_t m_TotalSize{}; void MakeIndexSnapshot(); }; diff --git a/zenstore/compactcas.cpp b/zenstore/compactcas.cpp index 5712734c7..91ee232fe 100644 --- a/zenstore/compactcas.cpp +++ b/zenstore/compactcas.cpp @@ -486,10 +486,10 @@ CasContainerStrategy::MakeIndexSnapshot() namespace fs = std::filesystem; - fs::path SlogPath = m_Config.RootDirectory / (m_ContainerBaseName + ".ulog"); - fs::path SidxPath = m_Config.RootDirectory / (m_ContainerBaseName + ".uidx"); - fs::path STmplogPath = m_Config.RootDirectory / (m_ContainerBaseName + ".tmp.ulog"); - fs::path STmpSidxPath = m_Config.RootDirectory / (m_ContainerBaseName + ".tmp.uidx"); + fs::path SlogPath = m_Config.RootDirectory / (m_ContainerBaseName + ".ulog"); + fs::path SidxPath = m_Config.RootDirectory / (m_ContainerBaseName + ".uidx"); + fs::path STmplogPath = m_Config.RootDirectory / (m_ContainerBaseName + ".tmp.ulog"); + fs::path STmpSidxPath = m_Config.RootDirectory / (m_ContainerBaseName + ".tmp.uidx"); fs::path SRecoveredlogPath = m_Config.RootDirectory / (m_ContainerBaseName + ".recover.ulog"); // Move cas and index away, we keep them if something goes wrong, any new chunks will be added to the new log @@ -522,7 +522,7 @@ CasContainerStrategy::MakeIndexSnapshot() std::vector<CasDiskIndexEntry> Entries; { - RwLock::SharedLockScope _l(m_LocationMapLock); + RwLock::SharedLockScope _l(m_LocationMapLock); Entries.resize(m_LocationMap.size()); uint64_t EntryIndex = 0; |