From a75fafdbe2120060e78e8390bf5b3e61855d45c4 Mon Sep 17 00:00:00 2001 From: Klaus Post Date: Tue, 24 Nov 2020 11:58:10 -0800 Subject: [PATCH] Remove msgp workaround (#10964) The error in `github.com/philhofer/fwd` was quickly fixed through https://github.com/philhofer/fwd/pull/22 - update the dependency and remove the workaround. --- cmd/metacache-stream.go | 4 +--- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/metacache-stream.go b/cmd/metacache-stream.go index 3c8515c5a..aff5ace87 100644 --- a/cmd/metacache-stream.go +++ b/cmd/metacache-stream.go @@ -247,9 +247,7 @@ type metacacheReader struct { func newMetacacheReader(r io.Reader) (*metacacheReader, error) { dec := s2DecPool.Get().(*s2.Reader) dec.Reset(r) - // TODO: Go back to default size when this fix is available: - // https://github.com/philhofer/fwd/issues/20 - mr := msgp.NewReaderSize(dec, 64<<10) + mr := msgp.NewReader(dec) m := metacacheReader{ mr: mr, closer: func() { diff --git a/go.mod b/go.mod index 9094df999..7be74f520 100644 --- a/go.mod +++ b/go.mod @@ -62,7 +62,7 @@ require ( github.com/nats-io/stan.go v0.7.0 github.com/ncw/directio v1.0.5 github.com/nsqio/go-nsq v1.0.7 - github.com/philhofer/fwd v1.1.0 // indirect + github.com/philhofer/fwd v1.1.1 // indirect github.com/pierrec/lz4 v2.4.0+incompatible github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.0.0 diff --git a/go.sum b/go.sum index 03b0f3fd3..47e4c70ef 100644 --- a/go.sum +++ b/go.sum @@ -379,6 +379,8 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/pborman/getopt v0.0.0-20180729010549-6fdd0a2c7117/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/philhofer/fwd v1.1.0 h1:PAdZw9+/BCf4gc/kA2L/PbGPkFe72Kl2GLZXTG8HpU8= github.com/philhofer/fwd v1.1.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= +github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.4.0+incompatible h1:06usnXXDNcPvCHDkmPpkidf4jTc52UKld7UPfqKatY4=