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

repository: Alloc zstd encoder/decoder on demand

Browse source
This commit is contained in:
Michael Eischer 2022-02-19 21:15:31 +01:00
parent fd05037e1a
commit 66f9048bce
1 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
internal/repository/repository.go
View file

@ -42,6 +42,8 @@ type Repository struct {
treePM *packerManager treePM *packerManager
dataPM *packerManager dataPM *packerManager
allocEnc sync.Once
allocDec sync.Once
enc *zstd.Encoder enc *zstd.Encoder
dec *zstd.Decoder dec *zstd.Decoder
} }
@ -55,16 +57,6 @@ func New(be restic.Backend) *Repository {
treePM: newPackerManager(be, nil), treePM: newPackerManager(be, nil),
} }
enc, err := zstd.NewWriter(nil)
if err != nil {
panic(err)
}
repo.enc = enc
dec, err := zstd.NewReader(nil)
if err != nil {
panic(err)
}
repo.dec = dec
return repo return repo
} }
@ -236,7 +228,7 @@ func (r *Repository) LoadBlob(ctx context.Context, t restic.BlobType, id restic.
} }
if blob.IsCompressed() { if blob.IsCompressed() {
plaintext, err = r.dec.DecodeAll(plaintext, make([]byte, 0, blob.DataLength())) plaintext, err = r.getZstdDecoder().DecodeAll(plaintext, make([]byte, 0, blob.DataLength()))
if err != nil { if err != nil {
lastError = errors.Errorf("decompressing blob %v failed: %v", id, err) lastError = errors.Errorf("decompressing blob %v failed: %v", id, err)
continue continue
@ -280,6 +272,28 @@ func (r *Repository) LookupBlobSize(id restic.ID, tpe restic.BlobType) (uint, bo
return r.idx.LookupSize(restic.BlobHandle{ID: id, Type: tpe}) return r.idx.LookupSize(restic.BlobHandle{ID: id, Type: tpe})
} }
func (r *Repository) getZstdEncoder() *zstd.Encoder {
r.allocEnc.Do(func() {
enc, err := zstd.NewWriter(nil)
if err != nil {
panic(err)
}
r.enc = enc
})
return r.enc
}
func (r *Repository) getZstdDecoder() *zstd.Decoder {
r.allocDec.Do(func() {
dec, err := zstd.NewReader(nil)
if err != nil {
panic(err)
}
r.dec = dec
})
return r.dec
}
// saveAndEncrypt encrypts data and stores it to the backend as type t. If data // saveAndEncrypt encrypts data and stores it to the backend as type t. If data
// is small enough, it will be packed together with other small blobs. // is small enough, it will be packed together with other small blobs.
// The caller must ensure that the id matches the data. // The caller must ensure that the id matches the data.
@ -289,7 +303,7 @@ func (r *Repository) saveAndEncrypt(ctx context.Context, t restic.BlobType, data
uncompressedLength := 0 uncompressedLength := 0
if r.cfg.Version > 1 { if r.cfg.Version > 1 {
uncompressedLength = len(data) uncompressedLength = len(data)
data = r.enc.EncodeAll(data, nil) data = r.getZstdEncoder().EncodeAll(data, nil)
} }
nonce := crypto.NewRandomNonce() nonce := crypto.NewRandomNonce()
@ -354,7 +368,7 @@ func (r *Repository) compressUnpacked(p []byte) ([]byte, error) {
// version byte // version byte
out := []byte{2} out := []byte{2}
out = r.enc.EncodeAll(p, out) out = r.getZstdEncoder().EncodeAll(p, out)
return out, nil return out, nil
} }
@ -377,7 +391,7 @@ func (r *Repository) decompressUnpacked(p []byte) ([]byte, error) {
return nil, errors.New("not supported encoding format") return nil, errors.New("not supported encoding format")
} }
return r.dec.DecodeAll(p[1:], nil) return r.getZstdDecoder().DecodeAll(p[1:], nil)
} }
// SaveUnpacked encrypts data and stores it in the backend. Returned is the // SaveUnpacked encrypts data and stores it in the backend. Returned is the