Rewriting bunch, cleaning bunch, happy bunch

benchmark/helpers.go

@@ -2,24 +2,25 @@ package benchmark
 
 import (
 	"crypto/rand"
-	"github.com/unpackdev/fdb"
+	"github.com/unpackdev/fdb/messages"
+	"github.com/unpackdev/fdb/types"
 )
 
 // createWriteMessage generates a random write message
-func createWriteMessage() fdb.Message {
+func createWriteMessage() messages.Message {
 	var key [32]byte
 	_, _ = rand.Read(key[:])
-	return fdb.Message{
-		Handler: fdb.WriteHandlerType,
+	return messages.Message{
+		Handler: types.WriteHandlerType,
 		Key:     key,
 		Data:    []byte("benchmark test data"),
 	}
 }
 
 // createReadMessage generates a read message for a given key
-func createReadMessage(key [32]byte) fdb.Message {
-	return fdb.Message{
-		Handler: fdb.ReadHandlerType,
+func createReadMessage(key [32]byte) messages.Message {
+	return messages.Message{
+		Handler: types.ReadHandlerType,
 		Key:     key,
 	}
 }

fdb.go

@@ -5,14 +5,15 @@ import (
 	"github.com/pkg/errors"
 	"github.com/unpackdev/fdb/config"
 	"github.com/unpackdev/fdb/db"
+	"github.com/unpackdev/fdb/transports"
 	transport_quic "github.com/unpackdev/fdb/transports/quic"
 	"github.com/unpackdev/fdb/types"
 )
 
 type FDB struct {
 	ctx              context.Context
 	config           config.Config
-	transportManager *TransportManager
+	transportManager *transports.Manager
 	dbManager        *db.Manager
 }
 
@@ -22,7 +23,7 @@ func New(ctx context.Context, cnf config.Config) (*FDB, error) {
 	}
 
 	// Create a new transport manager
-	transportManager := NewTransportManager()
+	transportManager := transports.NewManager()
 
 	dbM, dbmErr := db.NewManager(ctx, cnf.MdbxNodes)
 	if dbmErr != nil {
@@ -47,14 +48,14 @@ func New(ctx context.Context, cnf config.Config) (*FDB, error) {
 				return nil, errors.Wrap(err, "failed to register QUIC transport")
 			}
 
-		case config.UdsTransport:
-			udsServer, err := NewUDSServer(t.IPv4)
-			if err != nil {
-				return nil, errors.Wrap(err, "failed to create UDS server")
-			}
-			if err := transportManager.RegisterTransport(types.UDSTransportType, udsServer); err != nil {
-				return nil, errors.Wrap(err, "failed to register UDS transport")
-			}
+			/*		case config.UdsTransport:
+					udsServer, err := NewUDSServer(t.IPv4)
+					if err != nil {
+						return nil, errors.Wrap(err, "failed to create UDS server")
+					}
+					if err := transportManager.RegisterTransport(types.UDSTransportType, udsServer); err != nil {
+						return nil, errors.Wrap(err, "failed to register UDS transport")
+					}*/
 		default:
 			return nil, errors.New("unknown transport type")
 		}
@@ -71,11 +72,11 @@ func (fdb *FDB) GetDbManager() *db.Manager {
 	return fdb.dbManager
 }
 
-func (fdb *FDB) GetTransportManager() *TransportManager {
+func (fdb *FDB) GetTransportManager() *transports.Manager {
 	return fdb.transportManager
 }
 
 // GetTransportByType allows retrieval of specific transport from the manager
-func (fdb *FDB) GetTransportByType(tType types.TransportType) (Transport, error) {
+func (fdb *FDB) GetTransportByType(tType types.TransportType) (transports.Transport, error) {
 	return fdb.transportManager.GetTransport(tType)
 }

transport_manager.go → transports/manager.go

@@ -1,24 +1,24 @@
-package fdb
+package transports
 
 import (
 	"errors"
 	"github.com/unpackdev/fdb/types"
 	"sync"
 )
 
-// TransportManager is responsible for managing different transport servers
-type TransportManager struct {
+// Manager is responsible for managing different transport servers
+type Manager struct {
 	transports map[types.TransportType]Transport // Holds references to different transports
 	mu         sync.Mutex
 }
 
-func NewTransportManager() *TransportManager {
-	return &TransportManager{
+func NewManager() *Manager {
+	return &Manager{
 		transports: make(map[types.TransportType]Transport),
 	}
 }
 
-func (tm *TransportManager) RegisterTransport(tType types.TransportType, transport Transport) error {
+func (tm *Manager) RegisterTransport(tType types.TransportType, transport Transport) error {
 	tm.mu.Lock()
 	defer tm.mu.Unlock()
 
@@ -30,7 +30,7 @@ func (tm *TransportManager) RegisterTransport(tType types.TransportType, transpo
 	return nil
 }
 
-func (tm *TransportManager) GetTransport(tType types.TransportType) (Transport, error) {
+func (tm *Manager) GetTransport(tType types.TransportType) (Transport, error) {
 	tm.mu.Lock()
 	defer tm.mu.Unlock()
 
@@ -42,7 +42,7 @@ func (tm *TransportManager) GetTransport(tType types.TransportType) (Transport,
 	return transport, nil
 }
 
-func (tm *TransportManager) DeregisterTransport(tType types.TransportType) error {
+func (tm *Manager) DeregisterTransport(tType types.TransportType) error {
 	tm.mu.Lock()
 	defer tm.mu.Unlock()
 

tcp_server.go → transports/tcp/tcp_server.go

@@ -1,4 +1,4 @@
-package fdb
+package tcp
 
 /*
 import (

tcp_server_test.go → transports/tcp/tcp_server_test.go

@@ -1,4 +1,4 @@
-package fdb
+package tcp
 
 /*
 import (

transport.go → transports/transport.go

@@ -1,3 +1,3 @@
-package fdb
+package transports
 
 type Transport interface{}