opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-16 18:53:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move code for sparse optimized copy to a dedicated method

Browse Source 
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
This commit is contained in:
Mario Loriedo
2024-02-27 15:59:56 +01:00
parent f099250beb
commit 24a33a538c
4 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/machine/compression/generic.go
View File

@ -63,3 +63,13 @@ func (d *genericDecompressor) close() {
logrus.Errorf("Unable to close compressed file: %q", err)
}
}
func (d *genericDecompressor) sparseOptimizedCopy(w WriteSeekCloser, r io.Reader) error {
var err error
sparseWriter := NewSparseWriter(w)
defer func() {
err = sparseWriter.Close()
}()
_, err = io.Copy(sparseWriter, r)
return err
}

10
pkg/machine/compression/gzip.go
View File

@ -27,13 +27,5 @@ func (d *gzipDecompressor) decompress(w WriteSeekCloser, r io.Reader) error {
}
}()
sparseWriter := NewSparseWriter(w)
defer func() {
if err := sparseWriter.Close(); err != nil {
logrus.Errorf("Unable to close uncompressed file: %q", err)
}
}()
_, err = io.Copy(sparseWriter, gzReader)
return err
return d.sparseOptimizedCopy(w, gzReader)
}

12
pkg/machine/compression/uncompressed.go
View File

@ -2,8 +2,6 @@ package compression
import (
"io"
"github.com/sirupsen/logrus"
)
type uncompressedDecompressor struct {
@ -16,13 +14,5 @@ func newUncompressedDecompressor(compressedFilePath string) (*uncompressedDecomp
}
func (d *uncompressedDecompressor) decompress(w WriteSeekCloser, r io.Reader) error {
sparseWriter := NewSparseWriter(w)
defer func() {
if err := sparseWriter.Close(); err != nil {
logrus.Errorf("Unable to close uncompressed file: %q", err)
}
}()
_, err := io.Copy(sparseWriter, r)
return err
return d.sparseOptimizedCopy(w, r)
}

11
pkg/machine/compression/zstd.go
View File

@ -4,7 +4,6 @@ import (
"io"
"github.com/klauspost/compress/zstd"
"github.com/sirupsen/logrus"
)
type zstdDecompressor struct {
@ -23,13 +22,5 @@ func (d *zstdDecompressor) decompress(w WriteSeekCloser, r io.Reader) error {
}
defer zstdReader.Close()
sparseWriter := NewSparseWriter(w)
defer func() {
if err := sparseWriter.Close(); err != nil {
logrus.Errorf("Unable to close uncompressed file: %q", err)
}
}()
_, err = io.Copy(sparseWriter, zstdReader)
return err
return d.sparseOptimizedCopy(w, zstdReader)
}