From 4dabc47498ea79edcc4b69d5ecd0d03708e1a622 Mon Sep 17 00:00:00 2001 From: Blake Gentry Date: Mon, 4 Nov 2024 16:47:18 -0600 Subject: [PATCH] Fix more aggressive fetch / prepare v0.14.1 (#668) * make tidy * fix over-aggressive fetching In ce141fa / #664, the client was tuned in an attempt to make it more aggressive about fetching more jobs when it has just fetched a full batch of jobs. Unfortunately, a conditional was missed and it ended up fetching aggressively any time a single job was fetched. This adds the correct conditional so that the `fetchWhenSlotsAreAvailable` flag only gets set when (a) the previous fetch was full, or (b) when the previous fetch was skipped due to being already full of jobs. * prepare v0.14.1 --- CHANGELOG.md | 6 ++++++ cmd/river/go.mod | 10 +++++----- cmd/river/go.sum | 24 ++++++++++++------------ go.mod | 10 +++++----- go.sum | 16 ++++++++-------- go.work.sum | 5 +++++ producer.go | 10 ++++++---- riverdriver/go.mod | 2 +- riverdriver/go.sum | 4 ++-- riverdriver/riverdatabasesql/go.mod | 9 ++++----- riverdriver/riverdatabasesql/go.sum | 17 ++++++++--------- riverdriver/riverpgxv5/go.mod | 9 ++++----- riverdriver/riverpgxv5/go.sum | 17 ++++++++--------- rivershared/go.mod | 6 +++--- rivershared/go.sum | 12 ++++++------ 15 files changed, 83 insertions(+), 74 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce48fe99..a02809f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.14.1] - 2024-11-04 + +### Fixed + +- In [PR #663](https://github.com/riverqueue/river/pull/663) the client was changed to be more aggressive about re-fetching when it had previously fetched a full batch. Unfortunately a clause was missed, which resulted in the client being more aggressive any time even a single job was fetched on the previous attempt. This was corrected with a conditional to ensure it only happens when the last fetch was full. [PR #668](https://github.com/riverqueue/river/pull/668). + ## [0.14.0] - 2024-11-03 ### Added diff --git a/cmd/river/go.mod b/cmd/river/go.mod index a0510ccb..047406a9 100644 --- a/cmd/river/go.mod +++ b/cmd/river/go.mod @@ -7,11 +7,11 @@ toolchain go1.23.0 require ( github.com/jackc/pgx/v5 v5.7.1 github.com/lmittmann/tint v1.0.4 - github.com/riverqueue/river v0.14.0 - github.com/riverqueue/river/riverdriver v0.14.0 - github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.0 - github.com/riverqueue/river/rivershared v0.14.0 - github.com/riverqueue/river/rivertype v0.14.0 + github.com/riverqueue/river v0.14.1 + github.com/riverqueue/river/riverdriver v0.14.1 + github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.1 + github.com/riverqueue/river/rivershared v0.14.1 + github.com/riverqueue/river/rivertype v0.14.1 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 ) diff --git a/cmd/river/go.sum b/cmd/river/go.sum index 500b1e85..bace76a4 100644 --- a/cmd/river/go.sum +++ b/cmd/river/go.sum @@ -24,18 +24,18 @@ github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc= github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/riverqueue/river v0.13.0 h1:BvEJfXAnHJ7HwraoPZWiD271t2jDVvX1SPCtvLzojiA= -github.com/riverqueue/river v0.13.0/go.mod h1:SOG+j28RQpKDsTA8AlfxjFdYpoPm+MSOio+Ev4ljN2U= -github.com/riverqueue/river/riverdriver v0.13.0 h1:UVzMtNfp3R+Ehr/yaRqgF58YOFEWGVqIAamCeK7RMkA= -github.com/riverqueue/river/riverdriver v0.13.0/go.mod h1:pxmx6qmGl+dNCrfa+xuktg8zrrZO3AEqlUFlFWOy8U4= -github.com/riverqueue/river/riverdriver/riverdatabasesql v0.13.0 h1:xiiwQVFUoPv/7PQIsEIerpw2ux1lZ14oZScgiB4JHdE= -github.com/riverqueue/river/riverdriver/riverdatabasesql v0.13.0/go.mod h1:f7TWWD965tE6v96qi1Y40IP2shsAai0qJBHbqT7yFLM= -github.com/riverqueue/river/riverdriver/riverpgxv5 v0.13.0 h1:wjLgea/eI5rIMh0+TCjS+/+dsULIst3Wu8bZQo2DHno= -github.com/riverqueue/river/riverdriver/riverpgxv5 v0.13.0/go.mod h1:Vzt3E33kNks2vN9lTgLJL8VFrbcAWDbwzyZLo02FlBk= -github.com/riverqueue/river/rivershared v0.13.0 h1:AqRP54GgtwoLIvV5eoZmOGOCZXL8Ce5Zm8s60R8NKOA= -github.com/riverqueue/river/rivershared v0.13.0/go.mod h1:vzvawQpDy2Z1U5chkvh1NykzWNkRhc9RLcURsJRhlbE= -github.com/riverqueue/river/rivertype v0.13.0 h1:PkT3h9tP0ZV3h0EGy2MiwEhgZqpRMN4fXfj27UKc9Q0= -github.com/riverqueue/river/rivertype v0.13.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= +github.com/riverqueue/river v0.14.0 h1:y3Ni9hRdnlgKTm/h13aKf9rBYWppm/yV0bM04lHO6qo= +github.com/riverqueue/river v0.14.0/go.mod h1:R98qxNGrFOm1rtapS76Ef6y2WbQ56jtOc2kuVSKW/zA= +github.com/riverqueue/river/riverdriver v0.14.0 h1:H0b26b6DslyrJotLtZW603CMAmkbygBi3FlHtgTwbqc= +github.com/riverqueue/river/riverdriver v0.14.0/go.mod h1:DUayJJgiCWwfnsLC3sLBuM/N1cRh2lEoAohV6bHeaiA= +github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.0 h1:PSrJuff4jzbYD8IKR8QrdyYofdE1vx6t61+lYoIwMrI= +github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.0/go.mod h1:G6ymkGCy+H6SmRUTSBC9uXnk+dy4TttkuM5L1yS/KDA= +github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.0 h1:26d1SEOj9lc/owC4ZfLATOw5NRJhFPNSdEisH5FXkr4= +github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.0/go.mod h1:VlHbD3GF4ioT52J2S2VM2cFHbuG8D9u1bIbT4R/JuPE= +github.com/riverqueue/river/rivershared v0.14.0 h1:XFyHB7ubPOMfWXcT1ZMlyHvnF7fYgsy3QeAwm6wTj3Y= +github.com/riverqueue/river/rivershared v0.14.0/go.mod h1:CWFseAE5WKSQIE3VxVeKGbRKwAVuDEUGIOGkmJwoYdU= +github.com/riverqueue/river/rivertype v0.14.0 h1:VNlnmp8pMEkfgoLROf6oJxdyh5D7Y8XDEAbJH36xf5Q= +github.com/riverqueue/river/rivertype v0.14.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/go.mod b/go.mod index 0d0a21cb..83049368 100644 --- a/go.mod +++ b/go.mod @@ -8,11 +8,11 @@ require ( github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa github.com/jackc/pgx/v5 v5.7.1 github.com/jackc/puddle/v2 v2.2.2 - github.com/riverqueue/river/riverdriver v0.14.0 - github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.0 - github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.0 - github.com/riverqueue/river/rivershared v0.14.0 - github.com/riverqueue/river/rivertype v0.14.0 + github.com/riverqueue/river/riverdriver v0.14.1 + github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.1 + github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.1 + github.com/riverqueue/river/rivershared v0.14.1 + github.com/riverqueue/river/rivertype v0.14.1 github.com/robfig/cron/v3 v3.0.1 github.com/stretchr/testify v1.9.0 github.com/tidwall/gjson v1.18.0 diff --git a/go.sum b/go.sum index 2051aa63..194d28f1 100644 --- a/go.sum +++ b/go.sum @@ -19,14 +19,14 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/riverqueue/river/riverdriver v0.13.0 h1:UVzMtNfp3R+Ehr/yaRqgF58YOFEWGVqIAamCeK7RMkA= -github.com/riverqueue/river/riverdriver v0.13.0/go.mod h1:pxmx6qmGl+dNCrfa+xuktg8zrrZO3AEqlUFlFWOy8U4= -github.com/riverqueue/river/riverdriver/riverdatabasesql v0.13.0 h1:xiiwQVFUoPv/7PQIsEIerpw2ux1lZ14oZScgiB4JHdE= -github.com/riverqueue/river/riverdriver/riverdatabasesql v0.13.0/go.mod h1:f7TWWD965tE6v96qi1Y40IP2shsAai0qJBHbqT7yFLM= -github.com/riverqueue/river/riverdriver/riverpgxv5 v0.13.0 h1:wjLgea/eI5rIMh0+TCjS+/+dsULIst3Wu8bZQo2DHno= -github.com/riverqueue/river/riverdriver/riverpgxv5 v0.13.0/go.mod h1:Vzt3E33kNks2vN9lTgLJL8VFrbcAWDbwzyZLo02FlBk= -github.com/riverqueue/river/rivertype v0.13.0 h1:PkT3h9tP0ZV3h0EGy2MiwEhgZqpRMN4fXfj27UKc9Q0= -github.com/riverqueue/river/rivertype v0.13.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= +github.com/riverqueue/river/riverdriver v0.14.0 h1:H0b26b6DslyrJotLtZW603CMAmkbygBi3FlHtgTwbqc= +github.com/riverqueue/river/riverdriver v0.14.0/go.mod h1:DUayJJgiCWwfnsLC3sLBuM/N1cRh2lEoAohV6bHeaiA= +github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.0 h1:PSrJuff4jzbYD8IKR8QrdyYofdE1vx6t61+lYoIwMrI= +github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.0/go.mod h1:G6ymkGCy+H6SmRUTSBC9uXnk+dy4TttkuM5L1yS/KDA= +github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.0 h1:26d1SEOj9lc/owC4ZfLATOw5NRJhFPNSdEisH5FXkr4= +github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.0/go.mod h1:VlHbD3GF4ioT52J2S2VM2cFHbuG8D9u1bIbT4R/JuPE= +github.com/riverqueue/river/rivertype v0.14.0 h1:VNlnmp8pMEkfgoLROf6oJxdyh5D7Y8XDEAbJH36xf5Q= +github.com/riverqueue/river/rivertype v0.14.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/go.work.sum b/go.work.sum index 545b9d94..eaf0f08b 100644 --- a/go.work.sum +++ b/go.work.sum @@ -4,6 +4,11 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/riverqueue/river v0.13.0-rc.1/go.mod h1:ZxTeoNZWNpwl+dCBWF5AomGV1exZbHu/E75ufb09HIo= +github.com/riverqueue/river v0.14.0/go.mod h1:R98qxNGrFOm1rtapS76Ef6y2WbQ56jtOc2kuVSKW/zA= +github.com/riverqueue/river/riverdriver v0.14.0/go.mod h1:DUayJJgiCWwfnsLC3sLBuM/N1cRh2lEoAohV6bHeaiA= +github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.0/go.mod h1:G6ymkGCy+H6SmRUTSBC9uXnk+dy4TttkuM5L1yS/KDA= +github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.0/go.mod h1:VlHbD3GF4ioT52J2S2VM2cFHbuG8D9u1bIbT4R/JuPE= +github.com/riverqueue/river/rivertype v0.14.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= diff --git a/producer.go b/producer.go index 59a1f297..b58fa505 100644 --- a/producer.go +++ b/producer.go @@ -494,10 +494,12 @@ func (p *producer) innerFetchLoop(workCtx context.Context, fetchResultCh chan pr } else if len(result.jobs) > 0 { p.startNewExecutors(workCtx, result.jobs) - // Fetch returned the maximum number of jobs that were requested, - // implying there may be more in the queue. Trigger another fetch when - // slots are available. - p.fetchWhenSlotsAreAvailable = true + if len(result.jobs) == limit { + // Fetch returned the maximum number of jobs that were requested, + // implying there may be more in the queue. Trigger another fetch when + // slots are available. + p.fetchWhenSlotsAreAvailable = true + } } return case result := <-p.jobResultCh: diff --git a/riverdriver/go.mod b/riverdriver/go.mod index 531e26ba..7ce27123 100644 --- a/riverdriver/go.mod +++ b/riverdriver/go.mod @@ -4,4 +4,4 @@ go 1.21 toolchain go1.23.0 -require github.com/riverqueue/river/rivertype v0.14.0 +require github.com/riverqueue/river/rivertype v0.14.1 diff --git a/riverdriver/go.sum b/riverdriver/go.sum index 3d4d7a54..316364e6 100644 --- a/riverdriver/go.sum +++ b/riverdriver/go.sum @@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/riverqueue/river/rivertype v0.13.0 h1:PkT3h9tP0ZV3h0EGy2MiwEhgZqpRMN4fXfj27UKc9Q0= -github.com/riverqueue/river/rivertype v0.13.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= +github.com/riverqueue/river/rivertype v0.14.0 h1:VNlnmp8pMEkfgoLROf6oJxdyh5D7Y8XDEAbJH36xf5Q= +github.com/riverqueue/river/rivertype v0.14.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/riverdriver/riverdatabasesql/go.mod b/riverdriver/riverdatabasesql/go.mod index e4178c6a..a3a1f01f 100644 --- a/riverdriver/riverdatabasesql/go.mod +++ b/riverdriver/riverdatabasesql/go.mod @@ -7,16 +7,15 @@ toolchain go1.23.0 require ( github.com/jackc/pgx/v5 v5.7.1 github.com/lib/pq v1.10.9 - github.com/riverqueue/river v0.14.0 - github.com/riverqueue/river/riverdriver v0.14.0 - github.com/riverqueue/river/rivershared v0.14.0 - github.com/riverqueue/river/rivertype v0.14.0 + github.com/riverqueue/river v0.14.1 + github.com/riverqueue/river/riverdriver v0.14.1 + github.com/riverqueue/river/rivershared v0.14.1 + github.com/riverqueue/river/rivertype v0.14.1 github.com/stretchr/testify v1.9.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/tidwall/gjson v1.18.0 // indirect github.com/tidwall/match v1.1.1 // indirect diff --git a/riverdriver/riverdatabasesql/go.sum b/riverdriver/riverdatabasesql/go.sum index 32d101f4..02e28a73 100644 --- a/riverdriver/riverdatabasesql/go.sum +++ b/riverdriver/riverdatabasesql/go.sum @@ -1,4 +1,3 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= @@ -17,14 +16,14 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/riverqueue/river v0.13.0 h1:BvEJfXAnHJ7HwraoPZWiD271t2jDVvX1SPCtvLzojiA= -github.com/riverqueue/river v0.13.0/go.mod h1:SOG+j28RQpKDsTA8AlfxjFdYpoPm+MSOio+Ev4ljN2U= -github.com/riverqueue/river/riverdriver v0.13.0 h1:UVzMtNfp3R+Ehr/yaRqgF58YOFEWGVqIAamCeK7RMkA= -github.com/riverqueue/river/riverdriver v0.13.0/go.mod h1:pxmx6qmGl+dNCrfa+xuktg8zrrZO3AEqlUFlFWOy8U4= -github.com/riverqueue/river/rivershared v0.13.0 h1:AqRP54GgtwoLIvV5eoZmOGOCZXL8Ce5Zm8s60R8NKOA= -github.com/riverqueue/river/rivershared v0.13.0/go.mod h1:vzvawQpDy2Z1U5chkvh1NykzWNkRhc9RLcURsJRhlbE= -github.com/riverqueue/river/rivertype v0.13.0 h1:PkT3h9tP0ZV3h0EGy2MiwEhgZqpRMN4fXfj27UKc9Q0= -github.com/riverqueue/river/rivertype v0.13.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= +github.com/riverqueue/river v0.14.0 h1:y3Ni9hRdnlgKTm/h13aKf9rBYWppm/yV0bM04lHO6qo= +github.com/riverqueue/river v0.14.0/go.mod h1:R98qxNGrFOm1rtapS76Ef6y2WbQ56jtOc2kuVSKW/zA= +github.com/riverqueue/river/riverdriver v0.14.0 h1:H0b26b6DslyrJotLtZW603CMAmkbygBi3FlHtgTwbqc= +github.com/riverqueue/river/riverdriver v0.14.0/go.mod h1:DUayJJgiCWwfnsLC3sLBuM/N1cRh2lEoAohV6bHeaiA= +github.com/riverqueue/river/rivershared v0.14.0 h1:XFyHB7ubPOMfWXcT1ZMlyHvnF7fYgsy3QeAwm6wTj3Y= +github.com/riverqueue/river/rivershared v0.14.0/go.mod h1:CWFseAE5WKSQIE3VxVeKGbRKwAVuDEUGIOGkmJwoYdU= +github.com/riverqueue/river/rivertype v0.14.0 h1:VNlnmp8pMEkfgoLROf6oJxdyh5D7Y8XDEAbJH36xf5Q= +github.com/riverqueue/river/rivertype v0.14.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/riverdriver/riverpgxv5/go.mod b/riverdriver/riverpgxv5/go.mod index a2c8db24..9a5a3e13 100644 --- a/riverdriver/riverpgxv5/go.mod +++ b/riverdriver/riverpgxv5/go.mod @@ -7,10 +7,10 @@ toolchain go1.23.0 require ( github.com/jackc/pgx/v5 v5.7.1 github.com/jackc/puddle/v2 v2.2.2 - github.com/riverqueue/river v0.14.0 - github.com/riverqueue/river/riverdriver v0.14.0 - github.com/riverqueue/river/rivershared v0.14.0 - github.com/riverqueue/river/rivertype v0.14.0 + github.com/riverqueue/river v0.14.1 + github.com/riverqueue/river/riverdriver v0.14.1 + github.com/riverqueue/river/rivershared v0.14.1 + github.com/riverqueue/river/rivertype v0.14.1 github.com/stretchr/testify v1.9.0 ) @@ -18,7 +18,6 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/tidwall/gjson v1.18.0 // indirect github.com/tidwall/match v1.1.1 // indirect diff --git a/riverdriver/riverpgxv5/go.sum b/riverdriver/riverpgxv5/go.sum index b769e3c9..cf578bca 100644 --- a/riverdriver/riverpgxv5/go.sum +++ b/riverdriver/riverpgxv5/go.sum @@ -1,4 +1,3 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -16,14 +15,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/riverqueue/river v0.13.0 h1:BvEJfXAnHJ7HwraoPZWiD271t2jDVvX1SPCtvLzojiA= -github.com/riverqueue/river v0.13.0/go.mod h1:SOG+j28RQpKDsTA8AlfxjFdYpoPm+MSOio+Ev4ljN2U= -github.com/riverqueue/river/riverdriver v0.13.0 h1:UVzMtNfp3R+Ehr/yaRqgF58YOFEWGVqIAamCeK7RMkA= -github.com/riverqueue/river/riverdriver v0.13.0/go.mod h1:pxmx6qmGl+dNCrfa+xuktg8zrrZO3AEqlUFlFWOy8U4= -github.com/riverqueue/river/rivershared v0.13.0 h1:AqRP54GgtwoLIvV5eoZmOGOCZXL8Ce5Zm8s60R8NKOA= -github.com/riverqueue/river/rivershared v0.13.0/go.mod h1:vzvawQpDy2Z1U5chkvh1NykzWNkRhc9RLcURsJRhlbE= -github.com/riverqueue/river/rivertype v0.13.0 h1:PkT3h9tP0ZV3h0EGy2MiwEhgZqpRMN4fXfj27UKc9Q0= -github.com/riverqueue/river/rivertype v0.13.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= +github.com/riverqueue/river v0.14.0 h1:y3Ni9hRdnlgKTm/h13aKf9rBYWppm/yV0bM04lHO6qo= +github.com/riverqueue/river v0.14.0/go.mod h1:R98qxNGrFOm1rtapS76Ef6y2WbQ56jtOc2kuVSKW/zA= +github.com/riverqueue/river/riverdriver v0.14.0 h1:H0b26b6DslyrJotLtZW603CMAmkbygBi3FlHtgTwbqc= +github.com/riverqueue/river/riverdriver v0.14.0/go.mod h1:DUayJJgiCWwfnsLC3sLBuM/N1cRh2lEoAohV6bHeaiA= +github.com/riverqueue/river/rivershared v0.14.0 h1:XFyHB7ubPOMfWXcT1ZMlyHvnF7fYgsy3QeAwm6wTj3Y= +github.com/riverqueue/river/rivershared v0.14.0/go.mod h1:CWFseAE5WKSQIE3VxVeKGbRKwAVuDEUGIOGkmJwoYdU= +github.com/riverqueue/river/rivertype v0.14.0 h1:VNlnmp8pMEkfgoLROf6oJxdyh5D7Y8XDEAbJH36xf5Q= +github.com/riverqueue/river/rivertype v0.14.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/rivershared/go.mod b/rivershared/go.mod index 54bdc359..c1f58d9c 100644 --- a/rivershared/go.mod +++ b/rivershared/go.mod @@ -5,9 +5,9 @@ go 1.21 toolchain go1.23.0 require ( - github.com/riverqueue/river v0.14.0 - github.com/riverqueue/river/riverdriver v0.14.0 - github.com/riverqueue/river/rivertype v0.14.0 + github.com/riverqueue/river v0.14.1 + github.com/riverqueue/river/riverdriver v0.14.1 + github.com/riverqueue/river/rivertype v0.14.1 github.com/stretchr/testify v1.9.0 go.uber.org/goleak v1.3.0 golang.org/x/mod v0.17.0 diff --git a/rivershared/go.sum b/rivershared/go.sum index 4ca34d8f..df33234f 100644 --- a/rivershared/go.sum +++ b/rivershared/go.sum @@ -15,12 +15,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/riverqueue/river v0.13.0 h1:BvEJfXAnHJ7HwraoPZWiD271t2jDVvX1SPCtvLzojiA= -github.com/riverqueue/river v0.13.0/go.mod h1:SOG+j28RQpKDsTA8AlfxjFdYpoPm+MSOio+Ev4ljN2U= -github.com/riverqueue/river/riverdriver v0.13.0 h1:UVzMtNfp3R+Ehr/yaRqgF58YOFEWGVqIAamCeK7RMkA= -github.com/riverqueue/river/riverdriver v0.13.0/go.mod h1:pxmx6qmGl+dNCrfa+xuktg8zrrZO3AEqlUFlFWOy8U4= -github.com/riverqueue/river/rivertype v0.13.0 h1:PkT3h9tP0ZV3h0EGy2MiwEhgZqpRMN4fXfj27UKc9Q0= -github.com/riverqueue/river/rivertype v0.13.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= +github.com/riverqueue/river v0.14.0 h1:y3Ni9hRdnlgKTm/h13aKf9rBYWppm/yV0bM04lHO6qo= +github.com/riverqueue/river v0.14.0/go.mod h1:R98qxNGrFOm1rtapS76Ef6y2WbQ56jtOc2kuVSKW/zA= +github.com/riverqueue/river/riverdriver v0.14.0 h1:H0b26b6DslyrJotLtZW603CMAmkbygBi3FlHtgTwbqc= +github.com/riverqueue/river/riverdriver v0.14.0/go.mod h1:DUayJJgiCWwfnsLC3sLBuM/N1cRh2lEoAohV6bHeaiA= +github.com/riverqueue/river/rivertype v0.14.0 h1:VNlnmp8pMEkfgoLROf6oJxdyh5D7Y8XDEAbJH36xf5Q= +github.com/riverqueue/river/rivertype v0.14.0/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=