Separate returns from longer statement blocks

[onechat] / memory.go

diff --git a/memory.go b/memory.go
index 751a5dc2ba205c3fa6684fc02f13412e933f24a2..bcc10951921751aad707a32f7180799e023e9a18 100644 (file)
--- a/memory.go
+++ b/memory.go
@@ -139,24 +139,30 @@ func (m *Memory) Close() error {
 // Append logs a new message, adds it to the tree and the views, and starts the
 // builds that are ready, also the failed ones.
 func (m *Memory) Append(kind, text string) (Message, error) {
 // Append logs a new message, adds it to the tree and the views, and starts the
 // builds that are ready, also the failed ones.
 func (m *Memory) Append(kind, text string) (Message, error) {

+       return m.AppendDated(kind, text, "")
+}
+
+// AppendDated appends a message with its RFC 3339 date and builds its nodes. An
+// empty date uses the clock, as Append does.
+func (m *Memory) AppendDated(kind, text, date string) (Message, error) {

        m.mutex.Lock()
        defer m.mutex.Unlock()
 
        m.mutex.Lock()
        defer m.mutex.Unlock()
 

-       message, err := m.log.Append(kind, text)
+       message, err := m.log.AppendDated(kind, text, date)

        if err != nil {
        if err != nil {

-               return Message{}, err
+               return Message{}, fmt.Errorf("append dated log message: %w", err)

        }
 
        defer m.syncer.Written()
 
        err = m.addMessage(message)
        if err != nil {
        }
 
        defer m.syncer.Written()
 
        err = m.addMessage(message)
        if err != nil {

-               return Message{}, err
+               return Message{}, fmt.Errorf("add dated message to memory: %w", err)

        }
 
        err = m.save()
        if err != nil {
        }
 
        err = m.save()
        if err != nil {

-               return Message{}, err
+               return Message{}, fmt.Errorf("save dated message view: %w", err)

        }
 
        m.queue.Retry()
        }
 
        m.queue.Retry()


@@ -583,7 +589,7 @@ func (m *Memory) run(key NodeKey, task Task) {
 
 // failed logs the failed build of the node key with its cause err.
 func (m *Memory) failed(key NodeKey, err error) {
 
 // failed logs the failed build of the node key with its cause err.
 func (m *Memory) failed(key NodeKey, err error) {

-       m.logger.Printf("a summary of the chat failed, and it is tried again at the next message: node (%d, %d): %v", key.level, key.index, err)
+       m.logger.Printf("summary failed, retry at next message: node (%d, %d): %v", key.level, key.index, err)

 }
 
 // ready tells if both children of the node key are built and the node is not.
 }
 
 // ready tells if both children of the node key are built and the node is not.


@@ -627,6 +633,79 @@ func (m *Memory) Context(level, index int) string {
        return m.context(level, index)
 }
 
        return m.context(level, index)
 }
 

+// rebuildComplete checks the whole tree, not only the visible view. A compactor
+// can fail without an HTTP error, for example with an empty line. Such a failed
+// merge can be absent from the view and must prevent a swap.
+func (m *Memory) rebuildComplete() error {
+       m.mutex.Lock()
+       defer m.mutex.Unlock()
+
+       if len(m.queue.leaves) != 0 || len(m.queue.queued) != 0 {
+               return errors.New("rebuild failed: summary tree has unfinished nodes")
+       }
+
+       return nil
+}
+
+// buildModelLines returns the sizes of the nodes that the model wrote, in tree
+// order. A node that fits its source with no model call is not one of them.
+func (m *Memory) buildModelLines() ([]int, error) {
+       m.mutex.Lock()
+       defer m.mutex.Unlock()
+
+       keys, err := m.tree.Keys()
+       if err != nil {
+               return nil, fmt.Errorf("list built nodes: %w", err)
+       }
+
+       var sizes []int
+       for _, key := range keys {
+               var node Node
+
+               node, _, err = m.tree.Node(key.level, key.index)
+               if err != nil {
+                       return nil, fmt.Errorf("read built node: %w", err)
+               }
+
+               var model bool
+
+               model, err = m.buildBuiltByModel(key)
+               if err != nil {
+                       return nil, fmt.Errorf("check model source: %w", err)
+               }
+
+               if model {
+                       sizes = append(sizes, node.Size)
+               }
+       }
+
+       return sizes, nil
+}
+
+// buildBuiltByModel tells if the node key needed a model call: a leaf whose
+// source is over nodeBytes, or a merge whose children do not fit in one node.
+func (m *Memory) buildBuiltByModel(key NodeKey) (bool, error) {
+       if key.level == 0 {
+               message, err := m.log.Message(key.index)
+               if err != nil {
+                       return false, fmt.Errorf("read leaf source: %w", err)
+               }
+
+               _, free := freeLeaf(message)
+
+               return !free, nil
+       }
+
+       left, right, err := m.children(key)
+       if err != nil {
+               return false, fmt.Errorf("read merge sources: %w", err)
+       }
+
+       _, free := freeMerge(left, right)
+
+       return !free, nil
+}
+

 // Task is the build of the node (Level, Index). Context is the compaction view
 // for the build. Input holds the source "kind: text" of a leaf, or the two
 // child lines of a merge with their newlines as spaces.
 // Task is the build of the node (Level, Index). Context is the compaction view
 // for the build. Input holds the source "kind: text" of a leaf, or the two
 // child lines of a merge with their newlines as spaces.