WIP

Signed-off-by: Leonard Lyubich <[email protected]>

cmd/neofs-lens/internal/meta/inspect.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal"
-	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza"
 	meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase"
 	"github.com/nspcc-dev/neofs-sdk-go/object"
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
@@ -40,7 +39,7 @@ func inspectFunc(cmd *cobra.Command, _ []string) {
 	common.ExitOnErr(cmd, common.Errf("could not check if the obj is small: %w", err))
 
 	if id := resStorageID.StorageID(); id != nil {
-		cmd.Printf("Object storageID: %s\n\n", blobovnicza.NewIDFromBytes(id).String())
+		cmd.Printf("Object storageID: %s\n\n", id)
 	} else {
 		cmd.Printf("Object does not contain storageID\n\n")
 	}

cmd/neofs-lens/root.go

@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	"github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal/blobovnicza"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal/meta"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal/writecache"
 	"github.com/nspcc-dev/neofs-node/misc"
@@ -35,7 +34,6 @@ func init() {
 	command.SetOut(os.Stdout)
 	command.Flags().Bool("version", false, "Application version")
 	command.AddCommand(
-		blobovnicza.Root,
 		meta.Root,
 		writecache.Root,
 		gendoc.Command(command),

cmd/neofs-node/config.go

@@ -23,7 +23,6 @@ import (
 	contractsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/contracts"
 	engineconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine"
 	shardconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard"
-	blobovniczaconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza"
 	fstreeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/fstree"
 	loggerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/logger"
 	metricsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/metrics"
@@ -34,8 +33,8 @@ import (
 	"github.com/nspcc-dev/neofs-node/pkg/core/container"
 	netmapCore "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor"
-	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
+	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/peapod"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
 	meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama"
@@ -159,16 +158,13 @@ func (c *shardCfg) id() string {
 
 type subStorageCfg struct {
 	// common for all storages
-	typ    string
-	path   string
+	typ  string
+	path string
+
+	// fstree-specific
 	perm   fs.FileMode
 	depth  uint64
 	noSync bool
-
-	// blobovnicza-specific
-	size            uint64
-	width           uint64
-	openedCacheSize int
 }
 
 // readConfig fills applicationConfiguration with raw configuration values
@@ -254,13 +250,7 @@ func (a *applicationConfiguration) readConfig(c *config.Config) error {
 			sCfg.perm = storagesCfg[i].Perm()
 
 			switch storagesCfg[i].Type() {
-			case blobovniczatree.Type:
-				sub := blobovniczaconfig.From((*config.Config)(storagesCfg[i]))
-
-				sCfg.size = sub.Size()
-				sCfg.depth = sub.ShallowDepth()
-				sCfg.width = sub.ShallowWidth()
-				sCfg.openedCacheSize = sub.OpenedCacheSize()
+			case peapod.Type:
 			case fstree.Type:
 				sub := fstreeconfig.From((*config.Config)(storagesCfg[i]))
 				sCfg.depth = sub.Depth()
@@ -704,17 +694,9 @@ func (c *cfg) shardOpts() []shardOptsWithID {
 		var ss []blobstor.SubStorage
 		for _, sRead := range shCfg.subStorages {
 			switch sRead.typ {
-			case blobovniczatree.Type:
+			case peapod.Type:
 				ss = append(ss, blobstor.SubStorage{
-					Storage: blobovniczatree.NewBlobovniczaTree(
-						blobovniczatree.WithRootPath(sRead.path),
-						blobovniczatree.WithPermissions(sRead.perm),
-						blobovniczatree.WithBlobovniczaSize(sRead.size),
-						blobovniczatree.WithBlobovniczaShallowDepth(sRead.depth),
-						blobovniczatree.WithBlobovniczaShallowWidth(sRead.width),
-						blobovniczatree.WithOpenedCacheSize(sRead.openedCacheSize),
-
-						blobovniczatree.WithLogger(c.log)),
+					Storage: peapod.New(sRead.path, sRead.perm),
 					Policy: func(_ *objectSDK.Object, data []byte) bool {
 						return uint64(len(data)) < shCfg.smallSizeObjectLimit
 					},

cmd/neofs-node/config/engine/config_test.go

@@ -8,10 +8,10 @@ import (
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
 	engineconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine"
 	shardconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard"
-	blobovniczaconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza"
 	fstreeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/fstree"
 	piloramaconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/pilorama"
 	configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test"
+	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/peapod"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode"
 	"github.com/stretchr/testify/require"
 )
@@ -86,13 +86,9 @@ func TestEngineSection(t *testing.T) {
 				require.EqualValues(t, 102400, sc.SmallSizeLimit())
 
 				require.Equal(t, 2, len(ss))
-				blz := blobovniczaconfig.From((*config.Config)(ss[0]))
-				require.Equal(t, "tmp/0/blob/blobovnicza", ss[0].Path())
-				require.EqualValues(t, 0644, blz.BoltDB().Perm())
-				require.EqualValues(t, 4194304, blz.Size())
-				require.EqualValues(t, 1, blz.ShallowDepth())
-				require.EqualValues(t, 4, blz.ShallowWidth())
-				require.EqualValues(t, 50, blz.OpenedCacheSize())
+				require.Equal(t, peapod.Type, ss[0].Type())
+				require.Equal(t, "tmp/0/blob/peapod.db", ss[0].Path())
+				require.EqualValues(t, 0644, ss[0].Perm())
 
 				require.Equal(t, "tmp/0/blob", ss[1].Path())
 				require.EqualValues(t, 0644, ss[1].Perm())
@@ -133,12 +129,9 @@ func TestEngineSection(t *testing.T) {
 
 				require.Equal(t, 2, len(ss))
 
-				blz := blobovniczaconfig.From((*config.Config)(ss[0]))
-				require.Equal(t, "tmp/1/blob/blobovnicza", ss[0].Path())
-				require.EqualValues(t, 4194304, blz.Size())
-				require.EqualValues(t, 1, blz.ShallowDepth())
-				require.EqualValues(t, 4, blz.ShallowWidth())
-				require.EqualValues(t, 50, blz.OpenedCacheSize())
+				require.Equal(t, peapod.Type, ss[0].Type())
+				require.Equal(t, "tmp/1/blob/peapod.db", ss[0].Path())
+				require.EqualValues(t, 0644, ss[0].Perm())
 
 				require.Equal(t, "tmp/1/blob", ss[1].Path())
 				require.EqualValues(t, 0644, ss[1].Perm())

cmd/neofs-node/config/engine/shard/blobstor/config.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/storage"
-	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree"
 	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
+	"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/peapod"
 )
 
 // Config is a wrapper over the config section
@@ -28,7 +28,7 @@ func (x *Config) Storages() []*storage.Config {
 		switch typ {
 		case "":
 			return ss
-		case fstree.Type, blobovniczatree.Type:
+		case fstree.Type, peapod.Type:
 			sub := storage.From((*config.Config)(x).Sub(strconv.Itoa(i)))
 			ss = append(ss, sub)
 		default: