github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

content: remove Provider.Reader

Browse Source 
After some analysis, it was found that Content.Reader was generally
redudant to an io.ReaderAt. This change removes `Content.Reader` in
favor of a `Content.ReaderAt`. In general, `ReaderAt` can perform better
over interfaces with indeterminant latency because it avoids remote
state for reads. Where a reader is required, a helper is provided to
convert it into an `io.SectionReader`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-07-27 19:07:58 -07:00
parent 1f04eddad1
commit 8be340e37b
19 changed files with 105 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
export.go
View File

@@ -43,15 +43,17 @@ func (c *Client) exportToOCITar(ctx context.Context, desc ocispec.Descriptor, wr
func exportHandler(cs content.Store, img oci.ImageDriver) images.HandlerFunc {
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
r, err := cs.Reader(ctx, desc.Digest)
r, err := cs.ReaderAt(ctx, desc.Digest)
if err != nil {
return nil, err
}
defer r.Close()
w, err := oci.NewBlobWriter(img, desc.Digest.Algorithm())
if err != nil {
return nil, err
}
if _, err = io.Copy(w, r); err != nil {
if _, err = io.Copy(w, content.NewReader(r)); err != nil {
return nil, err
}
if err = w.Commit(desc.Size, desc.Digest); err != nil {