feedx 0.12.7 → 0.14.0

data/feedx.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"strconv"
-	"time"
 
 	"github.com/bsm/bfs"
 )
@@ -12,22 +11,9 @@ import (
 // ErrNotModified is used to signal that something has not been modified.
 var ErrNotModified = errors.New("feedx: not modified")
 
-const (
-	metaLastModified       = "X-Feedx-Last-Modified"
-	metaPusherLastModified = "X-Feedx-Pusher-Last-Modified"
-)
-
-// Timestamp with millisecond resolution
-type timestamp int64
+const metaVersion = "X-Feedx-Version"
 
-func timestampFromTime(t time.Time) timestamp {
-	if n := t.Unix()*1000 + int64(t.Nanosecond()/1e6); n > 0 {
-		return timestamp(n)
-	}
-	return 0
-}
-
-func remoteLastModified(ctx context.Context, obj *bfs.Object) (timestamp, error) {
+func fetchRemoteVersion(ctx context.Context, obj *bfs.Object) (int64, error) {
 	info, err := obj.Head(ctx)
 	if err == bfs.ErrNotFound {
 		return 0, nil
@@ -35,23 +21,22 @@ func remoteLastModified(ctx context.Context, obj *bfs.Object) (timestamp, error)
 		return 0, err
 	}
 
-	millis, _ := strconv.ParseInt(info.Metadata.Get(metaLastModified), 10, 64)
-	if millis == 0 {
-		millis, _ = strconv.ParseInt(info.Metadata.Get(metaPusherLastModified), 10, 64)
-	}
-	return timestamp(millis), nil
+	version, _ := strconv.ParseInt(info.Metadata.Get(metaVersion), 10, 64)
+	return version, nil
 }
 
-// Millis returns the number of milliseconds since epoch.
-func (t timestamp) Millis() int64 { return int64(t) }
-
-// Time returns the time at t.
-func (t timestamp) Time() time.Time {
-	n := t.Millis()
-	return time.Unix(n/1000, n%1000*1e6)
+// Status is returned by sync processes.
+type Status struct {
+	// Skipped indicates the the sync was skipped, because there were no new changes.
+	Skipped bool
+	// LocalVersion indicates the local version before sync.
+	LocalVersion int64
+	// RemoteVersion indicates the remote version before sync.
+	RemoteVersion int64
+	// NumItems returns the number of items processed, either read of written.
+	NumItems int64
 }
 
-// String returns a string of milliseconds.
-func (t timestamp) String() string {
-	return strconv.FormatInt(int64(t), 10)
+func skipSync(srcVersion, targetVersion int64) bool {
+	return (srcVersion != 0 || targetVersion != 0) && srcVersion <= targetVersion
 }

data/feedx_ext_test.go

@@ -1,6 +1,16 @@
 package feedx
 
-func (c *consumer) TestSync() error {
-	_, err := c.sync(false)
-	return err
+import (
+	"context"
+
+	"github.com/bsm/bfs"
+)
+
+type NoFormat = noFormat
+
+type Manifest manifest
+
+func LoadManifest(ctx context.Context, obj *bfs.Object) (*Manifest, error) {
+	m, err := loadManifest(ctx, obj)
+	return (*Manifest)(m), err
 }

data/feedx_test.go

@@ -2,28 +2,13 @@ package feedx_test
 
 import (
 	"context"
-	"net/url"
-	"testing"
-	"time"
+	"io"
 
 	"github.com/bsm/bfs"
 	"github.com/bsm/feedx"
 	"github.com/bsm/feedx/internal/testdata"
-	. "github.com/bsm/ginkgo"
-	. "github.com/bsm/gomega"
 )
 
-var memStore *bfs.InMem
-
-func init() {
-	memStore = bfs.NewInMem()
-	bfs.Register("mem", func(_ context.Context, u *url.URL) (bfs.Bucket, error) {
-		return memStore, nil
-	})
-}
-
-// ------------------------------------------------------------------------
-
 func seed() *testdata.MockMessage {
 	return &testdata.MockMessage{
 		Name:   "Joe",
@@ -32,12 +17,16 @@ func seed() *testdata.MockMessage {
 	}
 }
 
-var mockTime = time.Unix(1515151515, 123456789)
-
-// ------------------------------------------------------------------------
+func seedN(n int) []*testdata.MockMessage {
+	res := make([]*testdata.MockMessage, 0, n)
+	for i := 0; i < n; i++ {
+		res = append(res, seed())
+	}
+	return res
+}
 
-func writeMulti(obj *bfs.Object, numEntries int, lastMod time.Time) error {
-	w := feedx.NewWriter(context.Background(), obj, &feedx.WriterOptions{LastMod: lastMod})
+func writeN(obj *bfs.Object, numEntries int, version int64) error {
+	w := feedx.NewWriter(context.Background(), obj, &feedx.WriterOptions{Version: version})
 	defer w.Discard()
 
 	for i := 0; i < numEntries; i++ {
@@ -48,9 +37,18 @@ func writeMulti(obj *bfs.Object, numEntries int, lastMod time.Time) error {
 	return w.Commit()
 }
 
-// ------------------------------------------------------------------------
-
-func TestSuite(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "feedx")
+func readMessages(r interface{ Decode(any) error }) ([]*testdata.MockMessage, error) {
+	var msgs []*testdata.MockMessage
+	for {
+		var msg testdata.MockMessage
+		err := r.Decode(&msg)
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+		msgs = append(msgs, &msg)
+	}
+	return msgs, nil
 }

data/format.go

@@ -8,10 +8,8 @@ import (
 	"path"
 
 	"github.com/bsm/pbio"
+	"github.com/fxamacker/cbor/v2"
 	"google.golang.org/protobuf/proto"
-
-	gio "github.com/gogo/protobuf/io"
-	gproto "github.com/gogo/protobuf/proto"
 )
 
 var errNoFormat = errors.New("feedx: no format detected")
@@ -29,10 +27,12 @@ type Format interface {
 func DetectFormat(name string) Format {
 	ext := path.Ext(path.Base(name))
 	switch ext {
-	case ".json":
+	case ".json", ".ndjson":
 		return JSONFormat
 	case ".pb", ".proto", ".protobuf":
 		return ProtobufFormat
+	case ".cbor":
+		return CBORFormat
 	default:
 		if name != "" && ext != "" && ext[0] == '.' {
 			if ext[len(ext)-1] == 'z' {
@@ -112,11 +112,9 @@ func (protobufFormat) NewEncoder(w io.Writer) (FormatEncoder, error) {
 type protobufWrapper struct {
 	r   io.Reader
 	dec *pbio.Decoder
-	pbr gio.Reader
 
 	w   io.Writer
 	enc *pbio.Encoder
-	pbw gio.Writer
 }
 
 func (w *protobufWrapper) Decode(v interface{}) error {
@@ -126,13 +124,6 @@ func (w *protobufWrapper) Decode(v interface{}) error {
 			w.dec = pbio.NewDecoder(w.r)
 		}
 		return w.dec.Decode(msg)
-
-	case gproto.Message:
-		if w.pbr == nil {
-			w.pbr = gio.NewDelimitedReader(w.r, 1<<28)
-		}
-		return w.pbr.ReadMsg(msg)
-
 	default:
 		return fmt.Errorf("value %v (%T) is not a proto.Message", v, v)
 	}
@@ -146,12 +137,6 @@ func (w *protobufWrapper) Encode(v interface{}) error {
 		}
 		return w.enc.Encode(msg)
 
-	case gproto.Message:
-		if w.pbw == nil {
-			w.pbw = gio.NewDelimitedWriter(w.w)
-		}
-		return w.pbw.WriteMsg(msg)
-
 	default:
 		return fmt.Errorf("value %v (%T) is not a proto.Message", v, v)
 	}
@@ -160,3 +145,28 @@ func (w *protobufWrapper) Encode(v interface{}) error {
 func (*protobufWrapper) Close() error {
 	return nil
 }
+
+// --------------------------------------------------------------------
+
+// CBORFormat provides a Format implemention for CBOR.
+var CBORFormat = cborFormat{}
+
+type cborFormat struct{}
+
+// NewDecoder implements Format.
+func (cborFormat) NewDecoder(r io.Reader) (FormatDecoder, error) {
+	return cborDecoderWrapper{Decoder: cbor.NewDecoder(r)}, nil
+}
+
+// NewEncoder implements Format.
+func (cborFormat) NewEncoder(w io.Writer) (FormatEncoder, error) {
+	return cborEncoderWrapper{Encoder: cbor.NewEncoder(w)}, nil
+}
+
+type cborDecoderWrapper struct{ *cbor.Decoder }
+
+func (cborDecoderWrapper) Close() error { return nil }
+
+type cborEncoderWrapper struct{ *cbor.Encoder }
+
+func (cborEncoderWrapper) Close() error { return nil }

data/format_test.go

@@ -2,75 +2,103 @@ package feedx_test
 
 import (
 	"bytes"
+	"errors"
 	"io"
+	"testing"
 
 	"github.com/bsm/feedx"
 	"github.com/bsm/feedx/internal/testdata"
-	. "github.com/bsm/ginkgo"
-	. "github.com/bsm/gomega"
 )
 
-var _ = Describe("Format", func() {
-	runSharedTest := func(subject feedx.Format) {
-		buf := new(bytes.Buffer)
-
-		enc, err := subject.NewEncoder(buf)
-		Expect(err).NotTo(HaveOccurred())
-		defer enc.Close()
-
-		Expect(enc.Encode(seed())).To(Succeed())
-		Expect(enc.Encode(seed())).To(Succeed())
-		Expect(enc.Close()).To(Succeed())
-
-		dec, err := subject.NewDecoder(buf)
-		Expect(err).NotTo(HaveOccurred())
-		defer dec.Close()
-
-		v1 := new(testdata.MockMessage)
-		Expect(dec.Decode(v1)).To(Succeed())
-		Expect(v1.Name).To(Equal("Joe"))
+func TestDetectFormat(t *testing.T) {
+	examples := []struct {
+		Input string
+		Exp   feedx.Format
+	}{
+		{Input: "/path/to/file.json", Exp: feedx.JSONFormat},
+		{Input: "/path/to/file.json.gz", Exp: feedx.JSONFormat},
+		{Input: "/path/to/file.json.flate", Exp: feedx.JSONFormat},
+		{Input: "/path/to/file.jsonz", Exp: feedx.JSONFormat},
+
+		{Input: "/path/to/file.pb", Exp: feedx.ProtobufFormat},
+		{Input: "/path/to/file.pb.gz", Exp: feedx.ProtobufFormat},
+		{Input: "/path/to/file.pb.flate", Exp: feedx.ProtobufFormat},
+		{Input: "/path/to/file.pbz", Exp: feedx.ProtobufFormat},
+
+		{Input: "/path/to/file.cbor", Exp: feedx.CBORFormat},
+		{Input: "/path/to/file.cbor.gz", Exp: feedx.CBORFormat},
+		{Input: "/path/to/file.cbor.flate", Exp: feedx.CBORFormat},
+		{Input: "/path/to/file.cborz", Exp: feedx.CBORFormat},
+
+		{Input: "", Exp: (*feedx.NoFormat)(nil)},
+		{Input: "/path/to/file", Exp: (*feedx.NoFormat)(nil)},
+		{Input: "/path/to/file.txt", Exp: (*feedx.NoFormat)(nil)},
+	}
+	for _, x := range examples {
+		if got := feedx.DetectFormat(x.Input); got != x.Exp {
+			t.Errorf("expected %s for %q, but got %s", x.Exp, x.Input, got)
+		}
+	}
+}
 
-		v2 := new(testdata.MockMessage)
-		Expect(dec.Decode(v2)).To(Succeed())
-		Expect(v2.Name).To(Equal("Joe"))
+func TestFormat(t *testing.T) {
+	t.Run("json", func(t *testing.T) {
+		testFormat(t, feedx.JSONFormat)
+	})
+	t.Run("protobuf", func(t *testing.T) {
+		testFormat(t, feedx.ProtobufFormat)
+	})
+	t.Run("cbor", func(t *testing.T) {
+		testFormat(t, feedx.CBORFormat)
+	})
+}
 
-		v3 := new(testdata.MockMessage)
-		Expect(dec.Decode(v3)).To(MatchError(io.EOF))
+func testFormat(t *testing.T, f feedx.Format) {
+	t.Helper()
 
-		Expect(dec.Close()).To(Succeed())
+	buf := new(bytes.Buffer)
+	enc, err := f.NewEncoder(buf)
+	if err != nil {
+		t.Fatal("expected no error, got", err)
 	}
+	defer func() { _ = enc.Close() }()
 
-	It("detects the format", func() {
-		Expect(feedx.DetectFormat("/path/to/file.json")).To(Equal(feedx.JSONFormat))
-		Expect(feedx.DetectFormat("/path/to/file.json.gz")).To(Equal(feedx.JSONFormat))
-		Expect(feedx.DetectFormat("/path/to/file.json.flate")).To(Equal(feedx.JSONFormat))
-		Expect(feedx.DetectFormat("/path/to/file.jsonz")).To(Equal(feedx.JSONFormat))
-
-		Expect(feedx.DetectFormat("/path/to/file.pb")).To(Equal(feedx.ProtobufFormat))
-		Expect(feedx.DetectFormat("/path/to/file.pb.gz")).To(Equal(feedx.ProtobufFormat))
-		Expect(feedx.DetectFormat("/path/to/file.pb.flate")).To(Equal(feedx.ProtobufFormat))
-		Expect(feedx.DetectFormat("/path/to/file.pbz")).To(Equal(feedx.ProtobufFormat))
+	if err := enc.Encode(seed()); err != nil {
+		t.Fatal("expected no error, got", err)
+	}
+	if err := enc.Encode(seed()); err != nil {
+		t.Fatal("expected no error, got", err)
+	}
+	if err := enc.Close(); err != nil {
+		t.Fatal("expected no error, got", err)
+	}
 
-		Expect(feedx.DetectFormat("")).To(BeNil())
-		Expect(feedx.DetectFormat("/path/to/file")).To(BeNil())
-		Expect(feedx.DetectFormat("/path/to/file.txt")).To(BeNil())
-	})
+	dec, err := f.NewDecoder(buf)
+	if err != nil {
+		t.Fatal("expected no error, got", err)
+	}
+	defer func() { _ = dec.Close() }()
 
-	Describe("JSONFormat", func() {
-		var subject = feedx.JSONFormat
-		var _ feedx.Format = subject
+	v1 := new(testdata.MockMessage)
+	if err := dec.Decode(v1); err != nil {
+		t.Fatal("expected no error, got", err)
+	} else if exp, got := "Joe", v1.Name; exp != got {
+		t.Errorf("expected %q, got %q", exp, got)
+	}
 
-		It("encodes/decodes", func() {
-			runSharedTest(subject)
-		})
-	})
+	v2 := new(testdata.MockMessage)
+	if err := dec.Decode(v2); err != nil {
+		t.Fatal("expected no error, got", err)
+	} else if exp, got := "Joe", v2.Name; exp != got {
+		t.Errorf("expected %q, got %q", exp, got)
+	}
 
-	Describe("ProtobufFormat", func() {
-		var subject = feedx.ProtobufFormat
-		var _ feedx.Format = subject
+	v3 := new(testdata.MockMessage)
+	if err := dec.Decode(v3); !errors.Is(err, io.EOF) {
+		t.Error("expected EOF, got", err)
+	}
 
-		It("encodes/decodes", func() {
-			runSharedTest(subject)
-		})
-	})
-})
+	if err := dec.Close(); err != nil {
+		t.Fatal("expected no error, got", err)
+	}
+}

data/go.mod

@@ -1,13 +1,17 @@
 module github.com/bsm/feedx
 
-go 1.15
+go 1.25
 
 require (
-	github.com/bsm/bfs v0.11.5
-	github.com/bsm/ginkgo v1.16.5
-	github.com/bsm/gomega v1.17.0
-	github.com/bsm/pbio v0.3.0
-	github.com/gogo/protobuf v1.3.2
+	github.com/bsm/bfs v0.12.2
+	github.com/bsm/pbio v0.4.0
+	github.com/fxamacker/cbor/v2 v2.9.0
 	github.com/golang/protobuf v1.5.2
-	google.golang.org/protobuf v1.27.1
+	github.com/klauspost/compress v1.18.1
+	google.golang.org/protobuf v1.36.10
+)
+
+require (
+	github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 )

data/go.sum

@@ -1,145 +1,23 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/bmatcuk/doublestar/v3 v3.0.0 h1:TQtVPlDnAYwcrVNB2JiGuMc++H5qzWZd9PhkNo5WyHI=
-github.com/bmatcuk/doublestar/v3 v3.0.0/go.mod h1:6PcTVMw80pCY1RVuoqu3V++99uQB3vsSYKPTd8AWA0k=
-github.com/bsm/bfs v0.11.5 h1:NMWD0hOp/74boNd51Zas4DMh81mvp1As1SjEZrFWHi0=
-github.com/bsm/bfs v0.11.5/go.mod h1:D2N+ly23VsODKiRvkf4HUgKSgOaNjKTOJE53rhL6Vfk=
-github.com/bsm/ginkgo v1.16.4/go.mod h1:RabIZLzOCPghgHJKUqHZpqrQETA5AnF4aCSIYy5C1bk=
-github.com/bsm/ginkgo v1.16.5 h1:uTeeWv0Yx1PnDeCk76PFyGrOMVw3D+r9bTNKNcIjDdQ=
-github.com/bsm/ginkgo v1.16.5/go.mod h1:RabIZLzOCPghgHJKUqHZpqrQETA5AnF4aCSIYy5C1bk=
-github.com/bsm/gomega v1.16.0/go.mod h1:JifAceMQ4crZIWYUKrlGcmbN3bqHogVTADMD2ATsbwk=
-github.com/bsm/gomega v1.17.0 h1:Sd6EsHO5d0DU6d41dtx9cK3T7Vjsr89o6zyIVWgi0CI=
-github.com/bsm/gomega v1.17.0/go.mod h1:JifAceMQ4crZIWYUKrlGcmbN3bqHogVTADMD2ATsbwk=
-github.com/bsm/pbio v0.3.0 h1:8XzkUPoJZblPkLp2jHVMnIhGs5WaNHTCmO7gRC45izk=
-github.com/bsm/pbio v0.3.0/go.mod h1:3O4XQFoarlYalkGd+zMFfEUyalP8NBKkQ0Ta4IwhN4w=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE=
+github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bsm/bfs v0.12.2 h1:gvewfnOJdcD3m46/bGg8DOBGPH65lX3MkpfDl7m938M=
+github.com/bsm/bfs v0.12.2/go.mod h1:ris96jQ0WkWwW6HSYA0FjqLgjhILCF1qshZhQMRzI0s=
+github.com/bsm/pbio v0.4.0 h1:exmKhE8gpCeubJ0rzRjq6c6ubqjyl9sqYc5ABDZ9/Xg=
+github.com/bsm/pbio v0.4.0/go.mod h1:vR1REwD+VjtNR3afI5eGFxNKnX2bmMD0t6993ZgpZ/E=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4=
-github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs=
-github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
+github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
+github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=