From 06241f6a15dcd5e857819befc7db202e4d8de061 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 16:18:36 +0000 Subject: [PATCH 1/3] chore(deps): bump the minor-and-patch group across 1 directory with 14 updates Bumps the minor-and-patch group with 10 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/bits-and-blooms/bitset](https://github.com/bits-and-blooms/bitset) | `1.14.3` | `1.15.0` | | [github.com/dgraph-io/badger/v4](https://github.com/dgraph-io/badger) | `4.3.1` | `4.4.0` | | [github.com/dgraph-io/dgo/v240](https://github.com/dgraph-io/dgo) | `240.0.0` | `240.0.1` | | [github.com/golang/glog](https://github.com/golang/glog) | `1.2.2` | `1.2.3` | | [go.etcd.io/etcd/raft/v3](https://github.com/etcd-io/etcd) | `3.5.16` | `3.5.17` | | [golang.org/x/crypto](https://github.com/golang/crypto) | `0.28.0` | `0.29.0` | | [golang.org/x/mod](https://github.com/golang/mod) | `0.21.0` | `0.22.0` | | [golang.org/x/net](https://github.com/golang/net) | `0.30.0` | `0.31.0` | | [golang.org/x/tools](https://github.com/golang/tools) | `0.26.0` | `0.27.0` | | [google.golang.org/grpc](https://github.com/grpc/grpc-go) | `1.67.1` | `1.68.0` | Updates `github.com/bits-and-blooms/bitset` from 1.14.3 to 1.15.0 - [Release notes](https://github.com/bits-and-blooms/bitset/releases) - [Commits](https://github.com/bits-and-blooms/bitset/compare/v1.14.3...v1.15.0) Updates `github.com/dgraph-io/badger/v4` from 4.3.1 to 4.4.0 - [Release notes](https://github.com/dgraph-io/badger/releases) - [Changelog](https://github.com/dgraph-io/badger/blob/main/CHANGELOG.md) - [Commits](https://github.com/dgraph-io/badger/compare/v4.3.1...v4.4.0) Updates `github.com/dgraph-io/dgo/v240` from 240.0.0 to 240.0.1 - [Release notes](https://github.com/dgraph-io/dgo/releases) - [Changelog](https://github.com/dgraph-io/dgo/blob/master/RELEASE.md) - [Commits](https://github.com/dgraph-io/dgo/compare/v240.0.0...v240.0.1) Updates `github.com/golang/glog` from 1.2.2 to 1.2.3 - [Release notes](https://github.com/golang/glog/releases) - [Commits](https://github.com/golang/glog/compare/v1.2.2...v1.2.3) Updates `go.etcd.io/etcd/raft/v3` from 3.5.16 to 3.5.17 - [Release notes](https://github.com/etcd-io/etcd/releases) - [Commits](https://github.com/etcd-io/etcd/compare/v3.5.16...v3.5.17) Updates `golang.org/x/crypto` from 0.28.0 to 0.29.0 - [Commits](https://github.com/golang/crypto/compare/v0.28.0...v0.29.0) Updates `golang.org/x/mod` from 0.21.0 to 0.22.0 - [Commits](https://github.com/golang/mod/compare/v0.21.0...v0.22.0) Updates `golang.org/x/net` from 0.30.0 to 0.31.0 - [Commits](https://github.com/golang/net/compare/v0.30.0...v0.31.0) Updates `golang.org/x/sync` from 0.8.0 to 0.9.0 - [Commits](https://github.com/golang/sync/compare/v0.8.0...v0.9.0) Updates `golang.org/x/sys` from 0.26.0 to 0.27.0 - [Commits](https://github.com/golang/sys/compare/v0.26.0...v0.27.0) Updates `golang.org/x/term` from 0.25.0 to 0.26.0 - [Commits](https://github.com/golang/term/compare/v0.25.0...v0.26.0) Updates `golang.org/x/text` from 0.19.0 to 0.20.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.19.0...v0.20.0) Updates `golang.org/x/tools` from 0.26.0 to 0.27.0 - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.26.0...v0.27.0) Updates `google.golang.org/grpc` from 1.67.1 to 1.68.0 - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.67.1...v1.68.0) --- updated-dependencies: - dependency-name: github.com/bits-and-blooms/bitset dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: github.com/dgraph-io/badger/v4 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: github.com/dgraph-io/dgo/v240 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: github.com/golang/glog dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: go.etcd.io/etcd/raft/v3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: golang.org/x/term dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: golang.org/x/text dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch ... Signed-off-by: dependabot[bot] --- go.mod | 33 +++++++++++++++-------------- go.sum | 67 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 52 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index a458004f47a..23e036bac6e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module github.com/dgraph-io/dgraph/v24 go 1.22.6 +toolchain go1.22.9 require ( contrib.go.opencensus.io/exporter/jaeger v0.2.1 @@ -9,10 +10,10 @@ require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 github.com/IBM/sarama v1.43.3 github.com/Masterminds/semver/v3 v3.3.0 - github.com/bits-and-blooms/bitset v1.14.3 + github.com/bits-and-blooms/bitset v1.15.0 github.com/blevesearch/bleve/v2 v2.4.2 - github.com/dgraph-io/badger/v4 v4.3.1 - github.com/dgraph-io/dgo/v240 v240.0.0 + github.com/dgraph-io/badger/v4 v4.4.0 + github.com/dgraph-io/dgo/v240 v240.0.1 github.com/dgraph-io/gqlgen v0.13.2 github.com/dgraph-io/gqlparser/v2 v2.2.2 github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15 @@ -29,7 +30,7 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/golang-jwt/jwt/v5 v5.2.1 github.com/golang/geo v0.0.0-20230421003525-6adc56603217 - github.com/golang/glog v1.2.2 + github.com/golang/glog v1.2.3 github.com/golang/protobuf v1.5.4 github.com/golang/snappy v0.0.4 github.com/google/codesearch v1.2.0 @@ -53,19 +54,19 @@ require ( github.com/twpayne/go-geom v1.5.7 github.com/viterin/vek v0.4.2 github.com/xdg/scram v1.0.5 - go.etcd.io/etcd/raft/v3 v3.5.16 + go.etcd.io/etcd/raft/v3 v3.5.17 go.opencensus.io v0.24.0 go.uber.org/zap v1.27.0 - golang.org/x/crypto v0.28.0 + golang.org/x/crypto v0.29.0 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 - golang.org/x/mod v0.21.0 - golang.org/x/net v0.30.0 - golang.org/x/sync v0.8.0 - golang.org/x/sys v0.26.0 - golang.org/x/term v0.25.0 - golang.org/x/text v0.19.0 - golang.org/x/tools v0.26.0 - google.golang.org/grpc v1.67.1 + golang.org/x/mod v0.22.0 + golang.org/x/net v0.31.0 + golang.org/x/sync v0.9.0 + golang.org/x/sys v0.27.0 + golang.org/x/term v0.26.0 + golang.org/x/text v0.20.0 + golang.org/x/tools v0.27.0 + google.golang.org/grpc v1.68.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -85,6 +86,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chewxy/math32 v1.11.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/dgraph-io/ristretto/v2 v2.0.0 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/eapache/go-resiliency v1.7.0 // indirect @@ -117,7 +119,7 @@ require ( github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/minio/md5-simd v1.1.2 // indirect @@ -157,7 +159,6 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/time v0.6.0 // indirect google.golang.org/api v0.196.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/DataDog/dd-trace-go.v1 v1.67.1 // indirect diff --git a/go.sum b/go.sum index 746ebf867b6..cf8f3c84f4b 100644 --- a/go.sum +++ b/go.sum @@ -86,8 +86,8 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bits-and-blooms/bitset v1.14.3 h1:Gd2c8lSNf9pKXom5JtD7AaKO8o7fGQ2LtFj1436qilA= -github.com/bits-and-blooms/bitset v1.14.3/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/bits-and-blooms/bitset v1.15.0 h1:DiCRMscZsGyYePE9AR3sVhKqUXCt5IZvkX5AfAc5xLQ= +github.com/bits-and-blooms/bitset v1.15.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blevesearch/bleve/v2 v2.4.2 h1:NooYP1mb3c0StkiY9/xviiq2LGSaE8BQBCc/pirMx0U= github.com/blevesearch/bleve/v2 v2.4.2/go.mod h1:ATNKj7Yl2oJv/lGuF4kx39bST2dveX6w0th2FFYLkc8= @@ -140,10 +140,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgraph-io/badger/v4 v4.3.1 h1:7r5wKqmoRpGgSxqa0S/nGdpOpvvzuREGPLSua73C8tw= -github.com/dgraph-io/badger/v4 v4.3.1/go.mod h1:oObz97DImXpd6O/Dt8BqdKLLTDmEmarAimo72VV5whQ= -github.com/dgraph-io/dgo/v240 v240.0.0 h1:LgpaQoQuM8YD3/oHjjqzCfORPlw34OnIcA/jMiKuDJc= -github.com/dgraph-io/dgo/v240 v240.0.0/go.mod h1:YrKW6k5cJpG6qP+MtNlXBogNMTupDmnnmiF6heC0Uao= +github.com/dgraph-io/badger/v4 v4.4.0 h1:rA48XiDynZLyMdlaJl67p9+lqfqwxlgKtCpYLAio7Zk= +github.com/dgraph-io/badger/v4 v4.4.0/go.mod h1:sONMmPPfbnj9FPwS/etCqky/ULth6CQJuAZSuWCmixE= +github.com/dgraph-io/dgo/v240 v240.0.1 h1:R0d9Cao3MOghrC9RVXshw6v8Jr/IjKgU2mK9sR9nclc= +github.com/dgraph-io/dgo/v240 v240.0.1/go.mod h1:urpjhWGdYVSVQAwd000iu4wHyHPpuHpwJ7aILsuGF5A= github.com/dgraph-io/gqlgen v0.13.2 h1:TNhndk+eHKj5qE7BenKKSYdSIdOGhLqxR1rCiMso9KM= github.com/dgraph-io/gqlgen v0.13.2/go.mod h1:iCOrOv9lngN7KAo+jMgvUPVDlYHdf7qDwsTkQby2Sis= github.com/dgraph-io/gqlparser/v2 v2.1.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= @@ -153,6 +153,8 @@ github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15 h1: github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= github.com/dgraph-io/ristretto v1.0.0 h1:SYG07bONKMlFDUYu5pEu3DGAh8c2OFNzKm6G9J4Si84= github.com/dgraph-io/ristretto v1.0.0/go.mod h1:jTi2FiYEhQ1NsMmA7DeBykizjOuY88NhKBkepyu1jPc= +github.com/dgraph-io/ristretto/v2 v2.0.0 h1:l0yiSOtlJvc0otkqyMaDNysg8E9/F/TYZwMbxscNOAQ= +github.com/dgraph-io/ristretto/v2 v2.0.0/go.mod h1:FVFokF2dRqXyPyeMnK1YDy8Fc6aTe0IKgbcd03CYeEk= github.com/dgraph-io/simdjson-go v0.3.0 h1:h71LO7vR4LHMPUhuoGN8bqGm1VNfGOlAG8BI6iDUKw0= github.com/dgraph-io/simdjson-go v0.3.0/go.mod h1:Otpysdjaxj9OGaJusn4pgQV7OFh2bELuHANq0I78uvY= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -248,8 +250,8 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I= github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY= -github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/golang/glog v1.2.3 h1:oDTdz9f5VGVVNGu/Q7UXKWYsD0873HXLHdJUNBsSEKM= +github.com/golang/glog v1.2.3/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -424,8 +426,8 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL 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/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.3/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -670,10 +672,10 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd/client/pkg/v3 v3.5.16 h1:ZgY48uH6UvB+/7R9Yf4x574uCO3jIx0TRDyetSfId3Q= -go.etcd.io/etcd/client/pkg/v3 v3.5.16/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= -go.etcd.io/etcd/raft/v3 v3.5.16 h1:zBXA3ZUpYs1AwiLGPafYAKKl/CORn/uaxYDwlNwndAk= -go.etcd.io/etcd/raft/v3 v3.5.16/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= +go.etcd.io/etcd/client/pkg/v3 v3.5.17 h1:XxnDXAWq2pnxqx76ljWwiQ9jylbpC4rvkAeRVOUKKVw= +go.etcd.io/etcd/client/pkg/v3 v3.5.17/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w= +go.etcd.io/etcd/raft/v3 v3.5.17 h1:wHPW/b1oFBw/+HjDAQ9vfr17OIInejTIsmwMZpK1dNo= +go.etcd.io/etcd/raft/v3 v3.5.17/go.mod h1:uapEfOMPaJ45CqBYIraLO5+fqyIY2d57nFfxzFwy4D4= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -719,8 +721,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -758,8 +760,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB 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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= 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-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -803,8 +805,8 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= +golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -824,8 +826,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -877,13 +879,13 @@ golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= -golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU= +golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -892,8 +894,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -951,8 +953,8 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= -golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= +golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= 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= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1015,6 +1017,7 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU= google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= @@ -1032,8 +1035,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= -google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= +google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= 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= From c8b2267cda6cd32bc96cb0c80a01d42d1a5140f1 Mon Sep 17 00:00:00 2001 From: Aman Mangal Date: Wed, 13 Nov 2024 13:04:26 -0800 Subject: [PATCH 2/3] upgrade Go version --- go.mod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 23e036bac6e..b6cb0cd60ef 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,8 @@ module github.com/dgraph-io/dgraph/v24 -go 1.22.6 -toolchain go1.22.9 +go 1.22.7 + +toolchain go1.23.2 require ( contrib.go.opencensus.io/exporter/jaeger v0.2.1 From 12fe1a80c73fb20787cd77d458a10df1f993e486 Mon Sep 17 00:00:00 2001 From: Aman Mangal Date: Mon, 11 Nov 2024 14:06:05 -0800 Subject: [PATCH 3/3] upgrade ristretto, badger & dgo --- .github/workflows/cd-dgraph.yml | 14 ++------------ .github/workflows/ci-aqua-security-trivy-tests.yml | 7 +------ .github/workflows/ci-dgraph-code-coverage.yml | 7 +------ .github/workflows/ci-dgraph-fuzz.yml | 7 +------ .github/workflows/ci-dgraph-integration2-tests.yml | 7 +------ .github/workflows/ci-dgraph-jepsen-tests.yml | 9 +-------- .github/workflows/ci-dgraph-ldbc-tests.yml | 7 +------ .github/workflows/ci-dgraph-load-tests.yml | 7 +------ .github/workflows/ci-dgraph-oss-build.yml | 7 +------ .github/workflows/ci-dgraph-tests-arm64.yml | 7 +------ .github/workflows/ci-dgraph-tests.yml | 7 +------ .../ci-dgraph-upgrade-fixed-versions-tests.yml | 9 ++------- .github/workflows/ci-dgraph-upgrade-tests.yml | 9 ++------- .github/workflows/ci-golang-lint.yml | 9 ++------- .go-version | 1 - codec/codec.go | 2 +- codec/codec_test.go | 2 +- conn/node.go | 2 +- conn/pool.go | 2 +- dgraph/cmd/alpha/run.go | 2 +- dgraph/cmd/bulk/count_index.go | 2 +- dgraph/cmd/bulk/mapper.go | 2 +- dgraph/cmd/bulk/progress.go | 2 +- dgraph/cmd/bulk/reduce.go | 2 +- dgraph/cmd/bulk/run.go | 2 +- dgraph/cmd/debug/run.go | 2 +- dgraph/cmd/increment/increment.go | 2 +- dgraph/cmd/live/run.go | 2 +- dgraph/cmd/root_test.go | 2 +- dgraph/cmd/zero/license.go | 2 +- dgraph/cmd/zero/license_ee.go | 2 +- dgraph/cmd/zero/oracle.go | 2 +- dgraph/cmd/zero/raft.go | 2 +- dgraph/cmd/zero/run.go | 2 +- dgraph/cmd/zero/zero.go | 2 +- dgraph/cmd/zero/zero_test.go | 2 +- dgraph/main.go | 2 +- edgraph/access.go | 2 +- edgraph/access_ee.go | 2 +- ee/acl/utils.go | 2 +- ee/audit/audit_ee.go | 2 +- ee/backup/run.go | 2 +- ee/flags.go | 2 +- ee/keys_ee.go | 2 +- ee/vault_ee.go | 2 +- go.mod | 3 +-- go.sum | 2 -- graphql/admin/admin.go | 2 +- graphql/e2e/directives/dgraph_directives_test.go | 2 +- graphql/e2e/normal/normal_test.go | 2 +- graphql/schema/schemagen_test.go | 2 +- posting/index.go | 2 +- posting/list.go | 2 +- posting/list_test.go | 2 +- posting/lists.go | 4 ++-- posting/mvcc.go | 2 +- posting/mvcc_test.go | 2 +- query/arena.go | 2 +- query/outputnode.go | 2 +- query/outputnode_test.go | 2 +- raftwal/log.go | 2 +- raftwal/meta.go | 2 +- raftwal/wal.go | 2 +- t/t.go | 2 +- worker/backup_ee.go | 2 +- worker/cdc_ee.go | 2 +- worker/draft.go | 2 +- worker/export.go | 2 +- worker/groups.go | 2 +- worker/mutation.go | 2 +- worker/predicate_move.go | 2 +- worker/queue.go | 2 +- worker/restore_map.go | 2 +- worker/restore_reduce.go | 2 +- worker/server_state.go | 2 +- worker/sink_handler.go | 2 +- worker/snapshot.go | 2 +- x/config.go | 2 +- x/disk_metrics_linux.go | 2 +- x/disk_metrics_others.go | 2 +- x/flags.go | 2 +- x/init.go | 2 +- x/log_writer.go | 2 +- x/metrics.go | 2 +- x/server.go | 2 +- x/tls_helper.go | 2 +- x/x.go | 2 +- xidmap/trie.go | 2 +- xidmap/xidmap.go | 2 +- xidmap/xidmap_test.go | 2 +- 90 files changed, 93 insertions(+), 174 deletions(-) delete mode 100644 .go-version diff --git a/.github/workflows/cd-dgraph.yml b/.github/workflows/cd-dgraph.yml index 39ed7a04b22..b782faabcea 100644 --- a/.github/workflows/cd-dgraph.yml +++ b/.github/workflows/cd-dgraph.yml @@ -21,15 +21,10 @@ jobs: - uses: actions/checkout@v4 with: ref: '${{ github.event.inputs.releasetag }}' - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Install protobuf-compiler run: sudo apt update && sudo apt install -y protobuf-compiler - name: Check protobuf @@ -104,15 +99,10 @@ jobs: - uses: actions/checkout@v4 with: ref: '${{ github.event.inputs.releasetag }}' - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Install protobuf-compiler run: sudo apt update && sudo apt install -y protobuf-compiler - name: Check protobuf diff --git a/.github/workflows/ci-aqua-security-trivy-tests.yml b/.github/workflows/ci-aqua-security-trivy-tests.yml index f17abe6337e..26295e1d520 100644 --- a/.github/workflows/ci-aqua-security-trivy-tests.yml +++ b/.github/workflows/ci-aqua-security-trivy-tests.yml @@ -26,15 +26,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Build Docker image run: | make docker-image diff --git a/.github/workflows/ci-dgraph-code-coverage.yml b/.github/workflows/ci-dgraph-code-coverage.yml index 22f0262935e..3181a1af86d 100644 --- a/.github/workflows/ci-dgraph-code-coverage.yml +++ b/.github/workflows/ci-dgraph-code-coverage.yml @@ -12,15 +12,10 @@ jobs: runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 # defaults to SHA of event that triggered workflow - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Make Linux Build and Docker Image with coverage enabled run: make coverage-docker-image - name: Build Test Binary diff --git a/.github/workflows/ci-dgraph-fuzz.yml b/.github/workflows/ci-dgraph-fuzz.yml index b6afd0ddab3..d8b46f53c3a 100644 --- a/.github/workflows/ci-dgraph-fuzz.yml +++ b/.github/workflows/ci-dgraph-fuzz.yml @@ -18,15 +18,10 @@ jobs: runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Run fuzz tests run: | #!/bin/bash diff --git a/.github/workflows/ci-dgraph-integration2-tests.yml b/.github/workflows/ci-dgraph-integration2-tests.yml index 13c01ee6e54..722952a7478 100644 --- a/.github/workflows/ci-dgraph-integration2-tests.yml +++ b/.github/workflows/ci-dgraph-integration2-tests.yml @@ -20,15 +20,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Make Linux Build and Docker Image run: make docker-image - name: Clean Up Environment diff --git a/.github/workflows/ci-dgraph-jepsen-tests.yml b/.github/workflows/ci-dgraph-jepsen-tests.yml index 0f00998b369..18b0e57c879 100644 --- a/.github/workflows/ci-dgraph-jepsen-tests.yml +++ b/.github/workflows/ci-dgraph-jepsen-tests.yml @@ -16,11 +16,6 @@ jobs: repository: dgraph-io/jepsen path: jepsen ref: master - - name: Get go version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set jepsen root run: | #!/bin/bash @@ -30,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Make dgraph linux build run: make install - name: Start jepsen cluster @@ -49,5 +44,3 @@ jobs: #!/bin/bash cd contrib/jepsen ./jepsen --jepsen-root ${{ env.JEPSEN_ROOT }} --down-only - - diff --git a/.github/workflows/ci-dgraph-ldbc-tests.yml b/.github/workflows/ci-dgraph-ldbc-tests.yml index 3e0d822e3ae..70f8a17f272 100644 --- a/.github/workflows/ci-dgraph-ldbc-tests.yml +++ b/.github/workflows/ci-dgraph-ldbc-tests.yml @@ -19,15 +19,10 @@ jobs: steps: - name: Checkout Dgraph uses: actions/checkout@v4 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Make Linux Build and Docker Image run: make docker-image - name: Build Test Binary diff --git a/.github/workflows/ci-dgraph-load-tests.yml b/.github/workflows/ci-dgraph-load-tests.yml index 9ed5fce0fae..efefbb575ee 100644 --- a/.github/workflows/ci-dgraph-load-tests.yml +++ b/.github/workflows/ci-dgraph-load-tests.yml @@ -18,15 +18,10 @@ jobs: runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Make Linux Build and Docker Image run: make docker-image # this internally builds dgraph binary - name: Build Test Binary diff --git a/.github/workflows/ci-dgraph-oss-build.yml b/.github/workflows/ci-dgraph-oss-build.yml index 5dc4ac21e9d..4eb1d510595 100644 --- a/.github/workflows/ci-dgraph-oss-build.yml +++ b/.github/workflows/ci-dgraph-oss-build.yml @@ -18,15 +18,10 @@ jobs: runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Make OSS Linux Build run: make oss # verify that we can make OSS build - name: Run OSS Unit Tests diff --git a/.github/workflows/ci-dgraph-tests-arm64.yml b/.github/workflows/ci-dgraph-tests-arm64.yml index f47ab59c07a..0e760d53092 100644 --- a/.github/workflows/ci-dgraph-tests-arm64.yml +++ b/.github/workflows/ci-dgraph-tests-arm64.yml @@ -18,15 +18,10 @@ jobs: runs-on: warp-ubuntu-latest-arm64-4x steps: - uses: actions/checkout@v4 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Install protobuf-compiler run: sudo apt update && sudo apt install -y protobuf-compiler - name: Check protobuf diff --git a/.github/workflows/ci-dgraph-tests.yml b/.github/workflows/ci-dgraph-tests.yml index a4979c1d70f..1e3b2533de5 100644 --- a/.github/workflows/ci-dgraph-tests.yml +++ b/.github/workflows/ci-dgraph-tests.yml @@ -18,15 +18,10 @@ jobs: runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Install protobuf-compiler run: sudo apt update && sudo apt install -y protobuf-compiler - name: Check protobuf diff --git a/.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml b/.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml index 4dc68e40326..1cc5fdb6bab 100644 --- a/.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml +++ b/.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml @@ -4,21 +4,16 @@ on: - cron: "00 20 * * *" # 1 run per day jobs: dgraph-upgrade-fixed-versions-tests: - runs-on: warp-ubuntu-latest-x64-4x + runs-on: warp-ubuntu-latest-x64-4x timeout-minutes: 720 steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Make Linux Build and Docker Image run: make docker-image - name: Clean Up Environment diff --git a/.github/workflows/ci-dgraph-upgrade-tests.yml b/.github/workflows/ci-dgraph-upgrade-tests.yml index cc1d52f04a9..8bb6c59c1aa 100644 --- a/.github/workflows/ci-dgraph-upgrade-tests.yml +++ b/.github/workflows/ci-dgraph-upgrade-tests.yml @@ -15,20 +15,15 @@ on: jobs: dgraph-upgrade-tests: if: github.event.pull_request.draft == false - runs-on: warp-ubuntu-latest-x64-4x + runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: Make Linux Build and Docker Image run: make docker-image - name: Clean Up Environment diff --git a/.github/workflows/ci-golang-lint.yml b/.github/workflows/ci-golang-lint.yml index 86673b1fdab..6b935d52dc4 100644 --- a/.github/workflows/ci-golang-lint.yml +++ b/.github/workflows/ci-golang-lint.yml @@ -19,15 +19,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Get Go Version - run: | - #!/bin/bash - GOVERSION=$({ [ -f .go-version ] && cat .go-version; }) - echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v5 with: - go-version: ${{ env.GOVERSION }} + go-version-file: go.mod - name: golang-lint uses: golangci/golangci-lint-action@v6 with: @@ -35,4 +30,4 @@ jobs: version: latest only-new-issues: true args: --timeout=10m - skip-cache: true \ No newline at end of file + skip-cache: true diff --git a/.go-version b/.go-version deleted file mode 100644 index 71f7f51df9a..00000000000 --- a/.go-version +++ /dev/null @@ -1 +0,0 @@ -1.22 diff --git a/codec/codec.go b/codec/codec.go index 08efed4fac1..03d72f21e8e 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -27,7 +27,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type seekPos int diff --git a/codec/codec_test.go b/codec/codec_test.go index 8bb3f6cbc4b..051dc0339a1 100644 --- a/codec/codec_test.go +++ b/codec/codec_test.go @@ -31,7 +31,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func getUids(size int) []uint64 { diff --git a/conn/node.go b/conn/node.go index 582cd16d0c1..d764c71b195 100644 --- a/conn/node.go +++ b/conn/node.go @@ -39,7 +39,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/raftwal" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/conn/pool.go b/conn/pool.go index db866441d5c..e7d3b9592cd 100644 --- a/conn/pool.go +++ b/conn/pool.go @@ -33,7 +33,7 @@ import ( "github.com/dgraph-io/dgo/v240/protos/api" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/dgraph/cmd/alpha/run.go b/dgraph/cmd/alpha/run.go index ec0d8d672d6..9cdb9052fb4 100644 --- a/dgraph/cmd/alpha/run.go +++ b/dgraph/cmd/alpha/run.go @@ -61,7 +61,7 @@ import ( "github.com/dgraph-io/dgraph/v24/worker" "github.com/dgraph-io/dgraph/v24/x" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/dgraph/cmd/bulk/count_index.go b/dgraph/cmd/bulk/count_index.go index 9f76e58f7d1..4dfb2e10c23 100644 --- a/dgraph/cmd/bulk/count_index.go +++ b/dgraph/cmd/bulk/count_index.go @@ -30,7 +30,7 @@ import ( "github.com/dgraph-io/dgraph/v24/posting" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // type countEntry struct { diff --git a/dgraph/cmd/bulk/mapper.go b/dgraph/cmd/bulk/mapper.go index 563a256128a..fd416ff2e48 100644 --- a/dgraph/cmd/bulk/mapper.go +++ b/dgraph/cmd/bulk/mapper.go @@ -43,7 +43,7 @@ import ( "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/types/facets" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/dgraph/cmd/bulk/progress.go b/dgraph/cmd/bulk/progress.go index fa2d49b177b..5a87fabcd93 100644 --- a/dgraph/cmd/bulk/progress.go +++ b/dgraph/cmd/bulk/progress.go @@ -24,7 +24,7 @@ import ( "github.com/dustin/go-humanize" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type phase int32 diff --git a/dgraph/cmd/bulk/reduce.go b/dgraph/cmd/bulk/reduce.go index b79dee7da9d..ff7f4f2e32c 100644 --- a/dgraph/cmd/bulk/reduce.go +++ b/dgraph/cmd/bulk/reduce.go @@ -45,7 +45,7 @@ import ( "github.com/dgraph-io/dgraph/v24/posting" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type reducer struct { diff --git a/dgraph/cmd/bulk/run.go b/dgraph/cmd/bulk/run.go index 8ca0b554b6d..549ab81ad5b 100644 --- a/dgraph/cmd/bulk/run.go +++ b/dgraph/cmd/bulk/run.go @@ -38,7 +38,7 @@ import ( "github.com/dgraph-io/dgraph/v24/tok" "github.com/dgraph-io/dgraph/v24/worker" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Bulk is the sub-command invoked when running "dgraph bulk". diff --git a/dgraph/cmd/debug/run.go b/dgraph/cmd/debug/run.go index e2486d1aed3..e26ab3390e6 100644 --- a/dgraph/cmd/debug/run.go +++ b/dgraph/cmd/debug/run.go @@ -45,7 +45,7 @@ import ( "github.com/dgraph-io/dgraph/v24/raftwal" "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/dgraph/cmd/increment/increment.go b/dgraph/cmd/increment/increment.go index b825dbfb74e..6040c7b48d0 100644 --- a/dgraph/cmd/increment/increment.go +++ b/dgraph/cmd/increment/increment.go @@ -34,7 +34,7 @@ import ( "github.com/dgraph-io/dgo/v240" "github.com/dgraph-io/dgo/v240/protos/api" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Increment is the sub-command invoked when calling "dgraph increment". diff --git a/dgraph/cmd/live/run.go b/dgraph/cmd/live/run.go index 337b05edff8..2e08e6ea7eb 100644 --- a/dgraph/cmd/live/run.go +++ b/dgraph/cmd/live/run.go @@ -54,7 +54,7 @@ import ( "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/dgraph/v24/xidmap" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type options struct { diff --git a/dgraph/cmd/root_test.go b/dgraph/cmd/root_test.go index 016b5e61c44..efc0d599b13 100644 --- a/dgraph/cmd/root_test.go +++ b/dgraph/cmd/root_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" "github.com/stretchr/testify/require" ) diff --git a/dgraph/cmd/zero/license.go b/dgraph/cmd/zero/license.go index bf05aa5d1f2..a25af4ee053 100644 --- a/dgraph/cmd/zero/license.go +++ b/dgraph/cmd/zero/license.go @@ -23,7 +23,7 @@ import ( "net/http" "github.com/dgraph-io/dgraph/v24/protos/pb" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // dummy function as enterprise features are not available in oss binary. diff --git a/dgraph/cmd/zero/license_ee.go b/dgraph/cmd/zero/license_ee.go index bd113a17665..ef5637982a2 100644 --- a/dgraph/cmd/zero/license_ee.go +++ b/dgraph/cmd/zero/license_ee.go @@ -28,7 +28,7 @@ import ( "github.com/dgraph-io/dgraph/v24/ee/audit" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // proposeTrialLicense proposes an enterprise license valid for 30 days. diff --git a/dgraph/cmd/zero/oracle.go b/dgraph/cmd/zero/oracle.go index 3187f43d1e7..6de46b4314b 100644 --- a/dgraph/cmd/zero/oracle.go +++ b/dgraph/cmd/zero/oracle.go @@ -32,7 +32,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/tok/hnsw" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Oracle stores and manages the transaction state and conflict detection. diff --git a/dgraph/cmd/zero/raft.go b/dgraph/cmd/zero/raft.go index b3cab18784c..4150cfde2ff 100644 --- a/dgraph/cmd/zero/raft.go +++ b/dgraph/cmd/zero/raft.go @@ -42,7 +42,7 @@ import ( "github.com/dgraph-io/dgraph/v24/ee/audit" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/dgraph/cmd/zero/run.go b/dgraph/cmd/zero/run.go index 0bd25781fdd..cb5768c7e76 100644 --- a/dgraph/cmd/zero/run.go +++ b/dgraph/cmd/zero/run.go @@ -45,7 +45,7 @@ import ( "github.com/dgraph-io/dgraph/v24/raftwal" "github.com/dgraph-io/dgraph/v24/worker" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type options struct { diff --git a/dgraph/cmd/zero/zero.go b/dgraph/cmd/zero/zero.go index fc5f2a791f6..64d88161d7e 100644 --- a/dgraph/cmd/zero/zero.go +++ b/dgraph/cmd/zero/zero.go @@ -35,7 +35,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/telemetry" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/dgraph/cmd/zero/zero_test.go b/dgraph/cmd/zero/zero_test.go index c8a32d9ae4f..5babca5d045 100644 --- a/dgraph/cmd/zero/zero_test.go +++ b/dgraph/cmd/zero/zero_test.go @@ -35,7 +35,7 @@ import ( "github.com/dgraph-io/dgraph/v24/conn" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/testutil" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func TestRemoveNode(t *testing.T) { diff --git a/dgraph/main.go b/dgraph/main.go index 9393005a4c0..50a50084056 100644 --- a/dgraph/main.go +++ b/dgraph/main.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "github.com/dgraph-io/dgraph/v24/dgraph/cmd" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func main() { diff --git a/edgraph/access.go b/edgraph/access.go index 97b78d1402b..efb9de01c87 100644 --- a/edgraph/access.go +++ b/edgraph/access.go @@ -28,7 +28,7 @@ import ( "github.com/dgraph-io/dgraph/v24/dql" "github.com/dgraph-io/dgraph/v24/query" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Login handles login requests from clients. This version rejects all requests diff --git a/edgraph/access_ee.go b/edgraph/access_ee.go index 0cec209f939..17a5c3192b9 100644 --- a/edgraph/access_ee.go +++ b/edgraph/access_ee.go @@ -37,7 +37,7 @@ import ( "github.com/dgraph-io/dgraph/v24/schema" "github.com/dgraph-io/dgraph/v24/worker" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type predsAndvars struct { diff --git a/ee/acl/utils.go b/ee/acl/utils.go index 7b9abbef438..b67ff270689 100644 --- a/ee/acl/utils.go +++ b/ee/acl/utils.go @@ -23,7 +23,7 @@ import ( "github.com/dgraph-io/dgo/v240" "github.com/dgraph-io/dgo/v240/protos/api" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // GetGroupIDs returns a slice containing the group ids of all the given groups. diff --git a/ee/audit/audit_ee.go b/ee/audit/audit_ee.go index f72df5ef5d9..899f30f25cc 100644 --- a/ee/audit/audit_ee.go +++ b/ee/audit/audit_ee.go @@ -24,7 +24,7 @@ import ( "github.com/dgraph-io/dgraph/v24/worker" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/ee/backup/run.go b/ee/backup/run.go index c70be926fdf..2d2c92b7a89 100644 --- a/ee/backup/run.go +++ b/ee/backup/run.go @@ -35,7 +35,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/worker" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Restore is the sub-command used to restore a backup. diff --git a/ee/flags.go b/ee/flags.go index dd025034630..7f66d1c1daf 100644 --- a/ee/flags.go +++ b/ee/flags.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Keys holds the configuration for ACL and encryption. diff --git a/ee/keys_ee.go b/ee/keys_ee.go index 6fbb5290d94..7cf74a0e8ce 100644 --- a/ee/keys_ee.go +++ b/ee/keys_ee.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/viper" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // GetKeys returns the ACL and encryption keys as configured by the user diff --git a/ee/vault_ee.go b/ee/vault_ee.go index 603ca0c7cfc..57a6f7b0751 100644 --- a/ee/vault_ee.go +++ b/ee/vault_ee.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/viper" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func vaultGetKeys(config *viper.Viper) (aclKey, encKey x.Sensitive) { diff --git a/go.mod b/go.mod index b6cb0cd60ef..0bc4dbaa6a9 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/dgraph-io/gqlgen v0.13.2 github.com/dgraph-io/gqlparser/v2 v2.2.2 github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15 - github.com/dgraph-io/ristretto v1.0.0 + github.com/dgraph-io/ristretto/v2 v2.0.0 github.com/dgraph-io/simdjson-go v0.3.0 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 github.com/dgryski/go-groupvarint v0.0.0-20230630160417-2bfb7969fb3c @@ -87,7 +87,6 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chewxy/math32 v1.11.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/dgraph-io/ristretto/v2 v2.0.0 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/eapache/go-resiliency v1.7.0 // indirect diff --git a/go.sum b/go.sum index cf8f3c84f4b..09145821f9f 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,6 @@ github.com/dgraph-io/gqlparser/v2 v2.2.2 h1:CnxXOKL4EPguKqcGV/z4u4VoW5izUkOTIsNM github.com/dgraph-io/gqlparser/v2 v2.2.2/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15 h1:X2NRsgAtVUAp2nmTPCq+x+wTcRRrj74CEpy7E0Unsl4= github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= -github.com/dgraph-io/ristretto v1.0.0 h1:SYG07bONKMlFDUYu5pEu3DGAh8c2OFNzKm6G9J4Si84= -github.com/dgraph-io/ristretto v1.0.0/go.mod h1:jTi2FiYEhQ1NsMmA7DeBykizjOuY88NhKBkepyu1jPc= github.com/dgraph-io/ristretto/v2 v2.0.0 h1:l0yiSOtlJvc0otkqyMaDNysg8E9/F/TYZwMbxscNOAQ= github.com/dgraph-io/ristretto/v2 v2.0.0/go.mod h1:FVFokF2dRqXyPyeMnK1YDy8Fc6aTe0IKgbcd03CYeEk= github.com/dgraph-io/simdjson-go v0.3.0 h1:h71LO7vR4LHMPUhuoGN8bqGm1VNfGOlAG8BI6iDUKw0= diff --git a/graphql/admin/admin.go b/graphql/admin/admin.go index 95fc7b1459f..5d494e15d33 100644 --- a/graphql/admin/admin.go +++ b/graphql/admin/admin.go @@ -34,7 +34,7 @@ import ( "github.com/dgraph-io/dgraph/v24/query" "github.com/dgraph-io/dgraph/v24/worker" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/graphql/e2e/directives/dgraph_directives_test.go b/graphql/e2e/directives/dgraph_directives_test.go index 00f357de008..df9acccde0f 100644 --- a/graphql/e2e/directives/dgraph_directives_test.go +++ b/graphql/e2e/directives/dgraph_directives_test.go @@ -26,7 +26,7 @@ import ( "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func TestRunAll_WithDgraphDirectives(t *testing.T) { diff --git a/graphql/e2e/normal/normal_test.go b/graphql/e2e/normal/normal_test.go index f2b945d5f30..8c86e2e5764 100644 --- a/graphql/e2e/normal/normal_test.go +++ b/graphql/e2e/normal/normal_test.go @@ -26,7 +26,7 @@ import ( "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func TestRunAll_Normal(t *testing.T) { diff --git a/graphql/schema/schemagen_test.go b/graphql/schema/schemagen_test.go index 981f922e28e..0d64c9810f6 100644 --- a/graphql/schema/schemagen_test.go +++ b/graphql/schema/schemagen_test.go @@ -30,7 +30,7 @@ import ( "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/gqlerror" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type Tests map[string][]TestCase diff --git a/posting/index.go b/posting/index.go index f367e8ff437..5fc8980be52 100644 --- a/posting/index.go +++ b/posting/index.go @@ -44,7 +44,7 @@ import ( "github.com/dgraph-io/dgraph/v24/tok/hnsw" "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var emptyCountParams countParams diff --git a/posting/list.go b/posting/list.go index bd2a3656997..c5f96cc5afa 100644 --- a/posting/list.go +++ b/posting/list.go @@ -39,7 +39,7 @@ import ( "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/types/facets" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/posting/list_test.go b/posting/list_test.go index 4110713c041..ea686966528 100644 --- a/posting/list_test.go +++ b/posting/list_test.go @@ -35,7 +35,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/schema" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func setMaxListSize(newMaxListSize int) { diff --git a/posting/lists.go b/posting/lists.go index 9a20a917900..2abc92d1564 100644 --- a/posting/lists.go +++ b/posting/lists.go @@ -28,8 +28,8 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/tok/index" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2" + "github.com/dgraph-io/ristretto/v2/z" ostats "go.opencensus.io/stats" ) diff --git a/posting/mvcc.go b/posting/mvcc.go index b91de83c332..a5b700a594e 100644 --- a/posting/mvcc.go +++ b/posting/mvcc.go @@ -34,7 +34,7 @@ import ( "github.com/dgraph-io/dgo/v240/protos/api" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type pooledKeys struct { diff --git a/posting/mvcc_test.go b/posting/mvcc_test.go index f68393ec706..b656c302930 100644 --- a/posting/mvcc_test.go +++ b/posting/mvcc_test.go @@ -26,7 +26,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func TestIncrRollupGetsCancelledQuickly(t *testing.T) { diff --git a/query/arena.go b/query/arena.go index 74fc65d74d0..464373ede24 100644 --- a/query/arena.go +++ b/query/arena.go @@ -23,7 +23,7 @@ import ( "math" "sync" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/query/outputnode.go b/query/outputnode.go index 54bef1f4198..510b2261658 100644 --- a/query/outputnode.go +++ b/query/outputnode.go @@ -44,7 +44,7 @@ import ( "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/types/facets" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // ToJson converts the list of subgraph into a JSON response by calling toFastJSON. diff --git a/query/outputnode_test.go b/query/outputnode_test.go index 978a6458c91..debe82e1f9b 100644 --- a/query/outputnode_test.go +++ b/query/outputnode_test.go @@ -31,7 +31,7 @@ import ( "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/worker" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func TestEncodeMemory(t *testing.T) { diff --git a/raftwal/log.go b/raftwal/log.go index 902ea110cf9..897c2671f98 100644 --- a/raftwal/log.go +++ b/raftwal/log.go @@ -36,7 +36,7 @@ import ( "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // WAL is divided up into entryFiles. Each entry file stores maxNumEntries in diff --git a/raftwal/meta.go b/raftwal/meta.go index 352af89b769..88507adce56 100644 --- a/raftwal/meta.go +++ b/raftwal/meta.go @@ -28,7 +28,7 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type MetaInfo int diff --git a/raftwal/wal.go b/raftwal/wal.go index 1a0c914f957..424bffd2f63 100644 --- a/raftwal/wal.go +++ b/raftwal/wal.go @@ -27,7 +27,7 @@ import ( "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var errNotFound = errors.New("Unable to find raft entry") diff --git a/t/t.go b/t/t.go index 4f1bf6941a9..7009b173ec2 100644 --- a/t/t.go +++ b/t/t.go @@ -48,7 +48,7 @@ import ( "github.com/dgraph-io/dgraph/v24/testutil" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/worker/backup_ee.go b/worker/backup_ee.go index fb7234dcdc9..bb057d83aab 100644 --- a/worker/backup_ee.go +++ b/worker/backup_ee.go @@ -39,7 +39,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/tok/hnsw" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Backup handles a request coming from another node. diff --git a/worker/cdc_ee.go b/worker/cdc_ee.go index 8243900cbe4..7448ffcdbab 100644 --- a/worker/cdc_ee.go +++ b/worker/cdc_ee.go @@ -32,7 +32,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/worker/draft.go b/worker/draft.go index c50fa0b818b..f9086e5f7de 100644 --- a/worker/draft.go +++ b/worker/draft.go @@ -48,7 +48,7 @@ import ( "github.com/dgraph-io/dgraph/v24/schema" "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type operation struct { diff --git a/worker/export.go b/worker/export.go index 3c7e2446aaf..4137ba9b233 100644 --- a/worker/export.go +++ b/worker/export.go @@ -44,7 +44,7 @@ import ( "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/types/facets" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // DefaultExportFormat stores the name of the default format for exports. diff --git a/worker/groups.go b/worker/groups.go index d2c0b75263b..0f6a164f50d 100644 --- a/worker/groups.go +++ b/worker/groups.go @@ -37,7 +37,7 @@ import ( "github.com/dgraph-io/dgraph/v24/raftwal" "github.com/dgraph-io/dgraph/v24/schema" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type groupi struct { diff --git a/worker/mutation.go b/worker/mutation.go index 90efc8d78c5..e3fe26c35d0 100644 --- a/worker/mutation.go +++ b/worker/mutation.go @@ -40,7 +40,7 @@ import ( "github.com/dgraph-io/dgraph/v24/schema" "github.com/dgraph-io/dgraph/v24/types" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/worker/predicate_move.go b/worker/predicate_move.go index bbec2e42d6f..8011a955791 100644 --- a/worker/predicate_move.go +++ b/worker/predicate_move.go @@ -37,7 +37,7 @@ import ( "github.com/dgraph-io/dgraph/v24/schema" "github.com/dgraph-io/dgraph/v24/tok/hnsw" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/worker/queue.go b/worker/queue.go index 67269977dd0..a6cbdd8e212 100644 --- a/worker/queue.go +++ b/worker/queue.go @@ -33,7 +33,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/raftwal" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // TaskStatusOverNetwork fetches the status of a task over the network. Alphas only know about the diff --git a/worker/restore_map.go b/worker/restore_map.go index 811184288f3..34ac4303927 100644 --- a/worker/restore_map.go +++ b/worker/restore_map.go @@ -48,7 +48,7 @@ import ( "github.com/dgraph-io/dgraph/v24/schema" "github.com/dgraph-io/dgraph/v24/tok/hnsw" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type backupReader struct { diff --git a/worker/restore_reduce.go b/worker/restore_reduce.go index 86ab82552e5..a88b541d355 100644 --- a/worker/restore_reduce.go +++ b/worker/restore_reduce.go @@ -33,7 +33,7 @@ import ( "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/worker/server_state.go b/worker/server_state.go index 0e8ec5b0967..71f8e7b09d2 100644 --- a/worker/server_state.go +++ b/worker/server_state.go @@ -28,7 +28,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/raftwal" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/worker/sink_handler.go b/worker/sink_handler.go index bdbe8b0018b..5a347a891b6 100644 --- a/worker/sink_handler.go +++ b/worker/sink_handler.go @@ -32,7 +32,7 @@ import ( "github.com/xdg/scram" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) type SinkMessage struct { diff --git a/worker/snapshot.go b/worker/snapshot.go index 548fcc1d04b..5af78bb5ecb 100644 --- a/worker/snapshot.go +++ b/worker/snapshot.go @@ -32,7 +32,7 @@ import ( "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/schema" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/x/config.go b/x/config.go index 247d3667d47..cd3440c518f 100644 --- a/x/config.go +++ b/x/config.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/viper" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Options stores the options for this package. diff --git a/x/disk_metrics_linux.go b/x/disk_metrics_linux.go index bbb431d8582..d8a0e68a578 100644 --- a/x/disk_metrics_linux.go +++ b/x/disk_metrics_linux.go @@ -14,7 +14,7 @@ import ( "go.opencensus.io/stats" "go.opencensus.io/tag" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func MonitorDiskMetrics(dirTag string, dir string, lc *z.Closer) { diff --git a/x/disk_metrics_others.go b/x/disk_metrics_others.go index 0464be68fb5..885a0aeb7a9 100644 --- a/x/disk_metrics_others.go +++ b/x/disk_metrics_others.go @@ -6,7 +6,7 @@ package x import ( "github.com/golang/glog" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) func MonitorDiskMetrics(_ string, _ string, lc *z.Closer) { diff --git a/x/flags.go b/x/flags.go index c8e3c3a20dc..67829a41c7d 100644 --- a/x/flags.go +++ b/x/flags.go @@ -19,7 +19,7 @@ package x import ( "github.com/spf13/pflag" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/x/init.go b/x/init.go index 24a699b8aa7..9f6c276ee3a 100644 --- a/x/init.go +++ b/x/init.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/x/log_writer.go b/x/log_writer.go index 5f31aa4c046..0a54b4e29ec 100644 --- a/x/log_writer.go +++ b/x/log_writer.go @@ -32,7 +32,7 @@ import ( "github.com/golang/glog" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) const ( diff --git a/x/metrics.go b/x/metrics.go index 5da3567699e..1ca431500a3 100644 --- a/x/metrics.go +++ b/x/metrics.go @@ -44,7 +44,7 @@ import ( "go.opencensus.io/trace" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/x/server.go b/x/server.go index 38229128acb..83688d66447 100644 --- a/x/server.go +++ b/x/server.go @@ -13,7 +13,7 @@ import ( "github.com/golang/glog" "github.com/soheilhy/cmux" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var ( diff --git a/x/tls_helper.go b/x/tls_helper.go index 75c4577dbc2..4f61f35a8a8 100644 --- a/x/tls_helper.go +++ b/x/tls_helper.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // TLSHelperConfig define params used to create a tls.Config diff --git a/x/x.go b/x/x.go index 5328f9fece0..b2d057e3b26 100644 --- a/x/x.go +++ b/x/x.go @@ -62,7 +62,7 @@ import ( badgerpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/dgo/v240" "github.com/dgraph-io/dgo/v240/protos/api" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Error constants representing different types of errors. diff --git a/xidmap/trie.go b/xidmap/trie.go index bc1eb910405..90880732d28 100644 --- a/xidmap/trie.go +++ b/xidmap/trie.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Trie is an implementation of Ternary Search Tries to store XID to UID map. It uses Arena to diff --git a/xidmap/xidmap.go b/xidmap/xidmap.go index 6c2225d3ab5..131d6a406cf 100644 --- a/xidmap/xidmap.go +++ b/xidmap/xidmap.go @@ -36,7 +36,7 @@ import ( "github.com/dgraph-io/dgo/v240" "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) var maxLeaseRegex = regexp.MustCompile(`currMax:([0-9]+)`) diff --git a/xidmap/xidmap_test.go b/xidmap/xidmap_test.go index 87f376bc57a..eada982a0ba 100644 --- a/xidmap/xidmap_test.go +++ b/xidmap/xidmap_test.go @@ -18,7 +18,7 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgraph/v24/testutil" "github.com/dgraph-io/dgraph/v24/x" - "github.com/dgraph-io/ristretto/z" + "github.com/dgraph-io/ristretto/v2/z" ) // Opens a badger db and runs a a test on it.