Skip to content

Commit a022d19

Browse files
authored
gcssotre: Do not write info when loading info object (#1300)
* Do not write info on getInfo * Fix tests
1 parent a631f89 commit a022d19

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

pkg/gcsstore/gcsstore.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,6 @@ func (upload gcsUpload) GetInfo(ctx context.Context) (handler.FileInfo, error) {
225225
}
226226

227227
info.Offset = offset
228-
err = store.writeInfo(ctx, store.keyWithPrefix(id), info)
229-
if err != nil {
230-
return info, err
231-
}
232228

233229
return info, nil
234230
}

pkg/gcsstore/gcsstore_test.go

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,11 @@ func TestGetInfo(t *testing.T) {
168168
ID: mockPartial2,
169169
}
170170

171-
var size int64 = 100
172-
173-
mockTusdInfo.Offset = 300
174-
offsetInfoData, err := json.Marshal(mockTusdInfo)
175-
assert.Nil(err)
171+
var size1 int64 = 100
172+
var size2 int64 = 200
173+
var size3 int64 = 300
176174

177-
infoR := bytes.NewReader(offsetInfoData)
175+
mockTusdInfo.Offset = 600
178176

179177
ctx := context.Background()
180178
gomock.InOrder(
@@ -183,11 +181,9 @@ func TestGetInfo(t *testing.T) {
183181
)
184182

185183
ctxCancel, cancel := context.WithCancel(ctx)
186-
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams0).Return(size, nil)
187-
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams1).Return(size, nil)
188-
lastGetObjectSize := service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams2).Return(size, nil)
189-
190-
service.EXPECT().WriteObject(ctx, params, infoR).Return(int64(len(offsetInfoData)), nil).After(lastGetObjectSize)
184+
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams0).Return(size1, nil)
185+
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams1).Return(size2, nil)
186+
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams2).Return(size3, nil)
191187

192188
upload, err := store.GetUpload(context.Background(), mockID)
193189
assert.Nil(err)
@@ -337,12 +333,6 @@ func TestFinishUpload(t *testing.T) {
337333

338334
var size int64 = 100
339335

340-
mockTusdInfo.Offset = 300
341-
offsetInfoData, err := json.Marshal(mockTusdInfo)
342-
assert.Nil(err)
343-
344-
infoR := bytes.NewReader(offsetInfoData)
345-
346336
objectParams := gcsstore.GCSObjectParams{
347337
Bucket: store.Bucket,
348338
ID: mockID,
@@ -366,8 +356,7 @@ func TestFinishUpload(t *testing.T) {
366356
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams1).Return(size, nil)
367357
lastGetObjectSize := service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams2).Return(size, nil)
368358

369-
writeObject := service.EXPECT().WriteObject(ctx, infoParams, infoR).Return(int64(len(offsetInfoData)), nil).After(lastGetObjectSize)
370-
service.EXPECT().SetObjectMetadata(ctx, objectParams, metadata).Return(nil).After(writeObject)
359+
service.EXPECT().SetObjectMetadata(ctx, objectParams, metadata).Return(nil).After(lastGetObjectSize)
371360

372361
upload, err := store.GetUpload(context.Background(), mockID)
373362
assert.Nil(err)

0 commit comments

Comments
 (0)