Merge branch 'feat/47-G-buildfix6' into feat/47-G-join8
This commit is contained in:
@@ -2,6 +2,7 @@ package view
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -55,13 +56,32 @@ func (b *Backlog) Rows() []BacklogRow {
|
|||||||
}
|
}
|
||||||
row.Waiting, row.Held = waiting, held
|
row.Waiting, row.Held = waiting, held
|
||||||
if waiting > 0 {
|
if waiting > 0 {
|
||||||
body, err := b.Message(stream, subject, next)
|
// Both forms of the accept subject: main's and the asker's (design 47 G §600, §484); the oldest of the two.
|
||||||
if err == nil {
|
var oldest *buildstep.StepAsk
|
||||||
var a buildstep.StepAsk
|
var err error
|
||||||
a, err = buildstep.DecodeStepAsk(body)
|
for _, form := range []string{subject, subject + ".*"} {
|
||||||
if err == nil {
|
body, gerr := b.Message(stream, form, next)
|
||||||
row.Oldest, row.OldestSecs = a.At, int64(now().Sub(a.At).Seconds())
|
if errors.Is(gerr, jetstream.ErrMsgNotFound) {
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
if gerr != nil {
|
||||||
|
err = gerr
|
||||||
|
break
|
||||||
|
}
|
||||||
|
a, derr := buildstep.DecodeStepAsk(body)
|
||||||
|
if derr != nil {
|
||||||
|
err = derr
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if oldest == nil || a.At.Before(oldest.At) {
|
||||||
|
oldest = &a
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err == nil && oldest == nil {
|
||||||
|
err = jetstream.ErrMsgNotFound
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
row.Oldest, row.OldestSecs = oldest.At, int64(now().Sub(oldest.At).Seconds())
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
row.Error = fmt.Sprintf("the oldest waiting ask cannot be read: %v", err)
|
row.Error = fmt.Sprintf("the oldest waiting ask cannot be read: %v", err)
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.novox.be/novox/mesh-delivery/sdk/buildstep"
|
"git.novox.be/novox/mesh-delivery/sdk/buildstep"
|
||||||
|
"github.com/nats-io/nats.go/jetstream"
|
||||||
)
|
)
|
||||||
|
|
||||||
func stepAsk(t *testing.T, id, kind string, at time.Time) []byte {
|
func stepAsk(t *testing.T, id, kind string, at time.Time) []byte {
|
||||||
@@ -37,10 +38,16 @@ func fakeSeats(t *testing.T, now time.Time) *Backlog {
|
|||||||
return 0, 0, 1, nil
|
return 0, 0, 1, nil
|
||||||
},
|
},
|
||||||
Message: func(stream, s string, seq uint64) ([]byte, error) {
|
Message: func(stream, s string, seq uint64) ([]byte, error) {
|
||||||
if s != subject || seq != 42 {
|
if seq != 42 {
|
||||||
return nil, fmt.Errorf("asked %s at %d", s, seq)
|
return nil, fmt.Errorf("asked %s at %d", s, seq)
|
||||||
}
|
}
|
||||||
return oldest, nil
|
switch s {
|
||||||
|
case subject: // main's form holds a younger ask
|
||||||
|
return stepAsk(t, "m0000002bbbbbb", buildstep.AskCheck, now.Add(-30*time.Second)), nil
|
||||||
|
case subject + ".*": // the asker's form holds the oldest
|
||||||
|
return oldest, nil
|
||||||
|
}
|
||||||
|
return nil, jetstream.ErrMsgNotFound
|
||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user