Skip to content

Commit

Permalink
(go api: (object, multi-object)): ref
Browse files Browse the repository at this point in the history 
* "huge param" part five

Signed-off-by: Alex Aizman <[email protected]>
  • Loading branch information
@alex-aizman
alex-aizman committed Nov 25, 2023
1 parent 8257092 commit b78e3e3
Show file tree
Hide file tree
Showing 34 changed files with 103 additions and 103 deletions.
2 changes: 1 addition & 1 deletion ais/backend/ais.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ func (m *AISBackendProvider) PutObj(r io.ReadCloser, lom *cluster.LOM) (errCode
Reader: r.(cos.ReadOpenCloser),
Size: uint64(size),
}
if oah, err = api.PutObject(args); err != nil {
if oah, err = api.PutObject(&args); err != nil {
errCode, err = extractErrCode(err, remAis.uuid)
return
}
Expand Down
12 changes: 6 additions & 6 deletions ais/test/archive_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ func testArch(t *testing.T, bck *meta.Bck) {
msg.ListRange.ObjNames = list
msg.InclSrcBname = test.inclSrcBckName

xids, err := api.ArchiveMultiObj(baseParams, m.bck, msg)
xids, err := api.ArchiveMultiObj(baseParams, m.bck, &msg)
tassert.CheckFatal(t, err)
tlog.Logf("[%s] %2d: arch list %d objects %s => %s\n", xids, i, len(list), m.bck, bckTo)
}(archName, list, i)
Expand All @@ -339,7 +339,7 @@ func testArch(t *testing.T, bck *meta.Bck) {
msg.ListRange.Template = fmt.Sprintf(fmtRange, m.prefix, start, start+numInArch-1)
msg.InclSrcBname = test.inclSrcBckName

xids, err := api.ArchiveMultiObj(baseParams, m.bck, msg)
xids, err := api.ArchiveMultiObj(baseParams, m.bck, &msg)
tassert.CheckFatal(t, err)
tlog.Logf("[%s] %2d: arch range %s %s => %s\n",
xids, i, msg.ListRange.Template, m.bck, bckTo)
Expand Down Expand Up @@ -401,7 +401,7 @@ func testArch(t *testing.T, bck *meta.Bck) {

msg.AppendIfExists = true // here

xids, err := api.ArchiveMultiObj(baseParams, m.bck, msg)
xids, err := api.ArchiveMultiObj(baseParams, m.bck, &msg)
tassert.CheckFatal(t, err)
tlog.Logf("[%s] APPEND %s/%s => %s/%s\n",
xids, m.bck, msg.ListRange.Template, bckTo, archName)
Expand Down Expand Up @@ -530,7 +530,7 @@ func TestAppendToArch(t *testing.T) {
}
msg.ListRange.ObjNames = list

_, err := api.ArchiveMultiObj(baseParams, m.bck, msg)
_, err := api.ArchiveMultiObj(baseParams, m.bck, &msg)
tassert.CheckFatal(t, err)
}(archName, list)
}
Expand Down Expand Up @@ -561,7 +561,7 @@ func TestAppendToArch(t *testing.T) {
msg.AppendIfExists = true
msg.ListRange.ObjNames = list
go func() {
_, err = api.ArchiveMultiObj(baseParams, bckFrom, msg)
_, err = api.ArchiveMultiObj(baseParams, bckFrom, &msg)
tassert.CheckError(t, err)
}()
} else {
Expand All @@ -583,7 +583,7 @@ func TestAppendToArch(t *testing.T) {
if sparsePrint.Inc()%13 == 0 {
tlog.Logf("APPEND local rand => %s/%s/%s\n", bckTo, archName, archpath)
}
err = api.PutApndArch(appendArchArgs)
err = api.PutApndArch(&appendArchArgs)
tassert.CheckError(t, err)
}
}
Expand Down
4 changes: 2 additions & 2 deletions ais/test/auth_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestAuthObj(t *testing.T) {

r, _ := readers.NewRand(fileSize, cos.ChecksumNone)
objName := trand.String(10)
_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: unAuthBP,
Bck: bck,
Reader: r,
Expand All @@ -64,7 +64,7 @@ func TestAuthObj(t *testing.T) {
expectUnauthorized(t, err)

r, _ = readers.NewRand(fileSize, cos.ChecksumNone)
_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: authBP,
Bck: bck,
Reader: r,
Expand Down
8 changes: 4 additions & 4 deletions ais/test/bucket_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TestHTTPProviderBucket(t *testing.T) {
tassert.Fatalf(t, err != nil, "expected error")

reader, _ := readers.NewRand(cos.KiB, cos.ChecksumNone)
_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: "something",
Expand Down Expand Up @@ -465,7 +465,7 @@ func overwriteLomCache(mdwrite apc.WritePolicy, t *testing.T) {
for _, en := range objList.Entries {
reader, err := readers.NewRand(nsize, cos.ChecksumNone)
tassert.CheckFatal(t, err)
_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: m.bck,
ObjName: en.Name,
Expand Down Expand Up @@ -1396,7 +1396,7 @@ func TestListObjectsPrefix(t *testing.T) {
objNames = append(objNames, objName)

r, _ := readers.NewRand(fileSize, cos.ChecksumNone)
_, err := api.PutObject(api.PutArgs{
_, err := api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: objName,
Expand Down Expand Up @@ -3386,7 +3386,7 @@ func TestListObjectsNoRecursion(t *testing.T) {
for _, nm := range objs {
objectSize := int64(rand.Intn(256) + 20)
reader, _ := readers.NewRand(objectSize, cos.ChecksumNone)
_, err := api.PutObject(api.PutArgs{
_, err := api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: nm,
Expand Down
12 changes: 6 additions & 6 deletions ais/test/cp_multiobj_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func TestCopyMultiObjSimple(t *testing.T) {
tlog.Logf("PUT %d => %s\n", len(objList), bckFrom.Cname(""))
for _, objName := range objList {
r, _ := readers.NewRand(objSize, cksumType)
_, err := api.PutObject(api.PutArgs{
_, err := api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bckFrom,
ObjName: objName,
Expand All @@ -80,7 +80,7 @@ func TestCopyMultiObjSimple(t *testing.T) {

msg := cmn.TCObjsMsg{ToBck: bckTo}
msg.Template = template
xid, err = api.CopyMultiObj(baseParams, bckFrom, msg)
xid, err = api.CopyMultiObj(baseParams, bckFrom, &msg)
tassert.CheckFatal(t, err)
}

Expand Down Expand Up @@ -194,9 +194,9 @@ func testCopyMobj(t *testing.T, bck *meta.Bck) {
)
msg.ObjNames = list
if m.bck.IsRemote() && test.evictRemoteSrc {
xid, err = api.CopyMultiObj(baseParams, m.bck, msg, apc.FltExists)
xid, err = api.CopyMultiObj(baseParams, m.bck, &msg, apc.FltExists)
} else {
xid, err = api.CopyMultiObj(baseParams, m.bck, msg)
xid, err = api.CopyMultiObj(baseParams, m.bck, &msg)
}
if err != nil {
erv.Store(err)
Expand Down Expand Up @@ -228,9 +228,9 @@ func testCopyMobj(t *testing.T, bck *meta.Bck) {
)
msg.Template = template
if m.bck.IsRemote() && test.evictRemoteSrc {
xid, err = api.CopyMultiObj(baseParams, m.bck, msg, apc.FltExists)
xid, err = api.CopyMultiObj(baseParams, m.bck, &msg, apc.FltExists)
} else {
xid, err = api.CopyMultiObj(baseParams, m.bck, msg)
xid, err = api.CopyMultiObj(baseParams, m.bck, &msg)
}
if err != nil {
erv.Store(err)
Expand Down
6 changes: 3 additions & 3 deletions ais/test/downloader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ func TestDownloadRemote(t *testing.T) {
tassert.CheckFatal(t, err)

objName := fmt.Sprintf("%s%0*d%s", prefix, 5, i, suffix)
_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: test.srcBck,
ObjName: objName,
Expand Down Expand Up @@ -927,7 +927,7 @@ func TestDownloadOverrideObject(t *testing.T) {

// Update the file
r, _ := readers.NewRand(10, p.Cksum.Type)
_, err := api.PutObject(api.PutArgs{
_, err := api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: objName,
Expand Down Expand Up @@ -974,7 +974,7 @@ func TestDownloadOverrideObjectWeb(t *testing.T) {

// Update the file
r, _ := readers.NewRand(newSize, p.Cksum.Type)
_, err := api.PutObject(api.PutArgs{
_, err := api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: objName,
Expand Down
4 changes: 2 additions & 2 deletions ais/test/dsort_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2003,7 +2003,7 @@ func TestDsortOrderFile(t *testing.T) {
ObjName: orderFileName,
Reader: readers.NewBytes(buffer.Bytes()),
}
_, err = api.PutObject(args)
_, err = api.PutObject(&args)
tassert.CheckFatal(t, err)

tlog.Logln(startingDS)
Expand Down Expand Up @@ -2111,7 +2111,7 @@ func TestDsortOrderJSONFile(t *testing.T) {
ObjName: orderFileName,
Reader: readers.NewBytes(jsonBytes),
}
_, err = api.PutObject(args)
_, err = api.PutObject(&args)
tassert.CheckFatal(t, err)

tlog.Logln(startingDS)
Expand Down
20 changes: 10 additions & 10 deletions ais/test/ec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ func doECPutsAndCheck(t *testing.T, baseParams api.BaseParams, bck cmn.Bck, o *e
}()
tassert.CheckFatal(t, err)
putArgs := api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r}
_, err = api.PutObject(putArgs)
_, err = api.PutObject(&putArgs)
tassert.CheckFatal(t, err)

foundParts, _ := waitForECFinishes(t, totalCnt, objSize, sliceSize, doEC, bck, objPath)
Expand Down Expand Up @@ -449,7 +449,7 @@ func bucketSize(t *testing.T, baseParams api.BaseParams, bck cmn.Bck) int {
func putRandomFile(t *testing.T, baseParams api.BaseParams, bck cmn.Bck, objPath string, size int) {
r, err := readers.NewRand(int64(size), cos.ChecksumNone)
tassert.CheckFatal(t, err)
_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: objPath,
Expand Down Expand Up @@ -622,7 +622,7 @@ func createECReplicas(t *testing.T, baseParams api.BaseParams, bck cmn.Bck, objN
tlog.Logf("Creating %s, size %8d\n", objPath, objSize)
r, err := readers.NewRand(objSize, cos.ChecksumNone)
tassert.CheckFatal(t, err)
_, err = api.PutObject(api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
_, err = api.PutObject(&api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
tassert.CheckFatal(t, err)

tlog.Logf("waiting for %s\n", objPath)
Expand Down Expand Up @@ -650,7 +650,7 @@ func createECObject(t *testing.T, baseParams api.BaseParams, bck cmn.Bck, objNam
tlog.LogfCond(!o.silent, "Creating %s, size %8d [%2s]\n", objPath, objSize, ecStr)
r, err := readers.NewRand(objSize, cos.ChecksumNone)
tassert.CheckFatal(t, err)
_, err = api.PutObject(api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
_, err = api.PutObject(&api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
tassert.CheckFatal(t, err)

tlog.LogfCond(!o.silent, "waiting for %s\n", objPath)
Expand Down Expand Up @@ -689,7 +689,7 @@ func createDamageRestoreECFile(t *testing.T, baseParams api.BaseParams, bck cmn.
tlog.LogfCond(!o.silent, "Creating %s, size %8d [%2s] [%s]\n", objPath, objSize, ecStr, delStr)
r, err := readers.NewRand(objSize, cos.ChecksumNone)
tassert.CheckFatal(t, err)
_, err = api.PutObject(api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
_, err = api.PutObject(&api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
tassert.CheckFatal(t, err)

tlog.LogfCond(!o.silent, "waiting for %s\n", objPath)
Expand Down Expand Up @@ -929,7 +929,7 @@ func putECFile(baseParams api.BaseParams, bck cmn.Bck, objName string) error {
if err != nil {
return err
}
_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: objPath,
Expand Down Expand Up @@ -1416,7 +1416,7 @@ func ecStressCore(t *testing.T, o *ecOptions, proxyURL string, bck cmn.Bck) {
r, err := readers.NewRand(objSize, cos.ChecksumNone)
tassert.Errorf(t, err == nil, "Failed to create reader: %v", err)
putArgs := api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r}
_, err = api.PutObject(putArgs)
_, err = api.PutObject(&putArgs)
tassert.Errorf(t, err == nil, "PUT failed: %v", err)

totalSlices.Add(int64(totalCnt))
Expand Down Expand Up @@ -1508,7 +1508,7 @@ func TestECXattrs(t *testing.T) {
tlog.Logf("Creating %s, size %8d [%2s] [%s]\n", objPath, objSize, ecStr, delStr)
r, err := readers.NewRand(objSize, cos.ChecksumNone)
tassert.CheckFatal(t, err)
_, err = api.PutObject(api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
_, err = api.PutObject(&api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
tassert.CheckFatal(t, err)

tlog.Logf("waiting for %s\n", objPath)
Expand Down Expand Up @@ -1730,7 +1730,7 @@ func TestECEmergencyTargetForSlices(t *testing.T) {
tlog.Logf("Creating %s, size %8d [%2s]\n", objPath, objSize, ecStr)
r, err := readers.NewRand(objSize, cos.ChecksumNone)
tassert.CheckFatal(t, err)
_, err = api.PutObject(api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
_, err = api.PutObject(&api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
tassert.CheckFatal(t, err)
t.Logf("Object %s put in %v", objName, time.Since(start))
start = time.Now()
Expand Down Expand Up @@ -1978,7 +1978,7 @@ func TestECEmergencyMountpath(t *testing.T) {
tlog.Logf("Creating %s, size %8d [%2s]\n", objPath, objSize, ecStr)
r, err := readers.NewRand(objSize, cos.ChecksumNone)
tassert.CheckFatal(t, err)
_, err = api.PutObject(api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
_, err = api.PutObject(&api.PutArgs{BaseParams: baseParams, Bck: bck, ObjName: objPath, Reader: r})
tassert.CheckFatal(t, err)

foundParts, mainObjPath := waitForECFinishes(t, totalCnt, objSize, sliceSize, doEC, bck, objPath)
Expand Down
6 changes: 3 additions & 3 deletions ais/test/etl_cp_multiobj_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func TestETLMultiObj(t *testing.T) {
tlog.Logf("PUT %d objects (size %d) => %s/test/a-*\n", objCnt, objSize, m.bck)
for i := 0; i < objCnt; i++ {
r, _ := readers.NewRand(objSize, cksumType)
_, err := api.PutObject(api.PutArgs{
_, err := api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: m.bck,
ObjName: fmt.Sprintf("test/a-%04d", i),
Expand Down Expand Up @@ -159,9 +159,9 @@ func testETLMultiObj(t *testing.T, etlName string, bckFrom, bckTo cmn.Bck, fileR

tlog.Logf("Starting multi-object ETL[%s] ...\n", etlName)
if evictRemoteSrc {
xid, err = api.ETLMultiObj(baseParams, bckFrom, tcomsg, apc.FltExists)
xid, err = api.ETLMultiObj(baseParams, bckFrom, &tcomsg, apc.FltExists)
} else {
xid, err = api.ETLMultiObj(baseParams, bckFrom, tcomsg)
xid, err = api.ETLMultiObj(baseParams, bckFrom, &tcomsg)
}
tassert.CheckFatal(t, err)

Expand Down
2 changes: 1 addition & 1 deletion ais/test/etl_stress_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def transform(input_bytes):
m = ioContext{
t: t,
num: 200_000,
fileSize: 20 * cos.KiB, // 4Gib total
fileSize: 20 * cos.KiB, // 4GiB total
fixedSize: true,
bck: bckFrom,
}
Expand Down
4 changes: 2 additions & 2 deletions ais/test/etl_tar2tf_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func TestETLTar2TFS3(t *testing.T) {
Cksum: f.Cksum(),
Reader: f,
}
_, err = api.PutObject(putArgs)
_, err = api.PutObject(&putArgs)
tassert.CheckFatal(t, err)
defer api.DeleteObject(baseParams, bck, tarObjName)

Expand Down Expand Up @@ -158,7 +158,7 @@ func TestETLTar2TFRanges(t *testing.T) {
Cksum: f.Cksum(),
Reader: f,
}
_, err = api.PutObject(putArgs)
_, err = api.PutObject(&putArgs)
tassert.CheckFatal(t, err)

etlName := startTar2TfTransformer(t)
Expand Down
4 changes: 2 additions & 2 deletions ais/test/etl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func testETLObjectCloud(t *testing.T, bck cmn.Bck, etlName string, onlyLong, cac
reader, err := readers.NewRand(cos.KiB, cos.ChecksumNone)
tassert.CheckFatal(t, err)

_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: objName,
Expand Down Expand Up @@ -373,7 +373,7 @@ func TestETLInlineMD5SingleObj(t *testing.T) {
reader, err := readers.NewRand(cos.MiB, cos.ChecksumMD5)
tassert.CheckFatal(t, err)

_, err = api.PutObject(api.PutArgs{
_, err = api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: objName,
Expand Down
4 changes: 2 additions & 2 deletions ais/test/fshc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func (md *checkerMD) runTestSync(method string, target *meta.Snode, mpath string
tassert.CheckFatal(md.t, err)
for _, objName := range objList {
r, _ := readers.NewRand(md.fileSize, p.Cksum.Type)
_, err := api.PutObject(api.PutArgs{
_, err := api.PutObject(&api.PutArgs{
BaseParams: md.baseParams,
Bck: md.bck,
ObjName: path.Join(fshcDir, objName),
Expand Down Expand Up @@ -297,7 +297,7 @@ func runAsyncJob(t *testing.T, bck cmn.Bck, wg *sync.WaitGroup, op, mpath string
switch op {
case "PUT":
r, _ := readers.NewRand(fileSize, p.Cksum.Type)
api.PutObject(api.PutArgs{
api.PutObject(&api.PutArgs{
BaseParams: baseParams,
Bck: bck,
ObjName: path.Join(fshcDir, fname),
Expand Down
Loading

0 comments on commit b78e3e3

Please sign in to comment.