Skip to content

Commit bf9e2e0

Browse files
authored
chore(queue): change job data to point structure (#25)
1 parent 651f3a5 commit bf9e2e0

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ module github.com/golang-queue/nsq
33
go 1.18
44

55
require (
6-
github.com/golang-queue/queue v0.1.0
6+
github.com/golang-queue/queue v0.1.3-0.20220624082030-00c8a316580c
77
github.com/nsqio/go-nsq v1.1.0
8-
github.com/stretchr/testify v1.7.1
8+
github.com/stretchr/testify v1.7.3
99
go.uber.org/goleak v1.1.12
1010
)
1111

1212
require (
13-
github.com/davecgh/go-spew v1.1.0 // indirect
14-
github.com/golang/snappy v0.0.1 // indirect
13+
github.com/davecgh/go-spew v1.1.1 // indirect
14+
github.com/goccy/go-json v0.9.7 // indirect
15+
github.com/golang/snappy v0.0.4 // indirect
1516
github.com/pmezard/go-difflib v1.0.0 // indirect
16-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
17+
gopkg.in/yaml.v3 v3.0.1 // indirect
1718
)

go.sum

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
21
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/golang-queue/queue v0.1.0 h1:SVzDMgqjjb09tRkYCjeDHU5FyErFLR6lt0qbcw40Nx4=
4-
github.com/golang-queue/queue v0.1.0/go.mod h1:g1yxxDl8JMo4gUfxt11fjjU3SXU1ah61EvwshmDoSIs=
2+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4+
github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM=
5+
github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
6+
github.com/golang-queue/queue v0.1.3-0.20220624082030-00c8a316580c h1:3ZQLDgYpsgzn3+ctrvMVN5Yf50LK0iMqcUlE498Gqm4=
7+
github.com/golang-queue/queue v0.1.3-0.20220624082030-00c8a316580c/go.mod h1:h/PhaoMwT5Jc4sQNus7APgWBUItm6QC9k6JtmwrsRos=
58
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
6-
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
79
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
10+
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
11+
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
812
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
913
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
1014
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -15,9 +19,11 @@ github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQT
1519
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1620
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1721
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
22+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
1823
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
19-
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
2024
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
25+
github.com/stretchr/testify v1.7.3 h1:dAm0YRdRQlWojc3CrCRgPBzG5f941d0zvAKu7qY4e+I=
26+
github.com/stretchr/testify v1.7.3/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
2127
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
2228
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
2329
go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
@@ -51,5 +57,6 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
5157
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5258
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
5359
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
54-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
5560
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
61+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
62+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

nsq.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func (w *Worker) startConsumer() (err error) {
9696
return err
9797
}
9898

99-
func (w *Worker) handle(job queue.Job) error {
99+
func (w *Worker) handle(job *queue.Job) error {
100100
// create channel with buffer size 1 to avoid goroutine leak
101101
done := make(chan error, 1)
102102
panicChan := make(chan interface{}, 1)
@@ -145,7 +145,7 @@ func (w *Worker) handle(job queue.Job) error {
145145

146146
// Run start the worker
147147
func (w *Worker) Run(task core.QueuedMessage) error {
148-
data, _ := task.(queue.Job)
148+
data, _ := task.(*queue.Job)
149149

150150
if err := w.handle(data); err != nil {
151151
return err
@@ -202,7 +202,7 @@ loop:
202202
}
203203
var data queue.Job
204204
_ = json.Unmarshal(task.Body, &data)
205-
return data, nil
205+
return &data, nil
206206
case <-time.After(1 * time.Second):
207207
if clock == 5 {
208208
break loop

nsq_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func TestGoroutinePanic(t *testing.T) {
268268
}
269269

270270
func TestHandleTimeout(t *testing.T) {
271-
job := queue.Job{
271+
job := &queue.Job{
272272
Timeout: 100 * time.Millisecond,
273273
Payload: []byte("foo"),
274274
}
@@ -283,7 +283,7 @@ func TestHandleTimeout(t *testing.T) {
283283
assert.Error(t, err)
284284
assert.Equal(t, context.DeadlineExceeded, err)
285285

286-
job = queue.Job{
286+
job = &queue.Job{
287287
Timeout: 150 * time.Millisecond,
288288
Payload: []byte("foo"),
289289
}
@@ -308,7 +308,7 @@ func TestHandleTimeout(t *testing.T) {
308308
}
309309

310310
func TestJobComplete(t *testing.T) {
311-
job := queue.Job{
311+
job := &queue.Job{
312312
Timeout: 100 * time.Millisecond,
313313
Payload: []byte("foo"),
314314
}
@@ -322,7 +322,7 @@ func TestJobComplete(t *testing.T) {
322322
assert.Error(t, err)
323323
assert.Equal(t, errors.New("job completed"), err)
324324

325-
job = queue.Job{
325+
job = &queue.Job{
326326
Timeout: 250 * time.Millisecond,
327327
Payload: []byte("foo"),
328328
}

0 commit comments

Comments
 (0)