Skip to content

Add Concater extension to the GCS storage #1294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Concater extension to the GCS storage #1294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions pkg/gcsstore/gcsstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ func New(bucket string, service GCSAPI) GCSStore {
func (store GCSStore) UseIn(composer *handler.StoreComposer) {
composer.UseCore(store)
composer.UseTerminater(store)
composer.UseConcater(store)
}

func (store GCSStore) NewUpload(ctx context.Context, info handler.FileInfo) (handler.Upload, error) {
Expand Down Expand Up @@ -88,6 +89,10 @@ func (store GCSStore) AsTerminatableUpload(upload handler.Upload) handler.Termin
return upload.(*gcsUpload)
}

func (store GCSStore) AsConcatableUpload(upload handler.Upload) handler.ConcatableUpload {
return upload.(*gcsUpload)
}

func (upload gcsUpload) WriteChunk(ctx context.Context, offset int64, src io.Reader) (int64, error) {
id := upload.id
store := upload.store
Expand Down Expand Up @@ -337,6 +342,32 @@ func (upload gcsUpload) GetReader(ctx context.Context) (io.ReadCloser, error) {
return store.Service.ReadObject(ctx, params)
}

func (upload gcsUpload) ConcatUploads(ctx context.Context, partialUploads []handler.Upload) error {
names := make([]string, len(partialUploads))
store := upload.store

for i, partialUpload := range partialUploads {
info, err := partialUpload.GetInfo(ctx)
if err != nil {
return err
}
names[i] = store.keyWithPrefix(info.ID)
}

composeParams := GCSComposeParams{
Bucket: store.Bucket,
Destination: store.keyWithPrefix(upload.id),
Sources: names,
}

err := store.Service.ComposeObjects(ctx, composeParams)
if err != nil {
return err
}

return nil
}

func (store GCSStore) keyWithPrefix(key string) string {
prefix := store.ObjectPrefix
if prefix != "" && !strings.HasSuffix(prefix, "/") {
Expand Down
Loading