Skip to content
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

Use update instead of CreateInBatches in CompleteMultipartUpload #776

Merged
merged 11 commits into from
Nov 30, 2023
Merged

Use update instead of CreateInBatches in CompleteMultipartUpload #776

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
51e4850
stores: use update instead of create in CompleteMultipartUpload
ChrisSchinnerl Nov 30, 2023
85122cd
testing: add TestMultipartUploadWrappedByPartialSlabs
ChrisSchinnerl Nov 30, 2023
21367df
object: remove object.PartialSlab type
ChrisSchinnerl Nov 30, 2023
27c9955
stores: fix TestPartialSlab
ChrisSchinnerl Nov 30, 2023
076e64a
stores: fix TestObjectBasic
ChrisSchinnerl Nov 30, 2023
f5aacd9
testing: fix TestUploadPacking
ChrisSchinnerl Nov 30, 2023
e3aacc2
testing: fix TestMultipartUploadWrappedByPartialSlabs
ChrisSchinnerl Nov 30, 2023
97883c4
stores: address comment
ChrisSchinnerl Nov 30, 2023
9b9be20
testing: fix TestNewTestCluster
ChrisSchinnerl Nov 30, 2023
b2ed2eb
stores: simplify createSlices
ChrisSchinnerl Nov 30, 2023
89e6b72
stores: address comments
ChrisSchinnerl Nov 30, 2023
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
19 changes: 10 additions & 9 deletions stores/multipart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,15 +403,16 @@ func (s *SQLStore) CompleteMultipartUpload(ctx context.Context, bucket, path str
// clear the ID to make sure new slices are created with IDs in
// ascending order.
for i := range slices {
slices[i].ID = 0
slices[i].DBObjectID = &obj.ID
slices[i].ObjectIndex = uint(i + 1)
slices[i].DBMultipartPartID = nil
}

// Save updated slices.
if err := tx.CreateInBatches(slices, 100).Error; err != nil {
return fmt.Errorf("failed to save slices: %w", err)
err = tx.Model(&dbSlice{}).
ChrisSchinnerl marked this conversation as resolved.
Show resolved Hide resolved
Where("id", slices[i].ID).
Updates(map[string]interface{}{
"db_object_id": obj.ID,
"object_index": uint(i + 1),
"db_multipart_part_id": nil,
}).Error
if err != nil {
return fmt.Errorf("failed to update slice %v: %w", i, err)
}
}

// Delete the multipart upload.
Expand Down