*: Remove unused tree service methods

Signed-off-by: Evgenii Baidakov <[email protected]>
nspcc-dev · Jan 31, 2025 · d833f8a · d833f8a
1 parent 781c210
commit d833f8a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 504 deletions.
diff --git a/api/layer/system_object.go b/api/layer/system_object.go
@@ -179,17 +179,6 @@ func (n *layer) getLockDataFromObjects(ctx context.Context, bkt *data.BucketInfo
 	return &lock, nil
 }
 
-func (n *layer) getNodeVersionFromCacheOrNeofs(ctx context.Context, objVersion *ObjectVersion) (nodeVersion *data.NodeVersion, err error) {
-	// check cache if node version is stored inside extendedObjectVersion
-	nodeVersion = n.getNodeVersionFromCache(n.Owner(ctx), objVersion)
-	if nodeVersion == nil {
-		// else get node version from tree service
-		return n.getNodeVersion(ctx, objVersion)
-	}
-
-	return nodeVersion, nil
-}
-
 func (n *layer) putLockObject(ctx context.Context, bktInfo *data.BucketInfo, objID oid.ID, lock *data.ObjectLock, copiesNumber uint32, objectName, objectVersion string) (oid.ID, error) {
 	prm := PrmObjectCreate{
 		Container:    bktInfo.CID,

diff --git a/api/layer/tagging.go b/api/layer/tagging.go
@@ -8,14 +8,11 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/nspcc-dev/neofs-s3-gw/api"
 	"github.com/nspcc-dev/neofs-s3-gw/api/data"
 	"github.com/nspcc-dev/neofs-s3-gw/api/s3errors"
 	apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
 	cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
 	"github.com/nspcc-dev/neofs-sdk-go/object"
-	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
-	"github.com/nspcc-dev/neofs-sdk-go/user"
 	"go.uber.org/zap"
 )
 
@@ -227,64 +224,3 @@ func objectTaggingCacheKey(p *ObjectVersion) string {
 func bucketTaggingCacheKey(cnrID cid.ID) string {
 	return ".tagset." + cnrID.EncodeToString()
 }
-
-func (n *layer) getNodeVersion(ctx context.Context, objVersion *ObjectVersion) (*data.NodeVersion, error) {
-	var err error
-	var version *data.NodeVersion
-
-	if objVersion.VersionID == data.UnversionedObjectVersionID {
-		version, err = n.treeService.GetUnversioned(ctx, objVersion.BktInfo, objVersion.ObjectName)
-	} else if len(objVersion.VersionID) == 0 {
-		version, err = n.treeService.GetLatestVersion(ctx, objVersion.BktInfo, objVersion.ObjectName)
-	} else {
-		versions, err2 := n.treeService.GetVersions(ctx, objVersion.BktInfo, objVersion.ObjectName)
-		if err2 != nil {
-			return nil, err2
-		}
-		for _, v := range versions {
-			if v.OID.EncodeToString() == objVersion.VersionID {
-				version = v
-				break
-			}
-		}
-		if version == nil {
-			err = s3errors.GetAPIError(s3errors.ErrNoSuchVersion)
-		}
-	}
-
-	if err == nil && version.IsDeleteMarker() && !objVersion.NoErrorOnDeleteMarker || errorsStd.Is(err, ErrNodeNotFound) {
-		return nil, s3errors.GetAPIError(s3errors.ErrNoSuchKey)
-	}
-
-	if err == nil && version != nil && !version.IsDeleteMarker() {
-		reqInfo := api.GetReqInfo(ctx)
-		n.log.Debug("target details",
-			zap.String("reqId", reqInfo.RequestID),
-			zap.String("bucket", objVersion.BktInfo.Name), zap.Stringer("cid", objVersion.BktInfo.CID),
-			zap.String("object", objVersion.ObjectName), zap.Stringer("oid", version.OID))
-	}
-
-	return version, err
-}
-
-func (n *layer) getNodeVersionFromCache(owner user.ID, o *ObjectVersion) *data.NodeVersion {
-	if len(o.VersionID) == 0 || o.VersionID == data.UnversionedObjectVersionID {
-		return nil
-	}
-
-	var objID oid.ID
-	if objID.DecodeString(o.VersionID) != nil {
-		return nil
-	}
-
-	var addr oid.Address
-	addr.SetContainer(o.BktInfo.CID)
-	addr.SetObject(objID)
-
-	extObjectInfo := n.cache.GetObject(owner, addr)
-	if extObjectInfo == nil {
-		return nil
-	}
-
-	return extObjectInfo.NodeVersion
-}
diff --git a/api/layer/tree_mock.go b/api/layer/tree_mock.go
@@ -1,7 +1,6 @@
 package layer
 
 import (
-	"cmp"
 	"context"
 	"fmt"
 	"slices"
@@ -20,39 +19,6 @@ type TreeServiceMock struct {
 	parts      map[string]map[int]*data.PartInfo
 }
 
-func (t *TreeServiceMock) GetObjectTagging(_ context.Context, bktInfo *data.BucketInfo, nodeVersion *data.NodeVersion) (map[string]string, error) {
-	cnrTagsMap, ok := t.tags[bktInfo.CID.EncodeToString()]
-	if !ok {
-		return nil, nil
-	}
-
-	return cnrTagsMap[nodeVersion.ID], nil
-}
-
-func (t *TreeServiceMock) PutObjectTagging(_ context.Context, bktInfo *data.BucketInfo, nodeVersion *data.NodeVersion, tagSet map[string]string) error {
-	cnrTagsMap, ok := t.tags[bktInfo.CID.EncodeToString()]
-	if !ok {
-		t.tags[bktInfo.CID.EncodeToString()] = map[uint64]map[string]string{
-			nodeVersion.ID: tagSet,
-		}
-		return nil
-	}
-
-	cnrTagsMap[nodeVersion.ID] = tagSet
-
-	return nil
-}
-
-func (t *TreeServiceMock) DeleteObjectTagging(_ context.Context, bktInfo *data.BucketInfo, objVersion *data.NodeVersion) error {
-	cnrTagsMap, ok := t.tags[bktInfo.CID.EncodeToString()]
-	if !ok {
-		return nil
-	}
-
-	delete(cnrTagsMap, objVersion.ID)
-	return nil
-}
-
 func (t *TreeServiceMock) GetBucketTagging(_ context.Context, _ *data.BucketInfo) (map[string]string, error) {
 	// TODO implement me
 	panic("implement me")
@@ -114,102 +80,6 @@ func (t *TreeServiceMock) DeleteBucketCORS(_ context.Context, _ *data.BucketInfo
 	panic("implement me")
 }
 
-func (t *TreeServiceMock) GetVersions(_ context.Context, bktInfo *data.BucketInfo, objectName string) ([]*data.NodeVersion, error) {
-	cnrVersionsMap, ok := t.versions[bktInfo.CID.EncodeToString()]
-	if !ok {
-		return nil, ErrNodeNotFound
-	}
-
-	versions, ok := cnrVersionsMap[objectName]
-	if !ok {
-		return nil, ErrNodeNotFound
-	}
-
-	return versions, nil
-}
-
-func (t *TreeServiceMock) GetLatestVersion(_ context.Context, bktInfo *data.BucketInfo, objectName string) (*data.NodeVersion, error) {
-	cnrVersionsMap, ok := t.versions[bktInfo.CID.EncodeToString()]
-	if !ok {
-		return nil, ErrNodeNotFound
-	}
-
-	versions, ok := cnrVersionsMap[objectName]
-	if !ok {
-		return nil, ErrNodeNotFound
-	}
-
-	slices.SortFunc(versions, func(a, b *data.NodeVersion) int {
-		return cmp.Compare(a.ID, b.ID)
-	})
-
-	if len(versions) != 0 {
-		return versions[len(versions)-1], nil
-	}
-
-	return nil, ErrNodeNotFound
-}
-
-func (t *TreeServiceMock) GetUnversioned(_ context.Context, bktInfo *data.BucketInfo, objectName string) (*data.NodeVersion, error) {
-	cnrVersionsMap, ok := t.versions[bktInfo.CID.EncodeToString()]
-	if !ok {
-		return nil, ErrNodeNotFound
-	}
-
-	versions, ok := cnrVersionsMap[objectName]
-	if !ok {
-		return nil, ErrNodeNotFound
-	}
-
-	for _, version := range versions {
-		if version.IsUnversioned {
-			return version, nil
-		}
-	}
-
-	return nil, ErrNodeNotFound
-}
-
-func (t *TreeServiceMock) AddVersion(_ context.Context, bktInfo *data.BucketInfo, newVersion *data.NodeVersion) (uint64, error) {
-	cnrVersionsMap, ok := t.versions[bktInfo.CID.EncodeToString()]
-	if !ok {
-		t.versions[bktInfo.CID.EncodeToString()] = map[string][]*data.NodeVersion{
-			newVersion.FilePath: {newVersion},
-		}
-		return newVersion.ID, nil
-	}
-
-	versions, ok := cnrVersionsMap[newVersion.FilePath]
-	if !ok {
-		cnrVersionsMap[newVersion.FilePath] = []*data.NodeVersion{newVersion}
-		return newVersion.ID, nil
-	}
-
-	slices.SortFunc(versions, func(a, b *data.NodeVersion) int {
-		return cmp.Compare(a.ID, b.ID)
-	})
-
-	if len(versions) != 0 {
-		newVersion.ID = versions[len(versions)-1].ID + 1
-		newVersion.Timestamp = versions[len(versions)-1].Timestamp + 1
-	}
-
-	result := versions
-
-	if newVersion.IsUnversioned {
-		result = make([]*data.NodeVersion, 0, len(versions))
-		for _, node := range versions {
-			if !node.IsUnversioned {
-				result = append(result, node)
-			}
-		}
-	}
-
-	cnrVersionsMap[newVersion.FilePath] = append(result, newVersion)
-
-	return newVersion.ID, nil
-}
-
 func (t *TreeServiceMock) CreateMultipartUpload(_ context.Context, bktInfo *data.BucketInfo, info *data.MultipartInfo) (uint64, error) {
 	cnrMultipartsMap, ok := t.multiparts[bktInfo.CID.EncodeToString()]
 	if !ok {

diff --git a/api/layer/tree_service.go b/api/layer/tree_service.go
@@ -44,19 +44,10 @@ type TreeService interface {
 	// If object id to remove is not found returns ErrNoNodeToRemove error.
 	DeleteBucketCORS(ctx context.Context, bktInfo *data.BucketInfo) (oid.ID, error)
 
-	GetObjectTagging(ctx context.Context, bktInfo *data.BucketInfo, objVersion *data.NodeVersion) (map[string]string, error)
-	PutObjectTagging(ctx context.Context, bktInfo *data.BucketInfo, objVersion *data.NodeVersion, tagSet map[string]string) error
-	DeleteObjectTagging(ctx context.Context, bktInfo *data.BucketInfo, objVersion *data.NodeVersion) error
-
 	GetBucketTagging(ctx context.Context, bktInfo *data.BucketInfo) (map[string]string, error)
 	PutBucketTagging(ctx context.Context, bktInfo *data.BucketInfo, tagSet map[string]string) error
 	DeleteBucketTagging(ctx context.Context, bktInfo *data.BucketInfo) error
 
-	GetVersions(ctx context.Context, bktInfo *data.BucketInfo, objectName string) ([]*data.NodeVersion, error)
-	GetLatestVersion(ctx context.Context, bktInfo *data.BucketInfo, objectName string) (*data.NodeVersion, error)
-	GetUnversioned(ctx context.Context, bktInfo *data.BucketInfo, objectName string) (*data.NodeVersion, error)
-	AddVersion(ctx context.Context, bktInfo *data.BucketInfo, newVersion *data.NodeVersion) (uint64, error)
-
 	CreateMultipartUpload(ctx context.Context, bktInfo *data.BucketInfo, info *data.MultipartInfo) (uint64, error)
 	DeleteMultipartUpload(ctx context.Context, bktInfo *data.BucketInfo, multipartNodeID uint64) error
 	GetMultipartUploadsByPrefix(ctx context.Context, bktInfo *data.BucketInfo, prefix string) ([]*data.MultipartInfo, error)