Skip to content

Commit a9b1aed

Browse files
dennwcdennwc
committed
all: Updates deps, switch to upstream protobuf.
1 parent 4d39ec7 commit a9b1aed

File tree

10 files changed

+908
-4179
lines changed

10 files changed

+908
-4179
lines changed

‎.github/workflows/tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Set up Go
17-
uses: actions/setup-go@v4
17+
uses: actions/setup-go@v5
1818
with:
19-
go-version: '1.19'
19+
go-version: '1.21'
2020

2121
- name: Test
2222
run: go test -v ./...

‎go.mod

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
module github.com/cayleygraph/quad
22

3-
go 1.19
3+
go 1.21
44

55
require (
6-
github.com/gogo/protobuf v1.3.2
7-
github.com/piprate/json-gold v0.3.0
8-
github.com/stretchr/testify v1.8.4
6+
github.com/piprate/json-gold v0.5.0
7+
github.com/stretchr/testify v1.9.0
8+
google.golang.org/protobuf v1.34.2
99
)
1010

1111
require (
1212
github.com/davecgh/go-spew v1.1.1 // indirect
1313
github.com/pmezard/go-difflib v1.0.0 // indirect
14-
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
14+
github.com/pquerna/cachecontrol v0.2.0 // indirect
15+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
1516
gopkg.in/yaml.v3 v3.0.1 // indirect
1617
)

‎go.sum

+14-39
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,24 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
5-
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
6-
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
7-
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
8-
github.com/piprate/json-gold v0.3.0 h1:a1vHx7Q1jOO1pjCtKwTI/WCzwaQwRt9VM7apK2uy200=
9-
github.com/piprate/json-gold v0.3.0/go.mod h1:OK1z7UgtBZk06n2cDE2OSq1kffmjFFp5/2yhLLCz9UM=
4+
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
5+
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
6+
github.com/piprate/json-gold v0.5.0 h1:RmGh1PYboCFcchVFuh2pbSWAZy4XJaqTMU4KQYsApbM=
7+
github.com/piprate/json-gold v0.5.0/go.mod h1:WZ501QQMbZZ+3pXFPhQKzNwS1+jls0oqov3uQ2WasLs=
108
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
119
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
12-
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU=
13-
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
10+
github.com/pquerna/cachecontrol v0.2.0 h1:vBXSNuE5MYP9IJ5kjsdo8uq+w41jSPgvba2DEnkRx9k=
11+
github.com/pquerna/cachecontrol v0.2.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
1412
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
15-
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
16-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
17-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
18-
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
19-
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
20-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
21-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
22-
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
23-
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
24-
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
25-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
26-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
27-
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
28-
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
29-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
30-
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
31-
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
32-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
33-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
34-
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
35-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
36-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
37-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
38-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
39-
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
40-
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
41-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
42-
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
43-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
44-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13+
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
14+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
15+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
16+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
17+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
18+
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
19+
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
4520
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4621
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
47-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
22+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
4823
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
4924
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎pquads/pio/io.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
package pio
3030

3131
import (
32-
"github.com/gogo/protobuf/proto"
32+
"google.golang.org/protobuf/proto"
3333
)
3434

