diff options
| author | Dan Engelbrecht <[email protected]> | 2022-03-17 23:52:22 +0100 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2022-03-31 11:28:32 +0200 |
| commit | 887bd49ae1aa67a2820c10e8de5ac0a1a51bb93e (patch) | |
| tree | 356c990b5b4d338429962fa658e092c3ee1f5bad /zenstore/compactcas.cpp | |
| parent | open blocks on demand (diff) | |
| download | zen-887bd49ae1aa67a2820c10e8de5ac0a1a51bb93e.tar.xz zen-887bd49ae1aa67a2820c10e8de5ac0a1a51bb93e.zip | |
Don't store maxblocksize in index header
Diffstat (limited to 'zenstore/compactcas.cpp')
| -rw-r--r-- | zenstore/compactcas.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/zenstore/compactcas.cpp b/zenstore/compactcas.cpp index cbad4aef1..f7dd36517 100644 --- a/zenstore/compactcas.cpp +++ b/zenstore/compactcas.cpp @@ -31,8 +31,9 @@ struct CasDiskIndexHeader uint32_t Version = CurrentVersion; uint32_t PayloadAlignement; uint32_t Reserved0 = 0; - uint64_t MaxBlockSize; uint64_t EntryCount; + uint32_t Reserved1 = 0; + uint32_t Reserved2 = 0; }; static_assert(sizeof(CasDiskIndexHeader) == 32); @@ -765,9 +766,7 @@ CasContainerStrategy::MakeIndexSnapshot() BasicFile SmallObjectIndex; SmallObjectIndex.Open(SidxPath, true); - CasDiskIndexHeader Header = {.PayloadAlignement = gsl::narrow<uint32_t>(m_PayloadAlignment), - .MaxBlockSize = m_MaxBlockSize, - .EntryCount = Entries.size()}; + CasDiskIndexHeader Header = {.PayloadAlignement = gsl::narrow<uint32_t>(m_PayloadAlignment), .EntryCount = Entries.size()}; SmallObjectIndex.Write(&Header, sizeof(CasDiskIndexEntry), 0); SmallObjectIndex.Write(Entries.data(), Entries.size() * sizeof(CasDiskIndexEntry), sizeof(CasDiskIndexEntry)); SmallObjectIndex.Close(); @@ -1014,7 +1013,7 @@ CasContainerStrategy::OpenContainer(bool IsNewStore) CasDiskIndexHeader Header; SmallObjectIndex.Read(&Header, sizeof(Header), 0); if (Header.Magic == CasDiskIndexHeader::ExpectedMagic && Header.Version == CasDiskIndexHeader::CurrentVersion && - Header.MaxBlockSize > 0 && Header.PayloadAlignement > 0 && Header.EntryCount == ExpectedEntryCount) + Header.PayloadAlignement > 0 && Header.EntryCount == ExpectedEntryCount) { std::vector<CasDiskIndexEntry> Entries{Header.EntryCount}; SmallObjectIndex.Read(Entries.data(), Header.EntryCount * sizeof(CasDiskIndexEntry), sizeof(CasDiskIndexHeader)); @@ -1023,7 +1022,6 @@ CasContainerStrategy::OpenContainer(bool IsNewStore) { m_LocationMap[Entry.Key] = Entry.Location; } - m_MaxBlockSize = Header.MaxBlockSize; m_PayloadAlignment = Header.PayloadAlignement; } } |