JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/metabase: fix move transaction

Browse Source 
Change-Id: Id1b6c721e7373dffd3f40aafa15109fc2cb82474
This commit is contained in:
Fadila Khadar 2022-06-14 11:04:44 +02:00
parent b828b6ec34
commit 3ae325462c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
satellite/metabase/move_object.go
View File

@ -168,7 +168,7 @@ func (db *DB) FinishMoveObject(ctx context.Context, opts FinishMoveObject) (err
` `
var segmentsCount int var segmentsCount int
row := db.db.QueryRowContext(ctx, updateObjectsQuery, []byte(opts.NewBucket), opts.NewEncryptedObjectKey, opts.NewEncryptedMetadataKey, opts.NewEncryptedMetadataKeyNonce, opts.ProjectID, []byte(opts.BucketName), opts.ObjectKey, opts.Version, opts.StreamID) row := tx.QueryRowContext(ctx, updateObjectsQuery, []byte(opts.NewBucket), opts.NewEncryptedObjectKey, opts.NewEncryptedMetadataKey, opts.NewEncryptedMetadataKeyNonce, opts.ProjectID, []byte(opts.BucketName), opts.ObjectKey, opts.Version, opts.StreamID)
if err = row.Scan(&segmentsCount); err != nil { if err = row.Scan(&segmentsCount); err != nil {
if code := pgerrcode.FromError(err); code == pgxerrcode.UniqueViolation { if code := pgerrcode.FromError(err); code == pgxerrcode.UniqueViolation {
return Error.Wrap(ErrObjectAlreadyExists.New("")) return Error.Wrap(ErrObjectAlreadyExists.New(""))
@ -193,7 +193,7 @@ func (db *DB) FinishMoveObject(ctx context.Context, opts FinishMoveObject) (err
newSegmentKeys.Positions = append(newSegmentKeys.Positions, int64(u.Position.Encode())) newSegmentKeys.Positions = append(newSegmentKeys.Positions, int64(u.Position.Encode()))
} }
updateResult, err := db.db.ExecContext(ctx, ` updateResult, err := tx.ExecContext(ctx, `
UPDATE segments SET UPDATE segments SET
encrypted_key_nonce = P.encrypted_key_nonce, encrypted_key_nonce = P.encrypted_key_nonce,
encrypted_key = P.encrypted_key encrypted_key = P.encrypted_key