TrueCloudLab/restic
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

pack: cleanup header size calculation

Browse source
This commit is contained in:
Michael Eischer 2022-02-13 16:51:47 +01:00
parent 6408686973
commit a773cb6527
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/checker/checker.go
View file

@ -452,7 +452,7 @@ func checkPack(ctx context.Context, r restic.Repository, id restic.ID, blobs []r
sort.Slice(blobs, func(i, j int) bool { sort.Slice(blobs, func(i, j int) bool {
return blobs[i].Offset < blobs[j].Offset return blobs[i].Offset < blobs[j].Offset
}) })
idxHdrSize := pack.HeaderSize + len(blobs)*int(pack.EntrySize) idxHdrSize := pack.CalculateHeaderSize(blobs)
lastBlobEnd := 0 lastBlobEnd := 0
nonContinuousPack := false nonContinuousPack := false
for _, blob := range blobs { for _, blob := range blobs {

15
internal/pack/pack.go
View file

@ -89,7 +89,7 @@ func (p *Packer) Finalize() (uint, error) {
bytesWritten += uint(hdrBytes) bytesWritten += uint(hdrBytes)
// write length // write length
err = binary.Write(p.wr, binary.LittleEndian, uint32(restic.CiphertextLength(len(p.blobs)*int(EntrySize)))) err = binary.Write(p.wr, binary.LittleEndian, uint32(hdrBytes))
if err != nil { if err != nil {
return 0, errors.Wrap(err, "binary.Write") return 0, errors.Wrap(err, "binary.Write")
} }
@ -158,8 +158,8 @@ var (
const ( const (
// size of the header-length field at the end of the file; it is a uint32 // size of the header-length field at the end of the file; it is a uint32
headerLengthSize = 4 headerLengthSize = 4
// HeaderSize is the header's constant overhead (independent of #entries) // headerSize is the header's constant overhead (independent of #entries)
HeaderSize = headerLengthSize + crypto.Extension headerSize = headerLengthSize + crypto.Extension
// MaxHeaderSize is the max size of header including header-length field // MaxHeaderSize is the max size of header including header-length field
MaxHeaderSize = 16*1024*1024 + headerLengthSize MaxHeaderSize = 16*1024*1024 + headerLengthSize
@ -292,11 +292,6 @@ func List(k *crypto.Key, rd io.ReaderAt, size int64) (entries []restic.Blob, hdr
return entries, hdrSize, nil return entries, hdrSize, nil
} }
// PackedSizeOfBlob returns the size a blob actually uses when saved in a pack
func PackedSizeOfBlob(blobLength uint) uint {
return blobLength + EntrySize
}
func parseHeaderEntry(p []byte) (b restic.Blob, err error) { func parseHeaderEntry(p []byte) (b restic.Blob, err error) {
if uint(len(p)) < EntrySize { if uint(len(p)) < EntrySize {
err = errors.Errorf("parseHeaderEntry: buffer of size %d too short", len(p)) err = errors.Errorf("parseHeaderEntry: buffer of size %d too short", len(p))
@ -320,7 +315,7 @@ func parseHeaderEntry(p []byte) (b restic.Blob, err error) {
} }
func CalculateHeaderSize(blobs []restic.Blob) int { func CalculateHeaderSize(blobs []restic.Blob) int {
return HeaderSize + len(blobs)*int(EntrySize) return headerSize + len(blobs)*int(EntrySize)
} }
// Size returns the size of all packs computed by index information. // Size returns the size of all packs computed by index information.
@ -333,7 +328,7 @@ func Size(ctx context.Context, mi restic.MasterIndex, onlyHdr bool) map[restic.I
for blob := range mi.Each(ctx) { for blob := range mi.Each(ctx) {
size, ok := packSize[blob.PackID] size, ok := packSize[blob.PackID]
if !ok { if !ok {
size = HeaderSize size = headerSize
} }
if !onlyHdr { if !onlyHdr {
size += int64(blob.Length) size += int64(blob.Length)