mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-22 10:31:18 -06:00
Code Issues Packages Projects Releases 122 Wiki Activity

go/store/blobstore: gcs.go: Make Get() make one round trip instead of reading the metadata in a separate request.

Browse Source
This commit is contained in:
Aaron Son
2023-01-30 14:49:55 -08:00
parent e956ba9516
commit dc064b0d83
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
go/store/blobstore/gcs.go
View File

@@ -76,7 +76,17 @@ func (bs *GCSBlobstore) Exists(ctx context.Context, key string) (bool, error) {
func (bs *GCSBlobstore) Get(ctx context.Context, key string, br BlobRange) (io.ReadCloser, string, error) {
absKey := path.Join(bs.prefix, key)
oh := bs.bucket.Object(absKey)
attrs, err := oh.Attrs(ctx)
var reader *storage.Reader
var err error
if br.isAllRange() {
reader, err = oh.NewReader(ctx)
} else {
offset, length := br.offset, br.length
if offset < 0 {
length = -1
}
reader, err = oh.NewRangeReader(ctx, offset, length)
}
if err == storage.ErrObjectNotExist {
return nil, "", NotFound{"gs://" + path.Join(bs.bucketName, absKey)}
@@ -84,20 +94,9 @@ func (bs *GCSBlobstore) Get(ctx context.Context, key string, br BlobRange) (io.R
return nil, "", err
}
attrs := reader.Attrs
generation := attrs.Generation
var reader *storage.Reader
if br.isAllRange() {
reader, err = oh.Generation(generation).NewReader(ctx)
} else {
posBr := br.positiveRange(attrs.Size)
reader, err = oh.Generation(generation).NewRangeReader(ctx, posBr.offset, posBr.length)
}
if err != nil {
return nil, "", err
}
return reader, fmtGeneration(generation), nil
}