Skip to content

Commit

Permalink
upgrade the dgraph ristretto module
Browse files Browse the repository at this point in the history
  • Loading branch information
cedricfung committed Sep 19, 2024
1 parent 3035ef2 commit 11bd2fc
Show file tree
Hide file tree
Showing 17 changed files with 247 additions and 113 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/dgraph-io/badger/v4 => github.com/MixinNetwork/badger/v4 v4.3
require (
filippo.io/edwards25519 v1.1.0
github.com/dgraph-io/badger/v4 v4.3.0
github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91
github.com/dgraph-io/ristretto v1.0.0
github.com/pelletier/go-toml v1.9.5
github.com/quic-go/quic-go v0.47.0
github.com/shopspring/decimal v1.4.0
Expand All @@ -19,7 +19,7 @@ require (

require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ github.com/MixinNetwork/badger/v4 v4.3.0-F1 h1:s6/DUM3qFyqPcESwSerpvCmWtpQ2TL8wQ
github.com/MixinNetwork/badger/v4 v4.3.0-F1/go.mod h1:42o0EL86yekTcj8jpQ7sX2s3hE6A8VC57pJBiC3IqdU=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
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=
github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91 h1:Pux6+xANi0I7RRo5E1gflI4EZ2yx3BGZ75JkAIvGEOA=
github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91/go.mod h1:swkazRqnUf1N62d0Nutz7KIj2UKqsm/H8tD0nBJAXqM=
github.com/dgraph-io/ristretto v1.0.0 h1:SYG07bONKMlFDUYu5pEu3DGAh8c2OFNzKm6G9J4Si84=
github.com/dgraph-io/ristretto v1.0.0/go.mod h1:jTi2FiYEhQ1NsMmA7DeBykizjOuY88NhKBkepyu1jPc=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
Expand Down
35 changes: 0 additions & 35 deletions p2p/handle.go
Original file line number Diff line number Diff line change
Expand Up @@ -588,38 +588,3 @@ func unmarshalSyncPoints(b []byte) ([]*SyncPoint, error) {
}
return points, nil
}

func marshalPeers(peers []string) []byte {
enc := common.NewMinimumEncoder()
enc.WriteInt(len(peers))
for _, p := range peers {
enc.WriteInt(len(p))
enc.Write([]byte(p))
}
return enc.Bytes()
}

func unmarshalPeers(b []byte) ([]string, error) {
dec, err := common.NewMinimumDecoder(b)
if err != nil {
return nil, err
}
count, err := dec.ReadInt()
if err != nil {
return nil, err
}
peers := make([]string, count)
for i := range peers {
as, err := dec.ReadInt()
if err != nil {
return nil, err
}
addr := make([]byte, as)
err = dec.Read(addr)
if err != nil {
return nil, err
}
peers[i] = string(addr)
}
return peers, nil
}
62 changes: 62 additions & 0 deletions vendor/github.com/cpuguy83/go-md2man/v2/md2man/debug.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

88 changes: 57 additions & 31 deletions vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/dgraph-io/ristretto/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions vendor/github.com/dgraph-io/ristretto/cache.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 11bd2fc

Please sign in to comment.