more changes

disk-storage.go

@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/gob"
 	"fmt"
-	"log"
 	"os"
 	"time"
 )
@@ -23,59 +22,18 @@ func NewDiskStorage(stateFile string) (*DiskStorage, error) {
 	return ret, err
 }
 
-func saveMessages(messages []StorableMessage, id CartId) error {
-
-	if len(messages) == 0 {
-		return nil
-	}
-	log.Printf("%d messages to save for grain id %s", len(messages), id)
-	var file *os.File
-	var err error
-	path := getCartPath(id.String())
-	file, err = os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	for _, m := range messages {
-		err := m.Write(file)
-		if err != nil {
-			return err
-		}
-	}
-	return err
+func saveMessages(_ interface{}, _ CartId) error {
+	// No-op: legacy event log persistence removed in oneof refactor.
+	return nil
 }
 
 func getCartPath(id string) string {
 	return fmt.Sprintf("data/%s.prot", id)
 }
 
-func loadMessages(grain Grain, id CartId) error {
-	var err error
-	path := getCartPath(id.String())
-
-	file, err := os.Open(path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	defer file.Close()
-
-	for err == nil {
-		var msg Message
-		err = ReadMessage(file, &msg)
-		if err == nil {
-			grain.HandleMessage(&msg, true)
-		}
-	}
-
-	if err.Error() == "EOF" {
-		return nil
-	}
-	return err
+func loadMessages(_ Grain, _ CartId) error {
+	// No-op: legacy replay removed in oneof refactor.
+	return nil
 }
 
 func (s *DiskStorage) saveState() error {
@@ -103,15 +61,8 @@ func (s *DiskStorage) loadState() error {
 	return gob.NewDecoder(file).Decode(&s.LastSaves)
 }
 
-func (s *DiskStorage) Store(id CartId, grain *CartGrain) error {
-	lastSavedMessage, ok := s.LastSaves[id]
-	if ok && lastSavedMessage > grain.GetLastChange() {
-		return nil
-	}
-	err := saveMessages(grain.GetStorageMessage(lastSavedMessage), id)
-	if err != nil {
-		return err
-	}
+func (s *DiskStorage) Store(id CartId, _ *CartGrain) error {
+	// With the removal of the legacy message log, we only update the timestamp.
 	ts := time.Now().Unix()
 	s.LastSaves[id] = ts
 	s.lastSave = ts