3535
type Writer interface {

‎pquads/pio/io_test.go

+14-10
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,32 @@ package pio_test
3030

3131
import (
3232
"bytes"
33+
"errors"
3334
goio "io"
3435
"math/rand"
36+
"strconv"
3537
"testing"
3638
"time"
3739

40+
"google.golang.org/protobuf/proto"
41+
42+
"github.com/cayleygraph/quad/pquads"
3843
io "github.com/cayleygraph/quad/pquads/pio"
39-
"github.com/gogo/protobuf/test"
4044
)
4145

4246
func iotest(writer io.Writer, reader io.Reader) error {
4347
size := 1000
44-
msgs := make([]*test.NinOptNative, size)
48+
msgs := make([]*pquads.Quad, size)
4549
r := rand.New(rand.NewSource(time.Now().UnixNano()))
4650
for i := range msgs {
47-
msgs[i] = test.NewPopulatedNinOptNative(r, true)
51+
msgs[i] = &pquads.Quad{Subject: strconv.Itoa(r.Int())}
4852
//issue 31
4953
if i == 5 {
50-
msgs[i] = &test.NinOptNative{}
54+
msgs[i] = &pquads.Quad{}
5155
}
5256
//issue 31
5357
if i == 999 {
54-
msgs[i] = &test.NinOptNative{}
58+
msgs[i] = &pquads.Quad{}
5559
}
5660
_, err := writer.WriteMsg(msgs[i])
5761
if err != nil {
@@ -60,15 +64,15 @@ func iotest(writer io.Writer, reader io.Reader) error {
6064
}
6165
i := 0
6266
for {
63-
msg := &test.NinOptNative{}
67+
msg := &pquads.Quad{}
6468
if err := reader.ReadMsg(msg); err != nil {
6569
if err == goio.EOF {
6670
break
6771
}
6872
return err
6973
}
70-
if err := msg.VerboseEqual(msgs[i]); err != nil {
71-
return err
74+
if !proto.Equal(msg, msgs[i]) {
75+
return errors.New("message not equal")
7276
}
7377
i++
7478
}
@@ -96,7 +100,7 @@ func TestVarintNoClose(t *testing.T) {
96100
}
97101
}
98102

99-
//issue 32
103+
// issue 32
100104
func TestVarintMaxSize(t *testing.T) {
101105
buf := bytes.NewBuffer(nil)
102106
writer := io.NewWriter(buf)
@@ -110,7 +114,7 @@ func TestVarintError(t *testing.T) {
110114
buf := bytes.NewBuffer(nil)
111115
buf.Write([]byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f})
112116
reader := io.NewReader(buf, 1024*1024)
113-
msg := &test.NinOptNative{}
117+
msg := &pquads.Quad{}
114118
err := reader.ReadMsg(msg)
115119
if err == nil {
116120
t.Fatalf("Expected error")

‎pquads/pio/varint.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,9 @@ package pio
3131
import (
3232
"bufio"
3333
"encoding/binary"
34-
"errors"
3534
"io"
3635

37-
"github.com/gogo/protobuf/proto"
38-
)
39-
40-
var (
41-
errSmallBuffer = errors.New("Buffer Too Small")
42-
errLargeValue = errors.New("Value is Larger than 64 bits")
36+
"google.golang.org/protobuf/proto"
4337
)
4438

4539
func NewWriter(w io.Writer) Writer {

‎pquads/pquads.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"io"
99

10-
"github.com/gogo/protobuf/proto"
10+
"google.golang.org/protobuf/proto"
1111

1212
"github.com/cayleygraph/quad"
1313
"github.com/cayleygraph/quad/pquads/pio"

‎pquads/quads.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ import (
44
"fmt"
55
"time"
66

7+
"google.golang.org/protobuf/proto"
8+
79
"github.com/cayleygraph/quad"
810
)
911

10-
//go:generate protoc --proto_path=$GOPATH/src:. --gogo_out=. quads.proto
12+
//go:generate protoc --go_opt=paths=source_relative --proto_path=. --go_out=. quads.proto
1113

1214
// MakeValue converts quad.Value to its protobuf representation.
1315
func MakeValue(qv quad.Value) *Value {
@@ -57,7 +59,7 @@ func MarshalValue(v quad.Value) ([]byte, error) {
5759
if v == nil {
5860
return nil, nil
5961
}
60-
return MakeValue(v).Marshal()
62+
return proto.Marshal(MakeValue(v))
6163
}
6264

6365
// UnmarshalValue is a helper for deserialization of quad.Value.
@@ -66,7 +68,7 @@ func UnmarshalValue(data []byte) (quad.Value, error) {
6668
return nil, nil
6769
}
6870
var v Value
69-
if err := v.Unmarshal(data); err != nil {
71+
if err := proto.Unmarshal(data, &v); err != nil {
7072
return nil, err
7173
}
7274
return v.ToNative(), nil

0 commit comments

Comments
 (0)