Correct the remaining review style findings

[onechat] / build_queue.go

diff --git a/build_queue.go b/build_queue.go
index 7db24bee8a1d2387a90de6fe509be9d517544fa9..825277ce17f519472e60cb3928f63ad2194ead0e 100644 (file)
--- a/build_queue.go
+++ b/build_queue.go
@@ -14,14 +14,6 @@ const (
        buildLeafWindow = 8
 )
 
        buildLeafWindow = 8
 )
 

-func newBuildQueue() *BuildQueue {
-       return &BuildQueue{
-               queued:  make(map[NodeKey]bool),
-               running: make(map[NodeKey]bool),
-               failed:  make(map[NodeKey]bool),
-       }
-}
-

 // BuildQueue holds the nodes that wait for a model build. A leaf joins it when
 // its message is too long to be its own node. A merge joins it when both of its
 // children are built and their texts do not fit in one node. So the core never
 // BuildQueue holds the nodes that wait for a model build. A leaf joins it when
 // its message is too long to be its own node. A merge joins it when both of its
 // children are built and their texts do not fit in one node. So the core never


@@ -42,6 +34,17 @@ type BuildQueue struct {
        retry   []NodeKey
 }
 
        retry   []NodeKey
 }
 

+// BuildMergeHeap holds the merges that can start, by the end of their context.
+type BuildMergeHeap []NodeKey
+
+func newBuildQueue() *BuildQueue {
+       return &BuildQueue{
+               queued:  make(map[NodeKey]bool),
+               running: make(map[NodeKey]bool),
+               failed:  make(map[NodeKey]bool),
+       }
+}
+

 // AddLeaf adds the leaf of message id. The IDs must come in increasing order.
 func (q *BuildQueue) AddLeaf(id int) {
        q.leaves = append(q.leaves, id)
 // AddLeaf adds the leaf of message id. The IDs must come in increasing order.
 func (q *BuildQueue) AddLeaf(id int) {
        q.leaves = append(q.leaves, id)


@@ -79,6 +82,18 @@ func (q *BuildQueue) Next() (NodeKey, bool) {
        return leaf, found
 }
 
        return leaf, found
 }
 

+// nextLeaf returns the oldest leaf in the window that can start.
+func (q *BuildQueue) nextLeaf() (NodeKey, bool) {
+       for _, id := range q.leaves[:min(len(q.leaves), buildLeafWindow)] {
+               key := NodeKey{0, id}
+               if !q.running[key] && !q.failed[key] {
+                       return key, true
+               }
+       }
+
+       return NodeKey{}, false
+}
+

 // Done removes a built node from the queue.
 func (q *BuildQueue) Done(key NodeKey) {
        delete(q.running, key)
 // Done removes a built node from the queue.
 func (q *BuildQueue) Done(key NodeKey) {
        delete(q.running, key)


@@ -123,21 +138,6 @@ func (q *BuildQueue) Running() int {
        return len(q.running)
 }
 
        return len(q.running)
 }
 

-// nextLeaf returns the oldest leaf in the window that can start.
-func (q *BuildQueue) nextLeaf() (NodeKey, bool) {
-       for _, id := range q.leaves[:min(len(q.leaves), buildLeafWindow)] {
-               key := NodeKey{0, id}
-               if !q.running[key] && !q.failed[key] {
-                       return key, true
-               }
-       }
-
-       return NodeKey{}, false
-}
-
-// BuildMergeHeap holds the merges that can start, by the end of their context.
-type BuildMergeHeap []NodeKey
-

 func (h BuildMergeHeap) Len() int {
        return len(h)
 }
 func (h BuildMergeHeap) Len() int {
        return len(h)
 }