From 9e2df4b7c73884368b2e6a06c5a55ff51d59f65a Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Mon, 3 Apr 2023 16:11:56 +0300 Subject: [PATCH] [#203] node: Fix double imports Signed-off-by: Dmitrii Stepanov --- cmd/frostfs-cli/modules/object/head.go | 3 +-- pkg/innerring/initialization.go | 15 +++++++-------- pkg/local_object_storage/metabase/db_test.go | 5 ++--- pkg/local_object_storage/metabase/put.go | 9 ++++----- pkg/local_object_storage/pilorama/forest.go | 19 +++++++++---------- pkg/local_object_storage/shard/gc_test.go | 5 ++--- pkg/morph/client/container/get.go | 3 +-- pkg/services/object/get/util.go | 3 +-- .../object_manager/tombstone/source/source.go | 3 +-- pkg/services/tree/sync.go | 5 ++--- 10 files changed, 30 insertions(+), 40 deletions(-) diff --git a/cmd/frostfs-cli/modules/object/head.go b/cmd/frostfs-cli/modules/object/head.go index fc2e7c9c6..139563e24 100644 --- a/cmd/frostfs-cli/modules/object/head.go +++ b/cmd/frostfs-cli/modules/object/head.go @@ -15,7 +15,6 @@ import ( cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" - oidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) @@ -113,7 +112,7 @@ func marshalHeader(cmd *cobra.Command, hdr *object.Object) ([]byte, error) { } } -func printObjectID(cmd *cobra.Command, recv func() (oidSDK.ID, bool)) { +func printObjectID(cmd *cobra.Command, recv func() (oid.ID, bool)) { var strID string id, ok := recv() diff --git a/pkg/innerring/initialization.go b/pkg/innerring/initialization.go index 30b8d43a0..8db6328a2 100644 --- a/pkg/innerring/initialization.go +++ b/pkg/innerring/initialization.go @@ -25,7 +25,6 @@ import ( auditClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/audit" balanceClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/balance" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" - cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" frostfsClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" @@ -229,7 +228,7 @@ func (s *Server) createSettlementProcessor(clientCache *ClientCache, cnrClient * // create settlement processor dependencies settlementDeps := settlementDeps{ log: s.log, - cnrSrc: cntClient.AsContainerSource(cnrClient), + cnrSrc: container.AsContainerSource(cnrClient), auditClient: s.auditClient, nmClient: s.netmapClient, clientCache: clientCache, @@ -545,7 +544,7 @@ func (s *Server) initGRPCServer(cfg *viper.Viper) error { } type serverMorphClients struct { - CnrClient *cntClient.Client + CnrClient *container.Client FrostFSIDClient *frostfsid.Client FrostFSClient *frostfsClient.Client MorphSubnetClient *morphsubnet.Client @@ -564,21 +563,21 @@ func (s *Server) initClientsFromMorph() (*serverMorphClients, error) { } // form morph container client's options - morphCnrOpts := make([]cntClient.Option, 0, 3) + morphCnrOpts := make([]container.Option, 0, 3) morphCnrOpts = append(morphCnrOpts, - cntClient.TryNotary(), - cntClient.AsAlphabet(), + container.TryNotary(), + container.AsAlphabet(), ) if s.sideNotaryConfig.disabled { // in non-notary environments we customize fee for named container registration // because it takes much more additional GAS than other operations. morphCnrOpts = append(morphCnrOpts, - cntClient.WithCustomFeeForNamedPut(s.feeConfig.NamedContainerRegistrationFee()), + container.WithCustomFeeForNamedPut(s.feeConfig.NamedContainerRegistrationFee()), ) } - result.CnrClient, err = cntClient.NewFromMorph(s.morphClient, s.contracts.container, fee, morphCnrOpts...) + result.CnrClient, err = container.NewFromMorph(s.morphClient, s.contracts.container, fee, morphCnrOpts...) if err != nil { return nil, err } diff --git a/pkg/local_object_storage/metabase/db_test.go b/pkg/local_object_storage/metabase/db_test.go index cdb90cc16..9ef7bf8bc 100644 --- a/pkg/local_object_storage/metabase/db_test.go +++ b/pkg/local_object_storage/metabase/db_test.go @@ -9,7 +9,6 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" @@ -26,11 +25,11 @@ func (s epochState) CurrentEpoch() uint64 { } // saves "big" object in DB. -func putBig(db *meta.DB, obj *object.Object) error { +func putBig(db *meta.DB, obj *objectSDK.Object) error { return metaPut(db, obj, nil) } -func testSelect(t *testing.T, db *meta.DB, cnr cid.ID, fs object.SearchFilters, exp ...oid.Address) { +func testSelect(t *testing.T, db *meta.DB, cnr cid.ID, fs objectSDK.SearchFilters, exp ...oid.Address) { res, err := metaSelect(db, cnr, fs) require.NoError(t, err) require.Len(t, res, len(exp)) diff --git a/pkg/local_object_storage/metabase/put.go b/pkg/local_object_storage/metabase/put.go index 8e11c5d9c..b0fea6535 100644 --- a/pkg/local_object_storage/metabase/put.go +++ b/pkg/local_object_storage/metabase/put.go @@ -6,7 +6,6 @@ import ( "fmt" gio "io" - "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" @@ -89,7 +88,7 @@ func (db *DB) put(tx *bbolt.Tx, isParent := si != nil - exists, err := db.exists(tx, object.AddressOf(obj), currEpoch) + exists, err := db.exists(tx, objectCore.AddressOf(obj), currEpoch) if errors.As(err, &splitInfoError) { exists = true // object exists, however it is virtual @@ -111,14 +110,14 @@ func (db *DB) updateObj(tx *bbolt.Tx, obj *objectSDK.Object, id []byte, si *obje // When storage engine moves objects between different sub-storages, // it calls metabase.Put method with new storage ID, thus triggering this code. if !isParent && id != nil { - return updateStorageID(tx, object.AddressOf(obj), id) + return updateStorageID(tx, objectCore.AddressOf(obj), id) } // when storage already has last object in split hierarchy and there is // a linking object to put (or vice versa), we should update split info // with object ids of these objects if isParent { - return updateSplitInfo(tx, object.AddressOf(obj), si) + return updateSplitInfo(tx, objectCore.AddressOf(obj), si) } return nil @@ -184,7 +183,7 @@ func putUniqueIndexes( id []byte, ) error { isParent := si != nil - addr := object.AddressOf(obj) + addr := objectCore.AddressOf(obj) cnr := addr.Container() objKey := objectKey(addr.Object(), make([]byte, objectKeySize)) diff --git a/pkg/local_object_storage/pilorama/forest.go b/pkg/local_object_storage/pilorama/forest.go index 21209420a..fa2f1dcd2 100644 --- a/pkg/local_object_storage/pilorama/forest.go +++ b/pkg/local_object_storage/pilorama/forest.go @@ -6,7 +6,6 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" - cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) // memoryForest represents multiple replicating trees sharing a single storage. @@ -120,7 +119,7 @@ func (f *memoryForest) Close() error { } // TreeGetByPath implements the Forest interface. -func (f *memoryForest) TreeGetByPath(cid cidSDK.ID, treeID string, attr string, path []string, latest bool) ([]Node, error) { +func (f *memoryForest) TreeGetByPath(cid cid.ID, treeID string, attr string, path []string, latest bool) ([]Node, error) { if !isAttributeInternal(attr) { return nil, ErrNotPathAttribute } @@ -135,7 +134,7 @@ func (f *memoryForest) TreeGetByPath(cid cidSDK.ID, treeID string, attr string, } // TreeGetMeta implements the Forest interface. -func (f *memoryForest) TreeGetMeta(cid cidSDK.ID, treeID string, nodeID Node) (Meta, Node, error) { +func (f *memoryForest) TreeGetMeta(cid cid.ID, treeID string, nodeID Node) (Meta, Node, error) { fullID := cid.String() + "/" + treeID s, ok := f.treeMap[fullID] if !ok { @@ -146,7 +145,7 @@ func (f *memoryForest) TreeGetMeta(cid cidSDK.ID, treeID string, nodeID Node) (M } // TreeGetChildren implements the Forest interface. -func (f *memoryForest) TreeGetChildren(cid cidSDK.ID, treeID string, nodeID Node) ([]uint64, error) { +func (f *memoryForest) TreeGetChildren(cid cid.ID, treeID string, nodeID Node) ([]uint64, error) { fullID := cid.String() + "/" + treeID s, ok := f.treeMap[fullID] if !ok { @@ -164,7 +163,7 @@ func (f *memoryForest) TreeGetChildren(cid cidSDK.ID, treeID string, nodeID Node } // TreeGetOpLog implements the pilorama.Forest interface. -func (f *memoryForest) TreeGetOpLog(cid cidSDK.ID, treeID string, height uint64) (Move, error) { +func (f *memoryForest) TreeGetOpLog(cid cid.ID, treeID string, height uint64) (Move, error) { fullID := cid.String() + "/" + treeID s, ok := f.treeMap[fullID] if !ok { @@ -181,7 +180,7 @@ func (f *memoryForest) TreeGetOpLog(cid cidSDK.ID, treeID string, height uint64) } // TreeDrop implements the pilorama.Forest interface. -func (f *memoryForest) TreeDrop(cid cidSDK.ID, treeID string) error { +func (f *memoryForest) TreeDrop(cid cid.ID, treeID string) error { cidStr := cid.String() if treeID == "" { for k := range f.treeMap { @@ -201,7 +200,7 @@ func (f *memoryForest) TreeDrop(cid cidSDK.ID, treeID string) error { } // TreeList implements the pilorama.Forest interface. -func (f *memoryForest) TreeList(cid cidSDK.ID) ([]string, error) { +func (f *memoryForest) TreeList(cid cid.ID) ([]string, error) { var res []string cidStr := cid.EncodeToString() @@ -218,14 +217,14 @@ func (f *memoryForest) TreeList(cid cidSDK.ID) ([]string, error) { } // TreeExists implements the pilorama.Forest interface. -func (f *memoryForest) TreeExists(cid cidSDK.ID, treeID string) (bool, error) { +func (f *memoryForest) TreeExists(cid cid.ID, treeID string) (bool, error) { fullID := cid.EncodeToString() + "/" + treeID _, ok := f.treeMap[fullID] return ok, nil } // TreeUpdateLastSyncHeight implements the pilorama.Forest interface. -func (f *memoryForest) TreeUpdateLastSyncHeight(cid cidSDK.ID, treeID string, height uint64) error { +func (f *memoryForest) TreeUpdateLastSyncHeight(cid cid.ID, treeID string, height uint64) error { fullID := cid.EncodeToString() + "/" + treeID t, ok := f.treeMap[fullID] if !ok { @@ -236,7 +235,7 @@ func (f *memoryForest) TreeUpdateLastSyncHeight(cid cidSDK.ID, treeID string, he } // TreeLastSyncHeight implements the pilorama.Forest interface. -func (f *memoryForest) TreeLastSyncHeight(cid cidSDK.ID, treeID string) (uint64, error) { +func (f *memoryForest) TreeLastSyncHeight(cid cid.ID, treeID string) (uint64, error) { fullID := cid.EncodeToString() + "/" + treeID t, ok := f.treeMap[fullID] if !ok { diff --git a/pkg/local_object_storage/shard/gc_test.go b/pkg/local_object_storage/shard/gc_test.go index 245669ff1..e7aa3614e 100644 --- a/pkg/local_object_storage/shard/gc_test.go +++ b/pkg/local_object_storage/shard/gc_test.go @@ -17,7 +17,6 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/panjf2000/ants/v2" @@ -42,7 +41,7 @@ func Test_GCDropsLockedExpiredObject(t *testing.T) { blobovniczatree.WithRootPath(filepath.Join(rootPath, "blob", "blobovnicza")), blobovniczatree.WithBlobovniczaShallowDepth(2), blobovniczatree.WithBlobovniczaShallowWidth(2)), - Policy: func(_ *object.Object, data []byte) bool { + Policy: func(_ *objectSDK.Object, data []byte) bool { return len(data) <= 1<<20 }, }, @@ -93,7 +92,7 @@ func Test_GCDropsLockedExpiredObject(t *testing.T) { lockExpirationAttr.SetValue("103") lock := testutil.GenerateObjectWithCID(cnr) - lock.SetType(object.TypeLock) + lock.SetType(objectSDK.TypeLock) lock.SetAttributes(lockExpirationAttr) lockID, _ := lock.ID() diff --git a/pkg/morph/client/container/get.go b/pkg/morph/client/container/get.go index 8d68141a5..4775cd281 100644 --- a/pkg/morph/client/container/get.go +++ b/pkg/morph/client/container/get.go @@ -8,7 +8,6 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" containerContract "git.frostfs.info/TrueCloudLab/frostfs-contract/container" containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" - core "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" @@ -23,7 +22,7 @@ func (x *containerSource) Get(cnr cid.ID) (*containercore.Container, error) { // AsContainerSource provides container Source interface // from Wrapper instance. -func AsContainerSource(w *Client) core.Source { +func AsContainerSource(w *Client) containercore.Source { return (*containerSource)(w) } diff --git a/pkg/services/object/get/util.go b/pkg/services/object/get/util.go index 7986d05c0..3bb68862b 100644 --- a/pkg/services/object/get/util.go +++ b/pkg/services/object/get/util.go @@ -9,7 +9,6 @@ import ( coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - internal "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -196,7 +195,7 @@ func (c *clientWrapper) get(ctx context.Context, exec *execCtx, key *ecdsa.Priva prm.SetRawFlag() } - res, err := internal.GetObject(prm) + res, err := internalclient.GetObject(prm) if err != nil { return nil, err } diff --git a/pkg/services/object_manager/tombstone/source/source.go b/pkg/services/object_manager/tombstone/source/source.go index 8dd0dcabb..4d0a81cde 100644 --- a/pkg/services/object_manager/tombstone/source/source.go +++ b/pkg/services/object_manager/tombstone/source/source.go @@ -8,7 +8,6 @@ import ( getsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) @@ -59,7 +58,7 @@ func (h *headerWriter) WriteHeader(_ context.Context, o *objectSDK.Object) error // Tombstone checks if the engine stores tombstone. // Returns nil, nil if the tombstone has been removed // or marked for removal. -func (s Source) Tombstone(ctx context.Context, a oid.Address, _ uint64) (*object.Object, error) { +func (s Source) Tombstone(ctx context.Context, a oid.Address, _ uint64) (*objectSDK.Object, error) { var hr headerWriter var headPrm getsvc.HeadPrm diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index d4ef7df5d..2d5c104b0 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -14,7 +14,6 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" - cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/panjf2000/ants/v2" "go.uber.org/zap" @@ -123,7 +122,7 @@ func (s *Service) SynchronizeTree(ctx context.Context, cid cid.ID, treeID string return nil } -func (s *Service) synchronizeTree(ctx context.Context, cid cidSDK.ID, from uint64, +func (s *Service) synchronizeTree(ctx context.Context, cid cid.ID, from uint64, treeID string, nodes []netmapSDK.NodeInfo) uint64 { s.log.Debug("synchronize tree", zap.Stringer("cid", cid), @@ -170,7 +169,7 @@ func (s *Service) synchronizeTree(ctx context.Context, cid cidSDK.ID, from uint6 return newHeight } -func (s *Service) synchronizeSingle(ctx context.Context, cid cidSDK.ID, treeID string, height uint64, treeClient TreeServiceClient) (uint64, error) { +func (s *Service) synchronizeSingle(ctx context.Context, cid cid.ID, treeID string, height uint64, treeClient TreeServiceClient) (uint64, error) { rawCID := make([]byte, sha256.Size) cid.Encode(rawCID)