better

pkg/actor/simple_grain_pool.go

@@ -6,17 +6,20 @@ import (
 	"maps"
 	"sync"
 	"time"
+
+	"github.com/gogo/protobuf/proto"
 )
 
 type SimpleGrainPool[V any] struct {
 	// fields and methods
-	localMu sync.RWMutex
-	grains  map[uint64]Grain[V]
-
-	spawn     func(id uint64) (Grain[V], error)
-	spawnHost func(host string) (Host, error)
-	ttl       time.Duration
-	poolSize  int
+	localMu          sync.RWMutex
+	grains           map[uint64]Grain[V]
+	mutationRegistry MutationRegistry
+	spawn            func(id uint64) (Grain[V], error)
+	spawnHost        func(host string) (Host, error)
+	storage          LogStorage[V]
+	ttl              time.Duration
+	poolSize         int
 
 	// Cluster coordination --------------------------------------------------
 	hostname     string
@@ -29,17 +32,28 @@ type SimpleGrainPool[V any] struct {
 	purgeTicker *time.Ticker
 }
 
-func NewSimpleGrainPool[V any](size int, ttl time.Duration, hostname string, spawn func(id uint64) (Grain[V], error), spawnHost func(host string) (Host, error)) (*SimpleGrainPool[V], error) {
-	p := &SimpleGrainPool[V]{
-		grains: make(map[uint64]Grain[V]),
+type GrainPoolConfig[V any] struct {
+	Hostname         string
+	Spawn            func(id uint64) (Grain[V], error)
+	SpawnHost        func(host string) (Host, error)
+	TTL              time.Duration
+	PoolSize         int
+	MutationRegistry MutationRegistry
+	Storage          LogStorage[V]
+}
 
-		spawn:        spawn,
-		spawnHost:    spawnHost,
-		ttl:          ttl,
-		poolSize:     size,
-		hostname:     hostname,
-		remoteOwners: make(map[uint64]Host),
-		remoteHosts:  make(map[string]Host),
+func NewSimpleGrainPool[V any](config GrainPoolConfig[V]) (*SimpleGrainPool[V], error) {
+	p := &SimpleGrainPool[V]{
+		grains:           make(map[uint64]Grain[V]),
+		mutationRegistry: config.MutationRegistry,
+		storage:          config.Storage,
+		spawn:            config.Spawn,
+		spawnHost:        config.SpawnHost,
+		ttl:              config.TTL,
+		poolSize:         config.PoolSize,
+		hostname:         config.Hostname,
+		remoteOwners:     make(map[uint64]Host),
+		remoteHosts:      make(map[string]Host),
 	}
 
 	p.purgeTicker = time.NewTicker(time.Minute)
@@ -344,38 +358,22 @@ func (p *SimpleGrainPool[V]) getOrClaimGrain(id uint64) (Grain[V], error) {
 	return grain, nil
 }
 
-// ErrNotOwner is returned when a cart belongs to another host.
-var ErrNotOwner = fmt.Errorf("not owner")
+// // ErrNotOwner is returned when a cart belongs to another host.
+// var ErrNotOwner = fmt.Errorf("not owner")
 
 // Apply applies a mutation to a grain.
-func (p *SimpleGrainPool[V]) Apply(id uint64, mutation any) (*V, error) {
+func (p *SimpleGrainPool[V]) Apply(id uint64, mutation proto.Message) (*V, error) {
 	grain, err := p.getOrClaimGrain(id)
 	if err != nil {
 		return nil, err
 	}
-	//start := time.Now()
-	result, applyErr := grain.Apply(mutation, false)
-	//mutationType := "unknown"
-	// if mutation != nil {
-	// 	if t := reflect.TypeOf(mutation); t != nil {
-	// 		if t.Kind() == reflect.Pointer {
-	// 			t = t.Elem()
-	// 		}
-	// 		if t.Name() != "" {
-	// 			mutationType = t.Name()
-	// 		}
-	// 	}
-	// }
-	// cartMutationLatencySeconds.WithLabelValues(mutationType).Observe(time.Since(start).Seconds())
-
-	// if applyErr == nil && result != nil {
-	// 	cartMutationsTotal.Inc()
-
-	// } else if applyErr != nil {
-	// 	cartMutationFailuresTotal.Inc()
-	// }
-
-	return result, applyErr
+	if applyErr := p.mutationRegistry.Apply(grain, mutation); applyErr != nil {
+		return nil, applyErr
+	}
+	if err := p.storage.AppendEvent(id, mutation); err != nil {
+		log.Printf("failed to store mutation for grain %d: %v", id, err)
+	}
+	return grain.GetCurrentState()
 }
 
 // Get returns the current state of a grain.