[#1523] local_object_storage: Unify parameters for the GetRange operation

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>

pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go

@@ -317,11 +317,11 @@ func (b *Blobovniczas) Delete(prm DeleteSmallPrm) (res DeleteSmallRes, err error
 //
 // If blobocvnicza ID is specified, only this blobovnicza is processed.
 // Otherwise, all Blobovniczas are processed descending weight.
-func (b *Blobovniczas) GetRange(prm GetRangeSmallPrm) (res GetRangeSmallRes, err error) {
-	if prm.blobovniczaID != nil {
-		blz, err := b.openBlobovnicza(prm.blobovniczaID.String())
+func (b *Blobovniczas) GetRange(prm common.GetRangePrm) (res common.GetRangeRes, err error) {
+	if prm.BlobovniczaID != nil {
+		blz, err := b.openBlobovnicza(prm.BlobovniczaID.String())
 		if err != nil {
-			return GetRangeSmallRes{}, err
+			return common.GetRangeRes{}, err
 		}
 
 		return b.getObjectRange(blz, prm)
@@ -330,7 +330,7 @@ func (b *Blobovniczas) GetRange(prm GetRangeSmallPrm) (res GetRangeSmallRes, err
 	activeCache := make(map[string]struct{})
 	objectFound := false
 
-	err = b.iterateSortedLeaves(&prm.addr, func(p string) (bool, error) {
+	err = b.iterateSortedLeaves(&prm.Address, func(p string) (bool, error) {
 		dirPath := filepath.Dir(p)
 
 		_, ok := activeCache[dirPath]
@@ -361,7 +361,7 @@ func (b *Blobovniczas) GetRange(prm GetRangeSmallPrm) (res GetRangeSmallRes, err
 		// not found in any blobovnicza
 		var errNotFound apistatus.ObjectNotFound
 
-		return GetRangeSmallRes{}, errNotFound
+		return common.GetRangeRes{}, errNotFound
 	}
 
 	return
@@ -493,7 +493,7 @@ func (b *Blobovniczas) getObjectFromLevel(prm blobovnicza.GetPrm, blzPath string
 // tries to read range of object payload data from particular blobovnicza.
 //
 // returns error if object could not be read from any blobovnicza of the same level.
-func (b *Blobovniczas) getRangeFromLevel(prm GetRangeSmallPrm, blzPath string, tryActive bool) (GetRangeSmallRes, error) {
+func (b *Blobovniczas) getRangeFromLevel(prm common.GetRangePrm, blzPath string, tryActive bool) (common.GetRangeRes, error) {
 	lvlPath := filepath.Dir(blzPath)
 
 	// try to read from blobovnicza if it is opened
@@ -551,13 +551,13 @@ func (b *Blobovniczas) getRangeFromLevel(prm GetRangeSmallPrm, blzPath string, t
 
 		var errNotFound apistatus.ObjectNotFound
 
-		return GetRangeSmallRes{}, errNotFound
+		return common.GetRangeRes{}, errNotFound
 	}
 
 	// open blobovnicza (cached inside)
 	blz, err := b.openBlobovnicza(blzPath)
 	if err != nil {
-		return GetRangeSmallRes{}, err
+		return common.GetRangeRes{}, err
 	}
 
 	return b.getObjectRange(blz, prm)
@@ -602,9 +602,9 @@ func (b *Blobovniczas) getObject(blz *blobovnicza.Blobovnicza, prm blobovnicza.G
 }
 
 // reads range of object payload data from blobovnicza and returns GetRangeSmallRes.
-func (b *Blobovniczas) getObjectRange(blz *blobovnicza.Blobovnicza, prm GetRangeSmallPrm) (GetRangeSmallRes, error) {
+func (b *Blobovniczas) getObjectRange(blz *blobovnicza.Blobovnicza, prm common.GetRangePrm) (common.GetRangeRes, error) {
 	var gPrm blobovnicza.GetPrm
-	gPrm.SetAddress(prm.addr)
+	gPrm.SetAddress(prm.Address)
 
 	// we don't use GetRange call for now since blobovnicza
 	// stores data that is compressed on BlobStor side.
@@ -612,35 +612,33 @@ func (b *Blobovniczas) getObjectRange(blz *blobovnicza.Blobovnicza, prm GetRange
 	// we can start using GetRange.
 	res, err := blz.Get(gPrm)
 	if err != nil {
-		return GetRangeSmallRes{}, err
+		return common.GetRangeRes{}, err
 	}
 
 	// decompress the data
 	data, err := b.Decompress(res.Object())
 	if err != nil {
-		return GetRangeSmallRes{}, fmt.Errorf("could not decompress object data: %w", err)
+		return common.GetRangeRes{}, fmt.Errorf("could not decompress object data: %w", err)
 	}
 
 	// unmarshal the object
 	obj := objectSDK.New()
 	if err := obj.Unmarshal(data); err != nil {
-		return GetRangeSmallRes{}, fmt.Errorf("could not unmarshal the object: %w", err)
+		return common.GetRangeRes{}, fmt.Errorf("could not unmarshal the object: %w", err)
 	}
 
-	from := prm.rng.GetOffset()
-	to := from + prm.rng.GetLength()
+	from := prm.Range.GetOffset()
+	to := from + prm.Range.GetLength()
 	payload := obj.Payload()
 
 	if pLen := uint64(len(payload)); to < from || pLen < from || pLen < to {
 		var errOutOfRange apistatus.ObjectOutOfRange
 
-		return GetRangeSmallRes{}, errOutOfRange
+		return common.GetRangeRes{}, errOutOfRange
 	}
 
-	return GetRangeSmallRes{
-		rangeData{
-			data: payload[from:to],
-		},
+	return common.GetRangeRes{
+		Data: payload[from:to],
 	}, nil
 }
 

pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza_test.go

@@ -93,30 +93,27 @@ func TestBlobovniczas(t *testing.T) {
 		require.Equal(t, obj, res.Object)
 
 		// get range w/ blobovnicza ID
-		var rngPrm GetRangeSmallPrm
-		rngPrm.SetBlobovniczaID(id)
-		rngPrm.SetAddress(addr)
+		var rngPrm common.GetRangePrm
+		rngPrm.BlobovniczaID = id
+		rngPrm.Address = addr
 
 		payload := obj.Payload()
 		pSize := uint64(len(obj.Payload()))
 
-		rng := objectSDK.NewRange()
-		rngPrm.SetRange(rng)
-
 		off, ln := pSize/3, 2*pSize/3
-		rng.SetOffset(off)
-		rng.SetLength(ln)
+		rngPrm.Range.SetOffset(off)
+		rngPrm.Range.SetLength(ln)
 
 		rngRes, err := b.GetRange(rngPrm)
 		require.NoError(t, err)
-		require.Equal(t, payload[off:off+ln], rngRes.RangeData())
+		require.Equal(t, payload[off:off+ln], rngRes.Data)
 
 		// get range w/o blobovnicza ID
-		rngPrm.SetBlobovniczaID(nil)
+		rngPrm.BlobovniczaID = nil
 
 		rngRes, err = b.GetRange(rngPrm)
 		require.NoError(t, err)
-		require.Equal(t, payload[off:off+ln], rngRes.RangeData())
+		require.Equal(t, payload[off:off+ln], rngRes.Data)
 	}
 
 	var dPrm DeleteSmallPrm

pkg/local_object_storage/blobstor/blobovniczatree/get_range_small.go

@@ -1,13 +0,0 @@
-package blobovniczatree
-
-// GetRangeSmallPrm groups the parameters of GetRangeSmall operation.
-type GetRangeSmallPrm struct {
-	address
-	rwRange
-	rwBlobovniczaID
-}
-
-// GetRangeSmallRes groups the resulting values of GetRangeSmall operation.
-type GetRangeSmallRes struct {
-	rangeData
-}