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
cmd/ctr/pushobject.go
View File

@@ -58,11 +58,11 @@ var pushObjectCommand = cli.Command{
Size: info.Size,
}
rc, err := cs.Reader(ctx, dgst)
ra, err := cs.ReaderAt(ctx, dgst)
if err != nil {
return err
}
defer rc.Close()
defer ra.Close()
cw, err := pusher.Push(ctx, desc)
if err != nil {
@@ -70,7 +70,7 @@ var pushObjectCommand = cli.Command{
}
// TODO: Progress reader
if err := content.Copy(cw, rc, desc.Size, desc.Digest); err != nil {
if err := content.Copy(cw, content.NewReader(ra), desc.Size, desc.Digest); err != nil {
return err
}