diff --git a/algo/heap.go b/algo/heap.go index 751e4ab828e..d020bef5a66 100644 --- a/algo/heap.go +++ b/algo/heap.go @@ -17,7 +17,7 @@ package algo import ( - "github.com/dgraph-io/dgraph/codec" + "github.com/dgraph-io/dgraph/v24/codec" ) type elem struct { diff --git a/algo/packed.go b/algo/packed.go index f025d733814..b105ef3aef0 100644 --- a/algo/packed.go +++ b/algo/packed.go @@ -20,8 +20,8 @@ import ( "container/heap" "sort" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) // ApplyFilterPacked applies the filter to a list of packed uids. diff --git a/algo/packed_test.go b/algo/packed_test.go index 444de2bbcee..2281a8893c5 100644 --- a/algo/packed_test.go +++ b/algo/packed_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) func newUidPack(data []uint64) *pb.UidPack { diff --git a/algo/uidlist.go b/algo/uidlist.go index cb37232f3bd..32277a9c752 100644 --- a/algo/uidlist.go +++ b/algo/uidlist.go @@ -20,8 +20,8 @@ import ( "container/heap" "sort" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const jump = 32 // Jump size in InsersectWithJump. diff --git a/algo/uidlist_test.go b/algo/uidlist_test.go index 50fddb30b38..183d4e43fe0 100644 --- a/algo/uidlist_test.go +++ b/algo/uidlist_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) func newList(data []uint64) *pb.List { diff --git a/check_upgrade/check_upgrade.go b/check_upgrade/check_upgrade.go index 4c4ec02f52a..f975d8c1beb 100644 --- a/check_upgrade/check_upgrade.go +++ b/check_upgrade/check_upgrade.go @@ -30,8 +30,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/check_upgrade/check_upgrade_test.go b/check_upgrade/check_upgrade_test.go index 663fe529366..baacefe2999 100644 --- a/check_upgrade/check_upgrade_test.go +++ b/check_upgrade/check_upgrade_test.go @@ -28,9 +28,9 @@ import ( "time" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" ) diff --git a/chunker/chunk.go b/chunker/chunk.go index b2cf9e5db81..098ab1e12fb 100644 --- a/chunker/chunk.go +++ b/chunker/chunk.go @@ -30,9 +30,9 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/x" ) // Chunker describes the interface to parse and process the input to the live and bulk loaders. diff --git a/chunker/json_parser.go b/chunker/json_parser.go index 1d82f9a44bd..cb1a2c2bacb 100644 --- a/chunker/json_parser.go +++ b/chunker/json_parser.go @@ -31,10 +31,10 @@ import ( "github.com/twpayne/go-geom/encoding/geojson" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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/simdjson-go" ) diff --git a/chunker/json_parser_test.go b/chunker/json_parser_test.go index fe1a581b1ca..d5c1caa0f74 100644 --- a/chunker/json_parser_test.go +++ b/chunker/json_parser_test.go @@ -32,9 +32,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" ) func makeNquad(sub, pred string, val *api.Value) *api.NQuad { diff --git a/chunker/rdf_parser.go b/chunker/rdf_parser.go index 9303beb1519..6496a7b712f 100644 --- a/chunker/rdf_parser.go +++ b/chunker/rdf_parser.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/chunker/rdf_parser_test.go b/chunker/rdf_parser_test.go index 491aa90f100..fd928a3ada7 100644 --- a/chunker/rdf_parser_test.go +++ b/chunker/rdf_parser_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) var testNQuads = []struct { diff --git a/chunker/rdf_state.go b/chunker/rdf_state.go index ba669f08fc8..5a2fdfe7d6a 100644 --- a/chunker/rdf_state.go +++ b/chunker/rdf_state.go @@ -19,7 +19,7 @@ package chunker import ( "strconv" - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) // The constants represent different types of lexed Items possible for an rdf N-Quad. diff --git a/codec/benchmark/benchmark.go b/codec/benchmark/benchmark.go index 5bddca78c86..39c15809ebe 100644 --- a/codec/benchmark/benchmark.go +++ b/codec/benchmark/benchmark.go @@ -33,9 +33,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // So, with SIMD instructions before, we were getting great performance, but at the cost of diff --git a/codec/codec.go b/codec/codec.go index 60359f474fa..2a17eb83bb5 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -25,8 +25,8 @@ import ( "github.com/dgryski/go-groupvarint" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/codec/codec_test.go b/codec/codec_test.go index 31d0b483214..56903af2f99 100644 --- a/codec/codec_test.go +++ b/codec/codec_test.go @@ -29,8 +29,8 @@ import ( "github.com/dustin/go-humanize" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/compose/compose.go b/compose/compose.go index be0d900a085..54610f5536b 100644 --- a/compose/compose.go +++ b/compose/compose.go @@ -30,7 +30,7 @@ import ( "github.com/spf13/pflag" yaml "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type stringMap map[string]string diff --git a/conn/node.go b/conn/node.go index 2c205cccfe7..b4a682c5be1 100644 --- a/conn/node.go +++ b/conn/node.go @@ -36,9 +36,9 @@ import ( "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "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" ) diff --git a/conn/node_test.go b/conn/node_test.go index 7b7887f9071..f312a674e35 100644 --- a/conn/node_test.go +++ b/conn/node_test.go @@ -28,8 +28,8 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" ) func (n *Node) run(wg *sync.WaitGroup) { diff --git a/conn/pool.go b/conn/pool.go index e317c8adc6b..af454449e78 100644 --- a/conn/pool.go +++ b/conn/pool.go @@ -31,8 +31,8 @@ import ( "google.golang.org/grpc/credentials/insecure" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/conn/raft_server.go b/conn/raft_server.go index ee8f2862406..bfc2017f72f 100644 --- a/conn/raft_server.go +++ b/conn/raft_server.go @@ -31,8 +31,8 @@ import ( otrace "go.opencensus.io/trace" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) type sendmsg struct { diff --git a/contrib/integration/acctupsert/main.go b/contrib/integration/acctupsert/main.go index 2a257573662..8776c7afc66 100644 --- a/contrib/integration/acctupsert/main.go +++ b/contrib/integration/acctupsert/main.go @@ -31,8 +31,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/contrib/integration/bank/main.go b/contrib/integration/bank/main.go index 4a180590048..8fe2c9e894b 100644 --- a/contrib/integration/bank/main.go +++ b/contrib/integration/bank/main.go @@ -41,7 +41,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/contrib/integration/bigdata/main.go b/contrib/integration/bigdata/main.go index 721a49b57b3..37a580a36e5 100644 --- a/contrib/integration/bigdata/main.go +++ b/contrib/integration/bigdata/main.go @@ -33,7 +33,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var addrs = flag.String("addrs", "", "comma separated dgraph addresses") diff --git a/contrib/integration/mutates/main.go b/contrib/integration/mutates/main.go index abbf2ca351a..18a3b5e412a 100644 --- a/contrib/integration/mutates/main.go +++ b/contrib/integration/mutates/main.go @@ -28,7 +28,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var alpha = flag.String("alpha", "localhost:9080", "Dgraph alpha addr") diff --git a/contrib/integration/swap/main.go b/contrib/integration/swap/main.go index 28db51a5815..87166c0d7cd 100644 --- a/contrib/integration/swap/main.go +++ b/contrib/integration/swap/main.go @@ -32,8 +32,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/contrib/integration/testtxn/main_test.go b/contrib/integration/testtxn/main_test.go index 3e88c76f48e..6a20ec5948c 100644 --- a/contrib/integration/testtxn/main_test.go +++ b/contrib/integration/testtxn/main_test.go @@ -35,8 +35,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type state struct { diff --git a/contrib/jepsen/main.go b/contrib/jepsen/main.go index 327ba35cc99..1f1216b34e9 100644 --- a/contrib/jepsen/main.go +++ b/contrib/jepsen/main.go @@ -45,7 +45,7 @@ import ( "github.com/spf13/pflag" - "github.com/dgraph-io/dgraph/contrib/jepsen/browser" + "github.com/dgraph-io/dgraph/v24/contrib/jepsen/browser" ) type jepsenTest struct { diff --git a/dgraph/cmd/alpha/admin.go b/dgraph/cmd/alpha/admin.go index 1c66a0410ca..3c42622f653 100644 --- a/dgraph/cmd/alpha/admin.go +++ b/dgraph/cmd/alpha/admin.go @@ -24,10 +24,10 @@ import ( "strconv" "strings" - "github.com/dgraph-io/dgraph/graphql/admin" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/admin" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type allowedMethods map[string]bool diff --git a/dgraph/cmd/alpha/dashboard.go b/dgraph/cmd/alpha/dashboard.go index c2b4797dcf8..db26957def7 100644 --- a/dgraph/cmd/alpha/dashboard.go +++ b/dgraph/cmd/alpha/dashboard.go @@ -20,7 +20,7 @@ import ( "encoding/json" "net/http" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type keyword struct { diff --git a/dgraph/cmd/alpha/http.go b/dgraph/cmd/alpha/http.go index 8ebde0f59b0..0c23e4174f5 100644 --- a/dgraph/cmd/alpha/http.go +++ b/dgraph/cmd/alpha/http.go @@ -37,12 +37,12 @@ import ( "google.golang.org/grpc/metadata" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/admin" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/admin" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/x" ) func allowed(method string) bool { diff --git a/dgraph/cmd/alpha/http_test.go b/dgraph/cmd/alpha/http_test.go index ea01f7c75fd..3173eea4374 100644 --- a/dgraph/cmd/alpha/http_test.go +++ b/dgraph/cmd/alpha/http_test.go @@ -35,10 +35,10 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type res struct { diff --git a/dgraph/cmd/alpha/login_ee.go b/dgraph/cmd/alpha/login_ee.go index 09130892f7d..31d57082368 100644 --- a/dgraph/cmd/alpha/login_ee.go +++ b/dgraph/cmd/alpha/login_ee.go @@ -21,8 +21,8 @@ import ( "github.com/golang/glog" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/x" ) func loginHandler(w http.ResponseWriter, r *http.Request) { diff --git a/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go b/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go index b665148d1b1..88a32ddfe7a 100644 --- a/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go +++ b/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go @@ -29,7 +29,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) // Tests in this file require a cluster running with the --limit "mutations=;" flag. diff --git a/dgraph/cmd/alpha/run.go b/dgraph/cmd/alpha/run.go index 857843ff45a..be2763674fa 100644 --- a/dgraph/cmd/alpha/run.go +++ b/dgraph/cmd/alpha/run.go @@ -50,16 +50,16 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/graphql/admin" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/graphql/admin" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/schema" + "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/gqlparser/v2/validator/rules" // make gql validator init() all rules "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/alpha/run_test.go b/dgraph/cmd/alpha/run_test.go index 957d45e58fe..a8c036b1905 100644 --- a/dgraph/cmd/alpha/run_test.go +++ b/dgraph/cmd/alpha/run_test.go @@ -46,12 +46,12 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type defaultContextKey int diff --git a/dgraph/cmd/alpha/upsert_test.go b/dgraph/cmd/alpha/upsert_test.go index fbd2afdd22f..2d93540df4b 100644 --- a/dgraph/cmd/alpha/upsert_test.go +++ b/dgraph/cmd/alpha/upsert_test.go @@ -30,8 +30,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type QueryResult struct { diff --git a/dgraph/cmd/bulk/count_index.go b/dgraph/cmd/bulk/count_index.go index d307b1a906d..9f76e58f7d1 100644 --- a/dgraph/cmd/bulk/count_index.go +++ b/dgraph/cmd/bulk/count_index.go @@ -26,10 +26,10 @@ import ( "github.com/golang/glog" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "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" ) diff --git a/dgraph/cmd/bulk/loader.go b/dgraph/cmd/bulk/loader.go index e102dc7e411..04ca30d5511 100644 --- a/dgraph/cmd/bulk/loader.go +++ b/dgraph/cmd/bulk/loader.go @@ -39,14 +39,14 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/filestore" - gqlSchema "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" - "github.com/dgraph-io/dgraph/xidmap" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/filestore" + gqlSchema "github.com/dgraph-io/dgraph/v24/graphql/schema" + "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/dgraph/v24/xidmap" ) type options struct { diff --git a/dgraph/cmd/bulk/mapper.go b/dgraph/cmd/bulk/mapper.go index ada9fb467ac..fda88c6f0e1 100644 --- a/dgraph/cmd/bulk/mapper.go +++ b/dgraph/cmd/bulk/mapper.go @@ -34,15 +34,15 @@ import ( "github.com/golang/snappy" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "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" ) diff --git a/dgraph/cmd/bulk/merge_shards.go b/dgraph/cmd/bulk/merge_shards.go index 594481c2b72..b4628db1437 100644 --- a/dgraph/cmd/bulk/merge_shards.go +++ b/dgraph/cmd/bulk/merge_shards.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dgraph/cmd/bulk/progress.go b/dgraph/cmd/bulk/progress.go index aa7d4c3a964..fa2d49b177b 100644 --- a/dgraph/cmd/bulk/progress.go +++ b/dgraph/cmd/bulk/progress.go @@ -23,7 +23,7 @@ import ( "github.com/dustin/go-humanize" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/bulk/reduce.go b/dgraph/cmd/bulk/reduce.go index 3a99718e703..6495c163d2f 100644 --- a/dgraph/cmd/bulk/reduce.go +++ b/dgraph/cmd/bulk/reduce.go @@ -41,10 +41,10 @@ import ( bo "github.com/dgraph-io/badger/v4/options" bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "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" ) diff --git a/dgraph/cmd/bulk/run.go b/dgraph/cmd/bulk/run.go index 773329b0678..00066ea5ec3 100644 --- a/dgraph/cmd/bulk/run.go +++ b/dgraph/cmd/bulk/run.go @@ -32,12 +32,12 @@ import ( "github.com/spf13/cobra" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/filestore" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/filestore" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/dgraph/cmd/bulk/schema.go b/dgraph/cmd/bulk/schema.go index 58513afb2ba..b4b2949dd80 100644 --- a/dgraph/cmd/bulk/schema.go +++ b/dgraph/cmd/bulk/schema.go @@ -23,11 +23,11 @@ import ( "sync" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - wk "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + wk "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type schemaStore struct { diff --git a/dgraph/cmd/bulk/shard_map.go b/dgraph/cmd/bulk/shard_map.go index 8f82988d274..24d3538a53d 100644 --- a/dgraph/cmd/bulk/shard_map.go +++ b/dgraph/cmd/bulk/shard_map.go @@ -19,7 +19,7 @@ package bulk import ( "sync" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type shardMap struct { diff --git a/dgraph/cmd/cert/info.go b/dgraph/cmd/cert/info.go index 8b338c9824e..4a168b7048e 100644 --- a/dgraph/cmd/cert/info.go +++ b/dgraph/cmd/cert/info.go @@ -31,7 +31,7 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type certInfo struct { diff --git a/dgraph/cmd/cert/run.go b/dgraph/cmd/cert/run.go index 31e948674ef..d0080956789 100644 --- a/dgraph/cmd/cert/run.go +++ b/dgraph/cmd/cert/run.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // Cert is the sub-command invoked when running "dgraph cert". diff --git a/dgraph/cmd/conv/conv.go b/dgraph/cmd/conv/conv.go index 565f1ee9685..21496bd7fad 100644 --- a/dgraph/cmd/conv/conv.go +++ b/dgraph/cmd/conv/conv.go @@ -29,7 +29,7 @@ import ( "github.com/golang/glog" geojson "github.com/paulmach/go.geojson" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // TODO: Reconsider if we need this binary. diff --git a/dgraph/cmd/conv/run.go b/dgraph/cmd/conv/run.go index b3ff05c51ae..b59018ff8b4 100644 --- a/dgraph/cmd/conv/run.go +++ b/dgraph/cmd/conv/run.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // Conv is the sub-command invoked when running "dgraph conv". diff --git a/dgraph/cmd/debug/run.go b/dgraph/cmd/debug/run.go index 4b721fe0776..278760e211f 100644 --- a/dgraph/cmd/debug/run.go +++ b/dgraph/cmd/debug/run.go @@ -38,13 +38,13 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/dgraph/cmd/debug/wal.go b/dgraph/cmd/debug/wal.go index 3c763cbcd0b..81021f7d689 100644 --- a/dgraph/cmd/debug/wal.go +++ b/dgraph/cmd/debug/wal.go @@ -27,9 +27,9 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/x" ) func printEntry(es raftpb.Entry, pending map[uint64]bool, isZero bool) { diff --git a/dgraph/cmd/debuginfo/run.go b/dgraph/cmd/debuginfo/run.go index 597c9b0ab07..363c02fd496 100644 --- a/dgraph/cmd/debuginfo/run.go +++ b/dgraph/cmd/debuginfo/run.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type debugInfoCmdOpts struct { diff --git a/dgraph/cmd/decrypt/decrypt.go b/dgraph/cmd/decrypt/decrypt.go index d96ef8df319..cce1c6cc1d9 100644 --- a/dgraph/cmd/decrypt/decrypt.go +++ b/dgraph/cmd/decrypt/decrypt.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/x" ) type options struct { diff --git a/dgraph/cmd/increment/increment.go b/dgraph/cmd/increment/increment.go index 81f11828770..434b67b34f6 100644 --- a/dgraph/cmd/increment/increment.go +++ b/dgraph/cmd/increment/increment.go @@ -33,7 +33,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/increment/increment_test.go b/dgraph/cmd/increment/increment_test.go index 45b91c8e0cf..fa0c05469e3 100644 --- a/dgraph/cmd/increment/increment_test.go +++ b/dgraph/cmd/increment/increment_test.go @@ -34,7 +34,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) const N = 10 diff --git a/dgraph/cmd/live/batch.go b/dgraph/cmd/live/batch.go index c95e653b59a..ec88de98f75 100644 --- a/dgraph/cmd/live/batch.go +++ b/dgraph/cmd/live/batch.go @@ -36,12 +36,12 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" - "github.com/dgraph-io/dgraph/xidmap" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" + "github.com/dgraph-io/dgraph/v24/xidmap" ) // batchMutationOptions sets the clients batch mode to Pending number of buffers each of Size. diff --git a/dgraph/cmd/live/load-json/load_test.go b/dgraph/cmd/live/load-json/load_test.go index 314f18e0c32..d6676cc67b0 100644 --- a/dgraph/cmd/live/load-json/load_test.go +++ b/dgraph/cmd/live/load-json/load_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var alphaService = testutil.SockAddr diff --git a/dgraph/cmd/live/load-uids/load_test.go b/dgraph/cmd/live/load-uids/load_test.go index 8ce2531a48d..59084be9ad6 100644 --- a/dgraph/cmd/live/load-uids/load_test.go +++ b/dgraph/cmd/live/load-uids/load_test.go @@ -35,9 +35,9 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/dgraph/cmd/live/run.go b/dgraph/cmd/live/run.go index e33db2acea1..c4c5ba1e620 100644 --- a/dgraph/cmd/live/run.go +++ b/dgraph/cmd/live/run.go @@ -46,14 +46,14 @@ import ( bopt "github.com/dgraph-io/badger/v4/options" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/filestore" - schemapkg "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" - "github.com/dgraph-io/dgraph/xidmap" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/filestore" + schemapkg "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/dgraph/v24/xidmap" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/migrate/run.go b/dgraph/cmd/migrate/run.go index 8f5d5b3a3a8..8afdc81de02 100644 --- a/dgraph/cmd/migrate/run.go +++ b/dgraph/cmd/migrate/run.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/dgraph/cmd/migrate/table_info.go b/dgraph/cmd/migrate/table_info.go index 743f476e20c..02a0b51a9c0 100644 --- a/dgraph/cmd/migrate/table_info.go +++ b/dgraph/cmd/migrate/table_info.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type keyType int diff --git a/dgraph/cmd/migrate/utils.go b/dgraph/cmd/migrate/utils.go index 603f5726cdc..ebb4caefaa2 100644 --- a/dgraph/cmd/migrate/utils.go +++ b/dgraph/cmd/migrate/utils.go @@ -27,7 +27,7 @@ import ( "github.com/go-sql-driver/mysql" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func getPool(host, port, user, password, db string) (*sql.DB, diff --git a/dgraph/cmd/root.go b/dgraph/cmd/root.go index cd752d5fa5a..71aa4e2af8f 100644 --- a/dgraph/cmd/root.go +++ b/dgraph/cmd/root.go @@ -32,21 +32,21 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - checkupgrade "github.com/dgraph-io/dgraph/check_upgrade" - "github.com/dgraph-io/dgraph/dgraph/cmd/alpha" - "github.com/dgraph-io/dgraph/dgraph/cmd/bulk" - "github.com/dgraph-io/dgraph/dgraph/cmd/cert" - "github.com/dgraph-io/dgraph/dgraph/cmd/conv" - "github.com/dgraph-io/dgraph/dgraph/cmd/debug" - "github.com/dgraph-io/dgraph/dgraph/cmd/debuginfo" - "github.com/dgraph-io/dgraph/dgraph/cmd/decrypt" - "github.com/dgraph-io/dgraph/dgraph/cmd/increment" - "github.com/dgraph-io/dgraph/dgraph/cmd/live" - "github.com/dgraph-io/dgraph/dgraph/cmd/migrate" - "github.com/dgraph-io/dgraph/dgraph/cmd/version" - "github.com/dgraph-io/dgraph/dgraph/cmd/zero" - "github.com/dgraph-io/dgraph/upgrade" - "github.com/dgraph-io/dgraph/x" + checkupgrade "github.com/dgraph-io/dgraph/v24/check_upgrade" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/alpha" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/bulk" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/cert" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/conv" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/debug" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/debuginfo" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/decrypt" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/increment" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/live" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/migrate" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/version" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/zero" + "github.com/dgraph-io/dgraph/v24/upgrade" + "github.com/dgraph-io/dgraph/v24/x" ) // RootCmd represents the base command when called without any subcommands diff --git a/dgraph/cmd/root_ee.go b/dgraph/cmd/root_ee.go index 12c6e12dcbf..22f12fbc57c 100644 --- a/dgraph/cmd/root_ee.go +++ b/dgraph/cmd/root_ee.go @@ -14,9 +14,9 @@ package cmd import ( - acl "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/ee/backup" + acl "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/ee/backup" ) func init() { diff --git a/dgraph/cmd/version/run.go b/dgraph/cmd/version/run.go index 72b6e92094a..0d9cd139301 100644 --- a/dgraph/cmd/version/run.go +++ b/dgraph/cmd/version/run.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // Version is the sub-command invoked when running "dgraph version". diff --git a/dgraph/cmd/version/version_test.go b/dgraph/cmd/version/version_test.go index a1824c576e5..872247b0585 100644 --- a/dgraph/cmd/version/version_test.go +++ b/dgraph/cmd/version/version_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) // Test `dgraph version` with an empty config file. diff --git a/dgraph/cmd/zero/assign.go b/dgraph/cmd/zero/assign.go index 18ead6d6d15..608b265c394 100644 --- a/dgraph/cmd/zero/assign.go +++ b/dgraph/cmd/zero/assign.go @@ -26,8 +26,8 @@ import ( otrace "go.opencensus.io/trace" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) var emptyAssignedIds pb.AssignedIds diff --git a/dgraph/cmd/zero/http.go b/dgraph/cmd/zero/http.go index b36c7d18615..6b549226d2b 100644 --- a/dgraph/cmd/zero/http.go +++ b/dgraph/cmd/zero/http.go @@ -30,8 +30,8 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // intFromQueryParam checks for name as a query param, converts it to uint64 and returns it. diff --git a/dgraph/cmd/zero/license.go b/dgraph/cmd/zero/license.go index a7fe91dec6c..bf05aa5d1f2 100644 --- a/dgraph/cmd/zero/license.go +++ b/dgraph/cmd/zero/license.go @@ -22,7 +22,7 @@ package zero import ( "net/http" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/zero/license_ee.go b/dgraph/cmd/zero/license_ee.go index 14cb8676ee7..bd113a17665 100644 --- a/dgraph/cmd/zero/license_ee.go +++ b/dgraph/cmd/zero/license_ee.go @@ -8,7 +8,7 @@ * may not use this file except in compliance with the License. You * may obtain a copy of the License at * - * https://github.com/dgraph-io/dgraph/blob/master/licenses/DCL.txt + * https://github.com/dgraph-io/dgraph/v24/blob/master/licenses/DCL.txt */ package zero @@ -25,9 +25,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/golang/glog" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "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" ) diff --git a/dgraph/cmd/zero/oracle.go b/dgraph/cmd/zero/oracle.go index 97b4dd07e72..1bb48a500e8 100644 --- a/dgraph/cmd/zero/oracle.go +++ b/dgraph/cmd/zero/oracle.go @@ -29,9 +29,9 @@ import ( "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/x" + "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" ) diff --git a/dgraph/cmd/zero/raft.go b/dgraph/cmd/zero/raft.go index b41290812d1..731bd05798c 100644 --- a/dgraph/cmd/zero/raft.go +++ b/dgraph/cmd/zero/raft.go @@ -38,10 +38,10 @@ import ( "go.opencensus.io/tag" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "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" ) diff --git a/dgraph/cmd/zero/run.go b/dgraph/cmd/zero/run.go index e73e31a2cf5..0bd25781fdd 100644 --- a/dgraph/cmd/zero/run.go +++ b/dgraph/cmd/zero/run.go @@ -38,13 +38,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/dgraph/cmd/zero/tablet.go b/dgraph/cmd/zero/tablet.go index c6accb75334..db5b8cde008 100644 --- a/dgraph/cmd/zero/tablet.go +++ b/dgraph/cmd/zero/tablet.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dgraph/cmd/zero/zero.go b/dgraph/cmd/zero/zero.go index d5bce3206ef..3fc5ce9dbd2 100644 --- a/dgraph/cmd/zero/zero.go +++ b/dgraph/cmd/zero/zero.go @@ -31,10 +31,10 @@ import ( otrace "go.opencensus.io/trace" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/telemetry" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "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" ) diff --git a/dgraph/cmd/zero/zero_test.go b/dgraph/cmd/zero/zero_test.go index 0197cc724e2..c8a32d9ae4f 100644 --- a/dgraph/cmd/zero/zero_test.go +++ b/dgraph/cmd/zero/zero_test.go @@ -32,9 +32,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/testutil" + "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" ) diff --git a/dgraph/main.go b/dgraph/main.go index ff6ce9bb815..9393005a4c0 100644 --- a/dgraph/main.go +++ b/dgraph/main.go @@ -24,7 +24,7 @@ import ( "github.com/dustin/go-humanize" "github.com/golang/glog" - "github.com/dgraph-io/dgraph/dgraph/cmd" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraphapi/cluster.go b/dgraphapi/cluster.go index 8f833d06d5f..48f6b7be3ca 100644 --- a/dgraphapi/cluster.go +++ b/dgraphapi/cluster.go @@ -32,8 +32,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dgraphtest/compose_cluster.go b/dgraphtest/compose_cluster.go index 640b66ba9f4..e76cd816435 100644 --- a/dgraphtest/compose_cluster.go +++ b/dgraphtest/compose_cluster.go @@ -18,8 +18,8 @@ package dgraphtest import ( "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" ) type ComposeCluster struct{} diff --git a/dgraphtest/dcloud_cluster.go b/dgraphtest/dcloud_cluster.go index eb3923a4944..cfd2b01822c 100644 --- a/dgraphtest/dcloud_cluster.go +++ b/dgraphtest/dcloud_cluster.go @@ -29,7 +29,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphapi" ) type DCloudCluster struct { diff --git a/dgraphtest/load.go b/dgraphtest/load.go index 5093fecb726..5bc693e382e 100644 --- a/dgraphtest/load.go +++ b/dgraphtest/load.go @@ -34,9 +34,9 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dgraphtest/local_cluster.go b/dgraphtest/local_cluster.go index 0248255fa47..e80c1533c56 100644 --- a/dgraphtest/local_cluster.go +++ b/dgraphtest/local_cluster.go @@ -46,8 +46,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) // cluster's network struct diff --git a/dql/bench_test.go b/dql/bench_test.go index 88d7db3de32..b5da55ab8c8 100644 --- a/dql/bench_test.go +++ b/dql/bench_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/schema" + "github.com/dgraph-io/dgraph/v24/schema" ) var sc = `type.object.name.en: string @index . diff --git a/dql/math.go b/dql/math.go index b904b1074bf..8cc7089c482 100644 --- a/dql/math.go +++ b/dql/math.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) type mathTreeStack struct{ a []*MathTree } diff --git a/dql/mutation.go b/dql/mutation.go index 7f2b976cce1..f48e82e9c22 100644 --- a/dql/mutation.go +++ b/dql/mutation.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/dql/parser.go b/dql/parser.go index 006832dc49b..b04a48dc732 100644 --- a/dql/parser.go +++ b/dql/parser.go @@ -26,10 +26,10 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dql/parser_mutation.go b/dql/parser_mutation.go index 2955fc8d870..01b12e5bd70 100644 --- a/dql/parser_mutation.go +++ b/dql/parser_mutation.go @@ -18,7 +18,7 @@ package dql import ( "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) // ParseMutation parses a block into a mutation. Returns an object with a mutation or diff --git a/dql/parser_test.go b/dql/parser_test.go index f54e7b8e293..a92319e1d08 100644 --- a/dql/parser_test.go +++ b/dql/parser_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/types" ) func childAttrs(g *GraphQuery) []string { diff --git a/dql/state.go b/dql/state.go index 32befa72d7c..4fa0b6e6897 100644 --- a/dql/state.go +++ b/dql/state.go @@ -18,7 +18,7 @@ package dql import ( - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) const ( diff --git a/dql/state_test.go b/dql/state_test.go index 6f9368d0551..5814e750dce 100644 --- a/dql/state_test.go +++ b/dql/state_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) func TestQueryLexing(t *testing.T) { diff --git a/edgraph/access.go b/edgraph/access.go index 99d1fe486cd..cf1ae886dd1 100644 --- a/edgraph/access.go +++ b/edgraph/access.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/x" + "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" ) diff --git a/edgraph/access_ee.go b/edgraph/access_ee.go index 52868914b8e..4d21f287aac 100644 --- a/edgraph/access_ee.go +++ b/edgraph/access_ee.go @@ -30,13 +30,13 @@ import ( bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "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" ) diff --git a/edgraph/access_ee_test.go b/edgraph/access_ee_test.go index 61cc40daf2e..bc5c982216c 100644 --- a/edgraph/access_ee_test.go +++ b/edgraph/access_ee_test.go @@ -20,9 +20,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) func generateJWT(namespace uint64, userId string, groupIds []string, expiry int64) string { diff --git a/edgraph/config_mem.go b/edgraph/config_mem.go index 4552e77d357..5a121cc0975 100644 --- a/edgraph/config_mem.go +++ b/edgraph/config_mem.go @@ -7,7 +7,7 @@ package edgraph import ( - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/worker" ) // #include diff --git a/edgraph/graphql.go b/edgraph/graphql.go index d39d35055e8..ffeb6e65f0d 100644 --- a/edgraph/graphql.go +++ b/edgraph/graphql.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) // ProcessPersistedQuery stores and retrieves persisted queries by following waterfall logic: diff --git a/edgraph/multi_tenancy_ee.go b/edgraph/multi_tenancy_ee.go index d212df0b688..1876eac99e7 100644 --- a/edgraph/multi_tenancy_ee.go +++ b/edgraph/multi_tenancy_ee.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type ResetPasswordInput struct { diff --git a/edgraph/server.go b/edgraph/server.go index f7f43d7cb8a..3e1c1209917 100644 --- a/edgraph/server.go +++ b/edgraph/server.go @@ -45,20 +45,20 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/dql" - gqlSchema "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/telemetry" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/dql" + gqlSchema "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/telemetry" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/edgraph/server_test.go b/edgraph/server_test.go index 8e5b1616593..c4acff283db 100644 --- a/edgraph/server_test.go +++ b/edgraph/server_test.go @@ -27,10 +27,10 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) func makeNquad(sub, pred string, val *api.Value) *api.NQuad { diff --git a/ee/acl/acl.go b/ee/acl/acl.go index 77384ba125c..c2738418653 100644 --- a/ee/acl/acl.go +++ b/ee/acl/acl.go @@ -26,7 +26,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func getUserAndGroup(conf *viper.Viper) (userId string, groupId string, err error) { diff --git a/ee/acl/acl_curl_test.go b/ee/acl/acl_curl_test.go index 75075e05fe6..175556f4ae8 100644 --- a/ee/acl/acl_curl_test.go +++ b/ee/acl/acl_curl_test.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func (asuite *AclTestSuite) TestCurlAuthorization() { diff --git a/ee/acl/acl_integration_test.go b/ee/acl/acl_integration_test.go index eaf360cf218..1469a09cdaf 100644 --- a/ee/acl/acl_integration_test.go +++ b/ee/acl/acl_integration_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) func (asuite *AclTestSuite) TestInvalidGetUser() { diff --git a/ee/acl/acl_test.go b/ee/acl/acl_test.go index 6f7281c5e80..bf77e04275a 100644 --- a/ee/acl/acl_test.go +++ b/ee/acl/acl_test.go @@ -26,9 +26,9 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/ee/acl/integration_test.go b/ee/acl/integration_test.go index 51eabf5466f..8ab0ab8f42d 100644 --- a/ee/acl/integration_test.go +++ b/ee/acl/integration_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) type AclTestSuite struct { diff --git a/ee/acl/jwt_algo_test.go b/ee/acl/jwt_algo_test.go index f67ab398f87..01683ba38fb 100644 --- a/ee/acl/jwt_algo_test.go +++ b/ee/acl/jwt_algo_test.go @@ -26,9 +26,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestACLJwtAlgo(t *testing.T) { diff --git a/ee/acl/run.go b/ee/acl/run.go index 19109ee866d..3f4ccff1492 100644 --- a/ee/acl/run.go +++ b/ee/acl/run.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var CmdAcl x.SubCommand diff --git a/ee/acl/run_ee.go b/ee/acl/run_ee.go index f746ed1c740..6b24f8ee508 100644 --- a/ee/acl/run_ee.go +++ b/ee/acl/run_ee.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/ee/acl/upgrade_test.go b/ee/acl/upgrade_test.go index 9230445c460..b19e3b3cd84 100644 --- a/ee/acl/upgrade_test.go +++ b/ee/acl/upgrade_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type AclTestSuite struct { diff --git a/ee/acl/utils.go b/ee/acl/utils.go index 53a8f2db8f3..808ba37c864 100644 --- a/ee/acl/utils.go +++ b/ee/acl/utils.go @@ -22,7 +22,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/audit/audit.go b/ee/audit/audit.go index 9e35eb7cf2b..a86281fa611 100644 --- a/ee/audit/audit.go +++ b/ee/audit/audit.go @@ -19,7 +19,7 @@ package audit -import "github.com/dgraph-io/dgraph/x" +import "github.com/dgraph-io/dgraph/v24/x" type AuditConf struct { Dir string diff --git a/ee/audit/audit_ee.go b/ee/audit/audit_ee.go index 694d4e58aeb..f72df5ef5d9 100644 --- a/ee/audit/audit_ee.go +++ b/ee/audit/audit_ee.go @@ -22,8 +22,8 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/audit/interceptor.go b/ee/audit/interceptor.go index 1b99a108c29..3228ef0a778 100644 --- a/ee/audit/interceptor.go +++ b/ee/audit/interceptor.go @@ -23,7 +23,7 @@ import ( "context" "net/http" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/schema" "google.golang.org/grpc" ) diff --git a/ee/audit/interceptor_ee.go b/ee/audit/interceptor_ee.go index 9a972c821be..22a17ac1252 100644 --- a/ee/audit/interceptor_ee.go +++ b/ee/audit/interceptor_ee.go @@ -26,8 +26,8 @@ import ( "strings" "sync/atomic" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/parser" diff --git a/ee/audit/run.go b/ee/audit/run.go index 3efa35efa93..41020e62251 100644 --- a/ee/audit/run.go +++ b/ee/audit/run.go @@ -22,7 +22,7 @@ package audit import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var CmdAudit x.SubCommand diff --git a/ee/audit/run_ee.go b/ee/audit/run_ee.go index b5d261f0a74..4846228be30 100644 --- a/ee/audit/run_ee.go +++ b/ee/audit/run_ee.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var CmdAudit x.SubCommand diff --git a/ee/audit/run_ee_test.go b/ee/audit/run_ee_test.go index 723cdf1c260..c9511f834fb 100644 --- a/ee/audit/run_ee_test.go +++ b/ee/audit/run_ee_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil/testaudit" + "github.com/dgraph-io/dgraph/v24/testutil/testaudit" ) // we will truncate copy of encrypted audit log file diff --git a/ee/backup/run.go b/ee/backup/run.go index eb5b666fe71..c70be926fdf 100644 --- a/ee/backup/run.go +++ b/ee/backup/run.go @@ -30,11 +30,11 @@ import ( "google.golang.org/grpc/credentials/insecure" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/posting" + "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" ) diff --git a/ee/enc/util_ee.go b/ee/enc/util_ee.go index 27852eda71b..77fdb9aa6bc 100644 --- a/ee/enc/util_ee.go +++ b/ee/enc/util_ee.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // EeBuild indicates if this is a Enterprise build. diff --git a/ee/flags.go b/ee/flags.go index db62a9274d0..dd025034630 100644 --- a/ee/flags.go +++ b/ee/flags.go @@ -24,7 +24,7 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/spf13/pflag" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/keys_ee.go b/ee/keys_ee.go index 17c6248a3a5..6fbb5290d94 100644 --- a/ee/keys_ee.go +++ b/ee/keys_ee.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/vault/vault.go b/ee/vault/vault.go index de4de8cf773..d03ec5d81fc 100644 --- a/ee/vault/vault.go +++ b/ee/vault/vault.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/ee" + "github.com/dgraph-io/dgraph/v24/ee" ) func GetKeys(config *viper.Viper) (*ee.Keys, error) { diff --git a/ee/vault_ee.go b/ee/vault_ee.go index 00bf1d1d8e2..603ca0c7cfc 100644 --- a/ee/vault_ee.go +++ b/ee/vault_ee.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/filestore/filestore.go b/filestore/filestore.go index b0ac6dd6fba..ceb99cdcd71 100644 --- a/filestore/filestore.go +++ b/filestore/filestore.go @@ -21,7 +21,7 @@ import ( "io" "net/url" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // FileStore represents a file or directory of files that are either stored diff --git a/filestore/local_files.go b/filestore/local_files.go index 7194294a4d5..962bc08e7d2 100644 --- a/filestore/local_files.go +++ b/filestore/local_files.go @@ -21,8 +21,8 @@ import ( "io" "os" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/x" ) type localFiles struct { diff --git a/filestore/remote_files.go b/filestore/remote_files.go index e362bf7803f..9f5104fcac9 100644 --- a/filestore/remote_files.go +++ b/filestore/remote_files.go @@ -24,8 +24,8 @@ import ( "github.com/minio/minio-go/v6" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/x" ) type remoteFiles struct { diff --git a/go.mod b/go.mod index 39e9ba3c0a5..cbf3eec64e9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/dgraph-io/dgraph +module github.com/dgraph-io/dgraph/v24 go 1.22.6 diff --git a/graphql/admin/add_group.go b/graphql/admin/add_group.go index 1e7a150af07..ea5a7aeb4fe 100644 --- a/graphql/admin/add_group.go +++ b/graphql/admin/add_group.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type addGroupRewriter resolve.AddRewriter diff --git a/graphql/admin/admin.go b/graphql/admin/admin.go index 5143e72f385..95fc7b1459f 100644 --- a/graphql/admin/admin.go +++ b/graphql/admin/admin.go @@ -27,13 +27,13 @@ import ( "github.com/pkg/errors" badgerpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/graphql/admin/assign.go b/graphql/admin/assign.go index 0693d108207..6eec6b08b00 100644 --- a/graphql/admin/assign.go +++ b/graphql/admin/assign.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) const ( diff --git a/graphql/admin/backup.go b/graphql/admin/backup.go index 7598195ef3b..7c6d95891f0 100644 --- a/graphql/admin/backup.go +++ b/graphql/admin/backup.go @@ -23,10 +23,10 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type backupInput struct { diff --git a/graphql/admin/config.go b/graphql/admin/config.go index 88fa6fece4d..88d0350ebba 100644 --- a/graphql/admin/config.go +++ b/graphql/admin/config.go @@ -23,9 +23,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/worker" ) type configInput struct { diff --git a/graphql/admin/current_user.go b/graphql/admin/current_user.go index 6b119b4cd6b..733e628d55e 100644 --- a/graphql/admin/current_user.go +++ b/graphql/admin/current_user.go @@ -19,10 +19,10 @@ package admin import ( "context" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type currentUserResolver struct { diff --git a/graphql/admin/draining.go b/graphql/admin/draining.go index bfe68753ee1..bfa49cc7ead 100644 --- a/graphql/admin/draining.go +++ b/graphql/admin/draining.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func resolveDraining(ctx context.Context, m schema.Mutation) (*resolve.Resolved, bool) { diff --git a/graphql/admin/enterpriseLicense.go b/graphql/admin/enterpriseLicense.go index 6b8f154e673..5862f9ffb0b 100644 --- a/graphql/admin/enterpriseLicense.go +++ b/graphql/admin/enterpriseLicense.go @@ -20,10 +20,10 @@ import ( "context" "encoding/json" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type enterpriseLicenseInput struct { diff --git a/graphql/admin/export.go b/graphql/admin/export.go index 06cd734c892..9d632f6a91a 100644 --- a/graphql/admin/export.go +++ b/graphql/admin/export.go @@ -25,11 +25,11 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) const notSet = math.MaxInt64 diff --git a/graphql/admin/health.go b/graphql/admin/health.go index e11357060d1..a45815a93d1 100644 --- a/graphql/admin/health.go +++ b/graphql/admin/health.go @@ -22,10 +22,10 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func resolveHealth(ctx context.Context, q schema.Query) *resolve.Resolved { diff --git a/graphql/admin/http.go b/graphql/admin/http.go index 0715a9148b4..f0739d5fbd9 100644 --- a/graphql/admin/http.go +++ b/graphql/admin/http.go @@ -31,13 +31,13 @@ import ( "github.com/pkg/errors" "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/graphql/api" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/subscription" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/graphql/api" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/subscription" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/graphql-transport-ws/graphqlws" ) diff --git a/graphql/admin/list_backups.go b/graphql/admin/list_backups.go index ba0be0c04ea..76fb9f7c325 100644 --- a/graphql/admin/list_backups.go +++ b/graphql/admin/list_backups.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type lsBackupInput struct { diff --git a/graphql/admin/login.go b/graphql/admin/login.go index 63b312fe997..f993557fced 100644 --- a/graphql/admin/login.go +++ b/graphql/admin/login.go @@ -23,9 +23,9 @@ import ( "github.com/golang/glog" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" ) type loginInput struct { diff --git a/graphql/admin/moveTablet.go b/graphql/admin/moveTablet.go index c0ab45fe043..d044f63ac87 100644 --- a/graphql/admin/moveTablet.go +++ b/graphql/admin/moveTablet.go @@ -21,11 +21,11 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type moveTabletInput struct { diff --git a/graphql/admin/namespace.go b/graphql/admin/namespace.go index 7263e24ce54..7822bf239bd 100644 --- a/graphql/admin/namespace.go +++ b/graphql/admin/namespace.go @@ -23,10 +23,10 @@ import ( "fmt" "strconv" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type addNamespaceInput struct { diff --git a/graphql/admin/removeNode.go b/graphql/admin/removeNode.go index 30ec246fb45..72de2cf8337 100644 --- a/graphql/admin/removeNode.go +++ b/graphql/admin/removeNode.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type removeNodeInput struct { diff --git a/graphql/admin/reset_password.go b/graphql/admin/reset_password.go index 221aaff8e92..6250e8d3f6e 100644 --- a/graphql/admin/reset_password.go +++ b/graphql/admin/reset_password.go @@ -23,9 +23,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" ) func resolveResetPassword(ctx context.Context, m schema.Mutation) (*resolve.Resolved, bool) { diff --git a/graphql/admin/restore.go b/graphql/admin/restore.go index da664cca2d2..b20add7dde1 100644 --- a/graphql/admin/restore.go +++ b/graphql/admin/restore.go @@ -24,11 +24,11 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type restoreInput struct { diff --git a/graphql/admin/schema.go b/graphql/admin/schema.go index 1e8e74d2034..0388202295e 100644 --- a/graphql/admin/schema.go +++ b/graphql/admin/schema.go @@ -22,12 +22,12 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type getSchemaResolver struct { diff --git a/graphql/admin/shutdown.go b/graphql/admin/shutdown.go index 10e602dab81..7ccf5424ff1 100644 --- a/graphql/admin/shutdown.go +++ b/graphql/admin/shutdown.go @@ -21,9 +21,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func resolveShutdown(ctx context.Context, m schema.Mutation) (*resolve.Resolved, bool) { diff --git a/graphql/admin/state.go b/graphql/admin/state.go index 4240eb64983..461fb4ed266 100644 --- a/graphql/admin/state.go +++ b/graphql/admin/state.go @@ -8,11 +8,11 @@ import ( "github.com/gogo/protobuf/jsonpb" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) type membershipState struct { diff --git a/graphql/admin/task.go b/graphql/admin/task.go index d2131332c16..e30a08a8aa6 100644 --- a/graphql/admin/task.go +++ b/graphql/admin/task.go @@ -25,10 +25,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type taskInput struct { diff --git a/graphql/admin/update_group.go b/graphql/admin/update_group.go index b58bcb4567d..0142d1527cb 100644 --- a/graphql/admin/update_group.go +++ b/graphql/admin/update_group.go @@ -5,10 +5,10 @@ import ( "fmt" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type updateGroupRewriter resolve.UpdateRewriter diff --git a/graphql/bench/auth_test.go b/graphql/bench/auth_test.go index ac99266f410..2b0ed8259a3 100644 --- a/graphql/bench/auth_test.go +++ b/graphql/bench/auth_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( @@ -119,7 +119,7 @@ func clearAll(b require.TestingT, metaInfo *testutil.AuthMeta) { // go test -bench=. -benchtime=60s // goos: linux // goarch: amd64 -// pkg: github.com/dgraph-io/dgraph/graphql/e2e/auth/bench +// pkg: github.com/dgraph-io/dgraph/v24/graphql/e2e/auth/bench // Auth // BenchmarkNestedQuery-8 88 815315761 ns/op // BenchmarkOneLevelQuery-8 4357 15626384 ns/op diff --git a/graphql/dgraph/execute.go b/graphql/dgraph/execute.go index 561647da6fd..21477ff762e 100644 --- a/graphql/dgraph/execute.go +++ b/graphql/dgraph/execute.go @@ -24,9 +24,9 @@ import ( "go.opencensus.io/trace" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type DgraphEx struct{} diff --git a/graphql/dgraph/graphquery.go b/graphql/dgraph/graphquery.go index 23519f45a78..5e965e9c23a 100644 --- a/graphql/dgraph/graphquery.go +++ b/graphql/dgraph/graphquery.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/x" ) // AsString writes query as an indented dql query string. AsString doesn't diff --git a/graphql/e2e/admin_auth/poorman_auth/admin_auth_test.go b/graphql/e2e/admin_auth/poorman_auth/admin_auth_test.go index d25f963864a..576fcad777d 100644 --- a/graphql/e2e/admin_auth/poorman_auth/admin_auth_test.go +++ b/graphql/e2e/admin_auth/poorman_auth/admin_auth_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go b/graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go index 792f422d4d1..a68481d706f 100644 --- a/graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go +++ b/graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/auth/add_mutation_test.go b/graphql/e2e/auth/add_mutation_test.go index 285c6a2928e..57cf4fe3260 100644 --- a/graphql/e2e/auth/add_mutation_test.go +++ b/graphql/e2e/auth/add_mutation_test.go @@ -27,7 +27,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" ) func (p *Project) delete(t *testing.T, user, role string) { diff --git a/graphql/e2e/auth/auth_test.go b/graphql/e2e/auth/auth_test.go index 4b19e8a90c7..8a1b4976ebf 100644 --- a/graphql/e2e/auth/auth_test.go +++ b/graphql/e2e/auth/auth_test.go @@ -33,10 +33,10 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/auth/debug_off/debugoff_test.go b/graphql/e2e/auth/debug_off/debugoff_test.go index 155dbce2da2..d8859e9b791 100644 --- a/graphql/e2e/auth/debug_off/debugoff_test.go +++ b/graphql/e2e/auth/debug_off/debugoff_test.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/auth/delete_mutation_test.go b/graphql/e2e/auth/delete_mutation_test.go index a34da1d701c..389632163be 100644 --- a/graphql/e2e/auth/delete_mutation_test.go +++ b/graphql/e2e/auth/delete_mutation_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" ) func (c *Column) add(t *testing.T, user, role string) { diff --git a/graphql/e2e/auth/update_mutation_test.go b/graphql/e2e/auth/update_mutation_test.go index 3d7dcea0807..1daddfbc7ed 100644 --- a/graphql/e2e/auth/update_mutation_test.go +++ b/graphql/e2e/auth/update_mutation_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" ) func getAllProjects(t *testing.T, users, roles []string) []string { diff --git a/graphql/e2e/auth_closed_by_default/auth_closed_by_default_test.go b/graphql/e2e/auth_closed_by_default/auth_closed_by_default_test.go index 813c38f75c9..5483a99dc56 100644 --- a/graphql/e2e/auth_closed_by_default/auth_closed_by_default_test.go +++ b/graphql/e2e/auth_closed_by_default/auth_closed_by_default_test.go @@ -24,9 +24,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type TestCase struct { diff --git a/graphql/e2e/common/admin.go b/graphql/e2e/common/admin.go index 2113b7bba5e..f3f2e16b03f 100644 --- a/graphql/e2e/common/admin.go +++ b/graphql/e2e/common/admin.go @@ -36,9 +36,9 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/common/common.go b/graphql/e2e/common/common.go index 400049980aa..a87a36ca6a0 100644 --- a/graphql/e2e/common/common.go +++ b/graphql/e2e/common/common.go @@ -38,9 +38,9 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/common/error.go b/graphql/e2e/common/error.go index 6fd5928cbc8..c2bb9050d56 100644 --- a/graphql/e2e/common/error.go +++ b/graphql/e2e/common/error.go @@ -36,11 +36,11 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - admin2 "github.com/dgraph-io/dgraph/graphql/admin" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/x" + admin2 "github.com/dgraph-io/dgraph/v24/graphql/admin" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/common/fragment.go b/graphql/e2e/common/fragment.go index 855de10b2c6..d735bc10950 100644 --- a/graphql/e2e/common/fragment.go +++ b/graphql/e2e/common/fragment.go @@ -25,7 +25,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func fragmentInMutation(t *testing.T) { diff --git a/graphql/e2e/common/lambda.go b/graphql/e2e/common/lambda.go index 2791ff4ad3e..ac52d351b78 100644 --- a/graphql/e2e/common/lambda.go +++ b/graphql/e2e/common/lambda.go @@ -29,7 +29,7 @@ import ( "github.com/golang/glog" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func lambdaOnTypeField(t *testing.T) { diff --git a/graphql/e2e/common/mutation.go b/graphql/e2e/common/mutation.go index 96c3c365dc9..a09c415ca52 100644 --- a/graphql/e2e/common/mutation.go +++ b/graphql/e2e/common/mutation.go @@ -37,8 +37,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) // TestAddMutation tests that add mutations work as expected. There's a few angles diff --git a/graphql/e2e/common/query.go b/graphql/e2e/common/query.go index 4c26375132a..96529ec6718 100644 --- a/graphql/e2e/common/query.go +++ b/graphql/e2e/common/query.go @@ -39,9 +39,9 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func queryCountryByRegExp(t *testing.T, regexp string, expectedCountries []*country) { diff --git a/graphql/e2e/common/schema.go b/graphql/e2e/common/schema.go index 83f42a656c8..3f1985b2fc6 100644 --- a/graphql/e2e/common/schema.go +++ b/graphql/e2e/common/schema.go @@ -26,7 +26,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) const ( diff --git a/graphql/e2e/common/subscription.go b/graphql/e2e/common/subscription.go index 81da432ba9e..a2f0a4cfd0d 100644 --- a/graphql/e2e/common/subscription.go +++ b/graphql/e2e/common/subscription.go @@ -25,7 +25,7 @@ import ( "github.com/gorilla/websocket" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/schema" ) // Reference: https://github.com/apollographql/subscriptions-transport-ws/blob/master/PROTOCOL.md diff --git a/graphql/e2e/custom_logic/custom_logic_test.go b/graphql/e2e/custom_logic/custom_logic_test.go index 8601228c01a..6509ffc7938 100644 --- a/graphql/e2e/custom_logic/custom_logic_test.go +++ b/graphql/e2e/custom_logic/custom_logic_test.go @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/directives/dgraph_directives_test.go b/graphql/e2e/directives/dgraph_directives_test.go index cc8571b2468..00f357de008 100644 --- a/graphql/e2e/directives/dgraph_directives_test.go +++ b/graphql/e2e/directives/dgraph_directives_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/graphql/e2e/multi_tenancy/multi_tenancy_test.go b/graphql/e2e/multi_tenancy/multi_tenancy_test.go index b4f22530fa5..2f2c6a21623 100644 --- a/graphql/e2e/multi_tenancy/multi_tenancy_test.go +++ b/graphql/e2e/multi_tenancy/multi_tenancy_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/normal/normal_test.go b/graphql/e2e/normal/normal_test.go index 293cd94885e..f2b945d5f30 100644 --- a/graphql/e2e/normal/normal_test.go +++ b/graphql/e2e/normal/normal_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/graphql/e2e/schema/schema_test.go b/graphql/e2e/schema/schema_test.go index 671f93def11..7b35c58527d 100644 --- a/graphql/e2e/schema/schema_test.go +++ b/graphql/e2e/schema/schema_test.go @@ -35,10 +35,10 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/subscription/subscription_test.go b/graphql/e2e/subscription/subscription_test.go index f546ed81ec5..f32a9e1cc4e 100644 --- a/graphql/e2e/subscription/subscription_test.go +++ b/graphql/e2e/subscription/subscription_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/resolve/auth_test.go b/graphql/resolve/auth_test.go index 2f3e5c46705..d29940670d5 100644 --- a/graphql/resolve/auth_test.go +++ b/graphql/resolve/auth_test.go @@ -31,13 +31,13 @@ import ( "gopkg.in/yaml.v2" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules ) diff --git a/graphql/resolve/extensions_test.go b/graphql/resolve/extensions_test.go index 89b9f600cf2..ca81ef3a272 100644 --- a/graphql/resolve/extensions_test.go +++ b/graphql/resolve/extensions_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/test" + "github.com/dgraph-io/dgraph/v24/graphql/test" ) func TestQueriesPropagateExtensions(t *testing.T) { diff --git a/graphql/resolve/middlewares.go b/graphql/resolve/middlewares.go index b4473bf4d92..4b66ca5694e 100644 --- a/graphql/resolve/middlewares.go +++ b/graphql/resolve/middlewares.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) // QueryMiddleware represents a middleware for queries diff --git a/graphql/resolve/middlewares_test.go b/graphql/resolve/middlewares_test.go index 9aa9471c572..9b6ace3fedf 100644 --- a/graphql/resolve/middlewares_test.go +++ b/graphql/resolve/middlewares_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/schema" ) func TestQueryMiddlewares_Then_ExecutesMiddlewaresInOrder(t *testing.T) { diff --git a/graphql/resolve/mutation.go b/graphql/resolve/mutation.go index a7cb2bd8b0c..c223d140683 100644 --- a/graphql/resolve/mutation.go +++ b/graphql/resolve/mutation.go @@ -29,10 +29,10 @@ import ( otrace "go.opencensus.io/trace" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const touchedUidsKey = "_total" diff --git a/graphql/resolve/mutation_rewriter.go b/graphql/resolve/mutation_rewriter.go index a5914347b76..95a14a03b6e 100644 --- a/graphql/resolve/mutation_rewriter.go +++ b/graphql/resolve/mutation_rewriter.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/errors" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/resolve/mutation_test.go b/graphql/resolve/mutation_test.go index 72faab552dd..6c1a5b8bc40 100644 --- a/graphql/resolve/mutation_test.go +++ b/graphql/resolve/mutation_test.go @@ -28,11 +28,11 @@ import ( "gopkg.in/yaml.v2" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) // Tests showing that GraphQL mutations -> Dgraph mutations diff --git a/graphql/resolve/query.go b/graphql/resolve/query.go index 07ffce52c44..dabfd511a85 100644 --- a/graphql/resolve/query.go +++ b/graphql/resolve/query.go @@ -26,10 +26,10 @@ import ( otrace "go.opencensus.io/trace" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) var errNotScalar = errors.New("provided value is not a scalar, can't convert it to string") diff --git a/graphql/resolve/query_rewriter.go b/graphql/resolve/query_rewriter.go index 509e593a772..7a0ba737fa7 100644 --- a/graphql/resolve/query_rewriter.go +++ b/graphql/resolve/query_rewriter.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) type queryRewriter struct{} diff --git a/graphql/resolve/query_test.go b/graphql/resolve/query_test.go index ddbdb73de26..9cba41a6d3f 100644 --- a/graphql/resolve/query_test.go +++ b/graphql/resolve/query_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/testutil" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules ) diff --git a/graphql/resolve/resolver.go b/graphql/resolve/resolver.go index 79dd12b16ab..cd6f5699042 100644 --- a/graphql/resolve/resolver.go +++ b/graphql/resolve/resolver.go @@ -30,11 +30,11 @@ import ( otrace "go.opencensus.io/trace" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/api" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/api" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type resolveCtxKey string diff --git a/graphql/resolve/resolver_error_test.go b/graphql/resolve/resolver_error_test.go index be298e67765..54504ebdd0e 100644 --- a/graphql/resolve/resolver_error_test.go +++ b/graphql/resolve/resolver_error_test.go @@ -29,9 +29,9 @@ import ( "gopkg.in/yaml.v2" dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/x" ) // Tests that result completion and GraphQL error propagation are working properly. diff --git a/graphql/resolve/resolver_test.go b/graphql/resolve/resolver_test.go index 4616a26a576..2b33811fbcc 100644 --- a/graphql/resolve/resolver_test.go +++ b/graphql/resolve/resolver_test.go @@ -22,9 +22,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/x" ) func TestErrorOnIncorrectValueType(t *testing.T) { diff --git a/graphql/resolve/webhook.go b/graphql/resolve/webhook.go index 8b0a4fb66fb..2f74a194a7f 100644 --- a/graphql/resolve/webhook.go +++ b/graphql/resolve/webhook.go @@ -24,9 +24,9 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type webhookPayload struct { diff --git a/graphql/schema/auth.go b/graphql/schema/auth.go index ff116df9e84..513ff7ccd80 100644 --- a/graphql/schema/auth.go +++ b/graphql/schema/auth.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cast" - "github.com/dgraph-io/dgraph/dql" + "github.com/dgraph-io/dgraph/v24/dql" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/parser" diff --git a/graphql/schema/completion.go b/graphql/schema/completion.go index 7d4f8e1a169..ca1cbed5e2c 100644 --- a/graphql/schema/completion.go +++ b/graphql/schema/completion.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" - dgTypes "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + dgTypes "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/schema/custom_http.go b/graphql/schema/custom_http.go index c76aa59411c..1e2be914d5e 100644 --- a/graphql/schema/custom_http.go +++ b/graphql/schema/custom_http.go @@ -25,8 +25,8 @@ import ( "net/http" "time" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/x" "github.com/golang/glog" ) diff --git a/graphql/schema/errors.go b/graphql/schema/errors.go index c7c18455cb7..2ca14d19341 100644 --- a/graphql/schema/errors.go +++ b/graphql/schema/errors.go @@ -19,7 +19,7 @@ package schema import ( "fmt" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" ) diff --git a/graphql/schema/errors_test.go b/graphql/schema/errors_test.go index c76573cb04d..979ccdaee68 100644 --- a/graphql/schema/errors_test.go +++ b/graphql/schema/errors_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/gqlerror" ) diff --git a/graphql/schema/gqlschema.go b/graphql/schema/gqlschema.go index 3fff2a7bae2..fdf66291dc1 100644 --- a/graphql/schema/gqlschema.go +++ b/graphql/schema/gqlschema.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/parser" diff --git a/graphql/schema/introspection.go b/graphql/schema/introspection.go index 620b89013dc..72a1d2ed379 100644 --- a/graphql/schema/introspection.go +++ b/graphql/schema/introspection.go @@ -6,7 +6,7 @@ import ( "errors" "strconv" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlgen/graphql" "github.com/dgraph-io/gqlgen/graphql/introspection" "github.com/dgraph-io/gqlparser/v2/ast" diff --git a/graphql/schema/response.go b/graphql/schema/response.go index 7beefdcaae7..d39ac614511 100644 --- a/graphql/schema/response.go +++ b/graphql/schema/response.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // GraphQL spec on response is here: diff --git a/graphql/schema/response_test.go b/graphql/schema/response_test.go index e7c175dd70f..bd06000e469 100644 --- a/graphql/schema/response_test.go +++ b/graphql/schema/response_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/gqlerror" ) diff --git a/graphql/schema/rules.go b/graphql/schema/rules.go index c5799bddd0b..749104445f8 100644 --- a/graphql/schema/rules.go +++ b/graphql/schema/rules.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/parser" diff --git a/graphql/schema/schemagen.go b/graphql/schema/schemagen.go index 068e808db27..b7c48073b6d 100644 --- a/graphql/schema/schemagen.go +++ b/graphql/schema/schemagen.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/parser" diff --git a/graphql/schema/schemagen_test.go b/graphql/schema/schemagen_test.go index 6c852eb400b..981f922e28e 100644 --- a/graphql/schema/schemagen_test.go +++ b/graphql/schema/schemagen_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - dschema "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + dschema "github.com/dgraph-io/dgraph/v24/schema" + "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" diff --git a/graphql/schema/validation_rules.go b/graphql/schema/validation_rules.go index 8e8998bce70..148a7870358 100644 --- a/graphql/schema/validation_rules.go +++ b/graphql/schema/validation_rules.go @@ -21,7 +21,7 @@ import ( "fmt" "strconv" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/validator" diff --git a/graphql/schema/wrappers.go b/graphql/schema/wrappers.go index e756d681a36..164382dc963 100644 --- a/graphql/schema/wrappers.go +++ b/graphql/schema/wrappers.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/parser" ) diff --git a/graphql/schema/wrappers_test.go b/graphql/schema/wrappers_test.go index 9867020bd13..2927050f4f0 100644 --- a/graphql/schema/wrappers_test.go +++ b/graphql/schema/wrappers_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" ) diff --git a/graphql/subscription/poller.go b/graphql/subscription/poller.go index b80e0e1865e..73631f58e74 100644 --- a/graphql/subscription/poller.go +++ b/graphql/subscription/poller.go @@ -29,9 +29,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) // Poller is used to poll user subscription query. diff --git a/graphql/test/test.go b/graphql/test/test.go index 3d505960abb..63f0444c3fc 100644 --- a/graphql/test/test.go +++ b/graphql/test/test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/parser" "github.com/dgraph-io/gqlparser/v2/validator" diff --git a/graphql/testdata/datagen/main.go b/graphql/testdata/datagen/main.go index 0a46a35de35..b5ddabe993e 100644 --- a/graphql/testdata/datagen/main.go +++ b/graphql/testdata/datagen/main.go @@ -15,7 +15,7 @@ limitations under the License. */ package main -import "github.com/dgraph-io/dgraph/graphql/testdata/datagen/cmd" +import "github.com/dgraph-io/dgraph/v24/graphql/testdata/datagen/cmd" func main() { cmd.Execute() diff --git a/lex/lexer.go b/lex/lexer.go index 5b5e3652584..7ebd00ed6fd 100644 --- a/lex/lexer.go +++ b/lex/lexer.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // EOF indicates the end of the an input. diff --git a/posting/index.go b/posting/index.go index a2e6cddbb0c..a278a1bffb0 100644 --- a/posting/index.go +++ b/posting/index.go @@ -38,12 +38,12 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/options" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok" + "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" ) diff --git a/posting/index_test.go b/posting/index_test.go index 03f2f74cc0e..249b14e4c21 100644 --- a/posting/index_test.go +++ b/posting/index_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) func uids(l *List, readTs uint64) []uint64 { diff --git a/posting/list.go b/posting/list.go index 020bb17c362..fef9f478c7f 100644 --- a/posting/list.go +++ b/posting/list.go @@ -31,14 +31,14 @@ import ( bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok/index" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok/index" + "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" ) diff --git a/posting/list_test.go b/posting/list_test.go index 233e63455cf..ded5e3e548a 100644 --- a/posting/list_test.go +++ b/posting/list_test.go @@ -31,10 +31,10 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "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" ) diff --git a/posting/lists.go b/posting/lists.go index c8134b77440..3bc9b5ec89b 100644 --- a/posting/lists.go +++ b/posting/lists.go @@ -27,9 +27,9 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/index" - "github.com/dgraph-io/dgraph/x" + "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" ) diff --git a/posting/mvcc.go b/posting/mvcc.go index 27cdc6fe7a9..acfd7098774 100644 --- a/posting/mvcc.go +++ b/posting/mvcc.go @@ -32,8 +32,8 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/posting/mvcc_test.go b/posting/mvcc_test.go index 9061d61d359..f68393ec706 100644 --- a/posting/mvcc_test.go +++ b/posting/mvcc_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/posting/oracle.go b/posting/oracle.go index 81ab8b80325..bc03dc9a861 100644 --- a/posting/oracle.go +++ b/posting/oracle.go @@ -27,9 +27,9 @@ import ( "github.com/golang/glog" ostats "go.opencensus.io/stats" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/index" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok/index" + "github.com/dgraph-io/dgraph/v24/x" ) var o *oracle diff --git a/posting/size.go b/posting/size.go index fd7cf7ca3d6..333d4c76fce 100644 --- a/posting/size.go +++ b/posting/size.go @@ -22,7 +22,7 @@ import ( "unsafe" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const sizeOfBucket = 144 diff --git a/posting/size_test.go b/posting/size_test.go index 01528446966..b9a1b2b227f 100644 --- a/posting/size_test.go +++ b/posting/size_test.go @@ -37,7 +37,7 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) var manual = flag.Bool("manual", false, "Set when manually running some tests.") diff --git a/protos/protos_test.go b/protos/protos_test.go index efcce96694e..e44ea6ef11d 100644 --- a/protos/protos_test.go +++ b/protos/protos_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestProtosRegenerate(t *testing.T) { diff --git a/query/aggregator.go b/query/aggregator.go index 6093af9b819..074d654d3b9 100644 --- a/query/aggregator.go +++ b/query/aggregator.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) type aggregator struct { diff --git a/query/cloud_test.go b/query/cloud_test.go index b542f83a448..a122a0009f6 100644 --- a/query/cloud_test.go +++ b/query/cloud_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestMain(m *testing.M) { diff --git a/query/common_test.go b/query/common_test.go index f5b6dec787a..d82a33cbe14 100644 --- a/query/common_test.go +++ b/query/common_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) func setSchema(schema string) { diff --git a/query/fastjson_test.go b/query/fastjson_test.go index 22008ac285f..ecf3c5c41cd 100644 --- a/query/fastjson_test.go +++ b/query/fastjson_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/task" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/task" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/types" ) func subgraphWithSingleResultAndSingleValue(val *pb.TaskValue) *SubGraph { diff --git a/query/groupby.go b/query/groupby.go index 3056f88456e..ea6cbea98dd 100644 --- a/query/groupby.go +++ b/query/groupby.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" ) type groupPair struct { diff --git a/query/integration_test.go b/query/integration_test.go index 26a550dd842..dd142e008fc 100644 --- a/query/integration_test.go +++ b/query/integration_test.go @@ -22,9 +22,9 @@ import ( "context" "testing" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestMain(m *testing.M) { diff --git a/query/math.go b/query/math.go index f4e45b2d608..9c029944b84 100644 --- a/query/math.go +++ b/query/math.go @@ -20,7 +20,7 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/types" ) type mathTree struct { diff --git a/query/math_test.go b/query/math_test.go index 3e3d5034245..035312cf4b0 100644 --- a/query/math_test.go +++ b/query/math_test.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/types" ) func TestVector(t *testing.T) { diff --git a/query/mutation.go b/query/mutation.go index fa35c08ef22..be47c5fb55c 100644 --- a/query/mutation.go +++ b/query/mutation.go @@ -26,11 +26,11 @@ import ( otrace "go.opencensus.io/trace" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) // ApplyMutations performs the required edge expansions and forwards the results to the diff --git a/query/mutation_test.go b/query/mutation_test.go index d6a45599955..2e1f2ce9c27 100644 --- a/query/mutation_test.go +++ b/query/mutation_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) func TestReservedPredicateForMutation(t *testing.T) { diff --git a/query/normalize_feature_flag_test.go b/query/normalize_feature_flag_test.go index 7a1d6d3fcdc..50f46b74f5d 100644 --- a/query/normalize_feature_flag_test.go +++ b/query/normalize_feature_flag_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) func TestNormalizeDirectiveWithNoListResponse(t *testing.T) { diff --git a/query/outputnode.go b/query/outputnode.go index 19ef4363a5c..d59eb70f828 100644 --- a/query/outputnode.go +++ b/query/outputnode.go @@ -37,13 +37,13 @@ import ( "github.com/twpayne/go-geom/encoding/geojson" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/algo" - gqlSchema "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/task" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + gqlSchema "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/task" + "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" ) diff --git a/query/outputnode_graphql.go b/query/outputnode_graphql.go index d8ae77aedb5..8690a9c03cb 100644 --- a/query/outputnode_graphql.go +++ b/query/outputnode_graphql.go @@ -26,8 +26,8 @@ import ( "strings" "sync" - gqlSchema "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + gqlSchema "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) // graphQLEncoder is used to encode JSON response for GraphQL queries. diff --git a/query/outputnode_test.go b/query/outputnode_test.go index 771433041a3..331013dbac2 100644 --- a/query/outputnode_test.go +++ b/query/outputnode_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "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" ) diff --git a/query/outputrdf.go b/query/outputrdf.go index 866ed46c031..13722f336ee 100644 --- a/query/outputrdf.go +++ b/query/outputrdf.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) // rdfBuilder is used to generate RDF from subgraph. diff --git a/query/query.go b/query/query.go index 7db07ba4c07..3ebd2bac7bf 100644 --- a/query/query.go +++ b/query/query.go @@ -30,14 +30,14 @@ import ( otrace "go.opencensus.io/trace" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) /* diff --git a/query/query0_test.go b/query/query0_test.go index 5dce626da17..c28b5be5f08 100644 --- a/query/query0_test.go +++ b/query/query0_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/dql" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dql" ) func TestGetUID(t *testing.T) { diff --git a/query/query3_test.go b/query/query3_test.go index 0f60f1cfcda..bf4d50a4e60 100644 --- a/query/query3_test.go +++ b/query/query3_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestRecurseError(t *testing.T) { diff --git a/query/query4_test.go b/query/query4_test.go index bba99388762..ecc17b5ae5c 100644 --- a/query/query4_test.go +++ b/query/query4_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) func TestBigMathValue(t *testing.T) { diff --git a/query/recurse.go b/query/recurse.go index b26853f017f..6a308d5c07d 100644 --- a/query/recurse.go +++ b/query/recurse.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/x" ) func (start *SubGraph) expandRecurse(ctx context.Context, maxDepth uint64) error { diff --git a/query/shortest.go b/query/shortest.go index 262332e5676..8295ccf231a 100644 --- a/query/shortest.go +++ b/query/shortest.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) type pathInfo struct { diff --git a/query/upgrade_test.go b/query/upgrade_test.go index 996a9f6332b..64423d72828 100644 --- a/query/upgrade_test.go +++ b/query/upgrade_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestMain(m *testing.M) { diff --git a/query/vector/integration_test.go b/query/vector/integration_test.go index 7cb11b1b231..82790f7ae86 100644 --- a/query/vector/integration_test.go +++ b/query/vector/integration_test.go @@ -22,9 +22,9 @@ import ( "context" "testing" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestMain(m *testing.M) { diff --git a/query/vector/vector_graphql_test.go b/query/vector/vector_graphql_test.go index ca061a9c781..df9fb2d8c0d 100644 --- a/query/vector/vector_graphql_test.go +++ b/query/vector/vector_graphql_test.go @@ -24,7 +24,7 @@ import ( "math/rand" "testing" - "github.com/dgraph-io/dgraph/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphapi" "github.com/stretchr/testify/require" ) diff --git a/query/vector/vector_test.go b/query/vector/vector_test.go index c19a8bfc4b1..5cce54e9e77 100644 --- a/query/vector/vector_test.go +++ b/query/vector/vector_test.go @@ -28,9 +28,9 @@ import ( "time" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/raftwal/log.go b/raftwal/log.go index 67c97a5f03c..902ea110cf9 100644 --- a/raftwal/log.go +++ b/raftwal/log.go @@ -35,7 +35,7 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/raftwal/meta.go b/raftwal/meta.go index d980eeaaed2..352af89b769 100644 --- a/raftwal/meta.go +++ b/raftwal/meta.go @@ -27,7 +27,7 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/raftwal/storage.go b/raftwal/storage.go index 3a282776f66..58ee55e5bb4 100644 --- a/raftwal/storage.go +++ b/raftwal/storage.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "golang.org/x/net/trace" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // DiskStorage handles disk access and writing for the RAFT write-ahead log. diff --git a/raftwal/storage_test.go b/raftwal/storage_test.go index d0f81f208f4..70e0bd6504a 100644 --- a/raftwal/storage_test.go +++ b/raftwal/storage_test.go @@ -44,7 +44,7 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func TestStorageTerm(t *testing.T) { diff --git a/raftwal/wal.go b/raftwal/wal.go index b8c0f050cb4..d57edef75aa 100644 --- a/raftwal/wal.go +++ b/raftwal/wal.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/schema/parse.go b/schema/parse.go index 713b2689a3b..f87649a1c6a 100644 --- a/schema/parse.go +++ b/schema/parse.go @@ -24,11 +24,11 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) // ParseBytes parses the byte array which holds the schema. We will reset diff --git a/schema/parse_test.go b/schema/parse_test.go index 387e4af0e1d..049780996b0 100644 --- a/schema/parse_test.go +++ b/schema/parse_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) type nameType struct { diff --git a/schema/schema.go b/schema/schema.go index f3275286082..5c29fb9b26d 100644 --- a/schema/schema.go +++ b/schema/schema.go @@ -31,11 +31,11 @@ import ( "github.com/dgraph-io/badger/v4" badgerpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/schema/state.go b/schema/state.go index fe525e5a37c..0d5c57b56b9 100644 --- a/schema/state.go +++ b/schema/state.go @@ -17,7 +17,7 @@ package schema import ( - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) // Constants representing type of different graphql lexed items. diff --git a/systest/1million/1million_test.go b/systest/1million/1million_test.go index 0015893519e..6e1b32a21fe 100644 --- a/systest/1million/1million_test.go +++ b/systest/1million/1million_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) var tc = []struct { diff --git a/systest/21million/bulk/run_test.go b/systest/21million/bulk/run_test.go index 7d7a12f6e61..425aa3a7a74 100644 --- a/systest/21million/bulk/run_test.go +++ b/systest/21million/bulk/run_test.go @@ -23,8 +23,8 @@ import ( "path/filepath" "testing" - "github.com/dgraph-io/dgraph/systest/21million/common" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/systest/21million/common" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestQueries(t *testing.T) { diff --git a/systest/21million/common/run_queries.go b/systest/21million/common/run_queries.go index 23b146a3b38..6f1ff62e760 100644 --- a/systest/21million/common/run_queries.go +++ b/systest/21million/common/run_queries.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/testutil" ) // JSON output can be hundreds of lines and diffs can scroll off the terminal before you diff --git a/systest/21million/live/run_test.go b/systest/21million/live/run_test.go index 0d32b99dcc2..2119300456a 100644 --- a/systest/21million/live/run_test.go +++ b/systest/21million/live/run_test.go @@ -23,8 +23,8 @@ import ( "path/filepath" "testing" - "github.com/dgraph-io/dgraph/systest/21million/common" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/systest/21million/common" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestQueries(t *testing.T) { diff --git a/systest/acl/restore/acl_restore_test.go b/systest/acl/restore/acl_restore_test.go index f957a1acc3a..c32e44ae886 100644 --- a/systest/acl/restore/acl_restore_test.go +++ b/systest/acl/restore/acl_restore_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" ) // disableDraining disables draining mode before each test for increased reliability. diff --git a/systest/audit/audit_test.go b/systest/audit/audit_test.go index 6a4ed9a16af..5bb36157bb7 100644 --- a/systest/audit/audit_test.go +++ b/systest/audit/audit_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/testutil/testaudit" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/testutil/testaudit" ) func TestZeroAudit(t *testing.T) { diff --git a/systest/audit_encrypted/audit_test.go b/systest/audit_encrypted/audit_test.go index 6faff24dad0..9c009e92fbb 100644 --- a/systest/audit_encrypted/audit_test.go +++ b/systest/audit_encrypted/audit_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/testutil/testaudit" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/testutil/testaudit" ) func TestZeroAuditEncrypted(t *testing.T) { diff --git a/systest/backup/advanced-scenarios/127-Namespace/backup_test.go b/systest/backup/advanced-scenarios/127-Namespace/backup_test.go index 5841c9afaea..d6045fbacbd 100755 --- a/systest/backup/advanced-scenarios/127-Namespace/backup_test.go +++ b/systest/backup/advanced-scenarios/127-Namespace/backup_test.go @@ -20,10 +20,10 @@ package main import ( "testing" - e2eCommon "github.com/dgraph-io/dgraph/graphql/e2e/common" - utilsCommon "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + e2eCommon "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + utilsCommon "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/systest/backup/advanced-scenarios/acl-nonAcl/backup_test.go b/systest/backup/advanced-scenarios/acl-nonAcl/backup_test.go index 4c72963d16e..681e4c7bc73 100755 --- a/systest/backup/advanced-scenarios/acl-nonAcl/backup_test.go +++ b/systest/backup/advanced-scenarios/acl-nonAcl/backup_test.go @@ -21,10 +21,10 @@ import ( "net/http" "testing" - e2eCommon "github.com/dgraph-io/dgraph/graphql/e2e/common" - utilsCommon "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + e2eCommon "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + utilsCommon "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/systest/backup/advanced-scenarios/deleted-namespace/backup_test.go b/systest/backup/advanced-scenarios/deleted-namespace/backup_test.go index ca1b0e3df3e..6c010108d03 100755 --- a/systest/backup/advanced-scenarios/deleted-namespace/backup_test.go +++ b/systest/backup/advanced-scenarios/deleted-namespace/backup_test.go @@ -20,10 +20,10 @@ package main import ( "testing" - e2eCommon "github.com/dgraph-io/dgraph/graphql/e2e/common" - utilsCommon "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + e2eCommon "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + utilsCommon "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/backup/common/utils.go b/systest/backup/common/utils.go index dc60fd2b81f..69fb6186823 100644 --- a/systest/backup/common/utils.go +++ b/systest/backup/common/utils.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" ) var ( diff --git a/systest/backup/encryption/backup_test.go b/systest/backup/encryption/backup_test.go index 85136bd62fa..f7e82b75928 100644 --- a/systest/backup/encryption/backup_test.go +++ b/systest/backup/encryption/backup_test.go @@ -35,9 +35,9 @@ import ( "github.com/dgraph-io/badger/v4/options" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/filesystem/backup_test.go b/systest/backup/filesystem/backup_test.go index 97a24e9394f..c4c0aa7f93e 100644 --- a/systest/backup/filesystem/backup_test.go +++ b/systest/backup/filesystem/backup_test.go @@ -36,10 +36,10 @@ import ( "github.com/dgraph-io/badger/v4/options" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/minio-large/backup_test.go b/systest/backup/minio-large/backup_test.go index 26438a30c49..36ecf435928 100644 --- a/systest/backup/minio-large/backup_test.go +++ b/systest/backup/minio-large/backup_test.go @@ -36,9 +36,9 @@ import ( "github.com/dgraph-io/badger/v4/options" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/minio/backup_test.go b/systest/backup/minio/backup_test.go index 095d8304f25..14d7c9051bb 100644 --- a/systest/backup/minio/backup_test.go +++ b/systest/backup/minio/backup_test.go @@ -37,9 +37,9 @@ import ( "github.com/dgraph-io/badger/v4/options" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/multi-tenancy/backup_test.go b/systest/backup/multi-tenancy/backup_test.go index ff296a1e32c..5ead7a41060 100644 --- a/systest/backup/multi-tenancy/backup_test.go +++ b/systest/backup/multi-tenancy/backup_test.go @@ -28,9 +28,9 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/nfs-backup/backup_test.go b/systest/backup/nfs-backup/backup_test.go index bf54f9d2133..ad0bb34447b 100644 --- a/systest/backup/nfs-backup/backup_test.go +++ b/systest/backup/nfs-backup/backup_test.go @@ -35,10 +35,10 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/bgindex/count_test.go b/systest/bgindex/count_test.go index 6f259affe84..18794c693f8 100644 --- a/systest/bgindex/count_test.go +++ b/systest/bgindex/count_test.go @@ -38,8 +38,8 @@ import ( "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func TestCountIndex(t *testing.T) { diff --git a/systest/bgindex/parallel_test.go b/systest/bgindex/parallel_test.go index d9ec450c80a..2e8c072d84d 100644 --- a/systest/bgindex/parallel_test.go +++ b/systest/bgindex/parallel_test.go @@ -34,8 +34,8 @@ import ( "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/bgindex/reverse_test.go b/systest/bgindex/reverse_test.go index 31aec15738a..180daf69017 100644 --- a/systest/bgindex/reverse_test.go +++ b/systest/bgindex/reverse_test.go @@ -36,8 +36,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func TestReverseIndex(t *testing.T) { diff --git a/systest/bgindex/string_test.go b/systest/bgindex/string_test.go index c387c6a6bc2..36547607da4 100644 --- a/systest/bgindex/string_test.go +++ b/systest/bgindex/string_test.go @@ -37,8 +37,8 @@ import ( "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func TestStringIndex(t *testing.T) { diff --git a/systest/bulk_live/bulk/bulk_test.go b/systest/bulk_live/bulk/bulk_test.go index 7e245ddc344..42fde68efa0 100644 --- a/systest/bulk_live/bulk/bulk_test.go +++ b/systest/bulk_live/bulk/bulk_test.go @@ -21,7 +21,7 @@ package main import ( "testing" - "github.com/dgraph-io/dgraph/systest/bulk_live/common" + "github.com/dgraph-io/dgraph/v24/systest/bulk_live/common" ) func TestBulkCases(t *testing.T) { diff --git a/systest/bulk_live/common/bulk_live_cases.go b/systest/bulk_live/common/bulk_live_cases.go index 075ac22ffcd..33eaf298889 100644 --- a/systest/bulk_live/common/bulk_live_cases.go +++ b/systest/bulk_live/common/bulk_live_cases.go @@ -36,7 +36,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) // TODO: This test was used just to make sure some really basic examples work. @@ -733,8 +733,8 @@ func TestGoldenData(t *testing.T) { } s := newSuiteFromFile(t, - os.ExpandEnv("$GOPATH/src/github.com/dgraph-io/dgraph/systest/data/goldendata.schema"), - os.ExpandEnv("$GOPATH/src/github.com/dgraph-io/dgraph/systest/data/goldendata.rdf.gz"), + os.ExpandEnv("$GOPATH/src/github.com/dgraph-io/dgraph/v24/systest/data/goldendata.schema"), + os.ExpandEnv("$GOPATH/src/github.com/dgraph-io/dgraph/v24/systest/data/goldendata.rdf.gz"), "", ) defer s.cleanup(t) diff --git a/systest/bulk_live/common/bulk_live_fixture.go b/systest/bulk_live/common/bulk_live_fixture.go index 93db655dd03..afceb0fe883 100644 --- a/systest/bulk_live/common/bulk_live_fixture.go +++ b/systest/bulk_live/common/bulk_live_fixture.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) var rootDir = "./data" diff --git a/systest/bulk_live/live/live_test.go b/systest/bulk_live/live/live_test.go index f05d1c5a643..ea33b557336 100644 --- a/systest/bulk_live/live/live_test.go +++ b/systest/bulk_live/live/live_test.go @@ -21,7 +21,7 @@ package live import ( "testing" - "github.com/dgraph-io/dgraph/systest/bulk_live/common" + "github.com/dgraph-io/dgraph/v24/systest/bulk_live/common" ) func TestLiveCases(t *testing.T) { diff --git a/systest/cdc/cdc_test.go b/systest/cdc/cdc_test.go index 6a77056d42b..59c401dfbd9 100644 --- a/systest/cdc/cdc_test.go +++ b/systest/cdc/cdc_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestCDC(t *testing.T) { diff --git a/systest/cloud/cloud_test.go b/systest/cloud/cloud_test.go index c0478584e12..04e6980188c 100644 --- a/systest/cloud/cloud_test.go +++ b/systest/cloud/cloud_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func setup(t *testing.T) { diff --git a/systest/export/export_test.go b/systest/export/export_test.go index 662735018da..ef04155bf5a 100644 --- a/systest/export/export_test.go +++ b/systest/export/export_test.go @@ -36,7 +36,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) var ( diff --git a/systest/group-delete/group_delete_test.go b/systest/group-delete/group_delete_test.go index 9651ae93da0..8c78306b730 100644 --- a/systest/group-delete/group_delete_test.go +++ b/systest/group-delete/group_delete_test.go @@ -37,7 +37,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func NodesSetup(t *testing.T, c *dgo.Dgraph) { diff --git a/systest/integration2/acl_test.go b/systest/integration2/acl_test.go index 3a149fe93f8..f0953935c2c 100644 --- a/systest/integration2/acl_test.go +++ b/systest/integration2/acl_test.go @@ -24,9 +24,9 @@ import ( "time" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/integration2/bulk_loader_test.go b/systest/integration2/bulk_loader_test.go index 8257a3d38fc..b2ff1b43754 100644 --- a/systest/integration2/bulk_loader_test.go +++ b/systest/integration2/bulk_loader_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/integration2/graphql_schema_auth_test.go b/systest/integration2/graphql_schema_auth_test.go index 497acde6691..0490d81534f 100644 --- a/systest/integration2/graphql_schema_auth_test.go +++ b/systest/integration2/graphql_schema_auth_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/integration2/incremental_restore_test.go b/systest/integration2/incremental_restore_test.go index 4078809f6e0..57aeeb64da9 100644 --- a/systest/integration2/incremental_restore_test.go +++ b/systest/integration2/incremental_restore_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestIncrementalRestore(t *testing.T) { diff --git a/systest/integration2/snapshot_test.go b/systest/integration2/snapshot_test.go index 2831adad9bc..e66da686658 100644 --- a/systest/integration2/snapshot_test.go +++ b/systest/integration2/snapshot_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/ldbc/ldbc_test.go b/systest/ldbc/ldbc_test.go index 01167db78b4..4a1934e5c83 100644 --- a/systest/ldbc/ldbc_test.go +++ b/systest/ldbc/ldbc_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) type TestCases struct { diff --git a/systest/license/integration_test.go b/systest/license/integration_test.go index 78c89093fc0..9ff3300a4cb 100644 --- a/systest/license/integration_test.go +++ b/systest/license/integration_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) type LicenseTestSuite struct { diff --git a/systest/license/license_test.go b/systest/license/license_test.go index 950282590c7..ec7e59e701f 100644 --- a/systest/license/license_test.go +++ b/systest/license/license_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphapi" ) var expiredKey = []byte(`-----BEGIN PGP MESSAGE----- diff --git a/systest/license/upgrade_test.go b/systest/license/upgrade_test.go index d44b455697e..f092e21332b 100644 --- a/systest/license/upgrade_test.go +++ b/systest/license/upgrade_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type LicenseTestSuite struct { diff --git a/systest/live_pw_test.go b/systest/live_pw_test.go index b9896317d14..f57b906ec1a 100644 --- a/systest/live_pw_test.go +++ b/systest/live_pw_test.go @@ -27,7 +27,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestLivePassword(t *testing.T) { diff --git a/systest/loader/loader_test.go b/systest/loader/loader_test.go index 4cc30ef0dd2..c615c59c009 100644 --- a/systest/loader/loader_test.go +++ b/systest/loader/loader_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) // TestLoaderXidmap checks that live loader re-uses xidmap on loading data from two different files diff --git a/systest/multi-tenancy/basic_test.go b/systest/multi-tenancy/basic_test.go index d51a025adb0..7c878b2bdf3 100644 --- a/systest/multi-tenancy/basic_test.go +++ b/systest/multi-tenancy/basic_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/systest/multi-tenancy/integration_basic_helper_test.go b/systest/multi-tenancy/integration_basic_helper_test.go index d93353c1cc0..81767ecb5e0 100644 --- a/systest/multi-tenancy/integration_basic_helper_test.go +++ b/systest/multi-tenancy/integration_basic_helper_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type liveOpts struct { diff --git a/systest/multi-tenancy/integration_test.go b/systest/multi-tenancy/integration_test.go index 327bca87c14..fde810d7cac 100644 --- a/systest/multi-tenancy/integration_test.go +++ b/systest/multi-tenancy/integration_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type MultitenancyTestSuite struct { diff --git a/systest/multi-tenancy/upgrade_test.go b/systest/multi-tenancy/upgrade_test.go index 1b73247bc4b..c668c62273f 100644 --- a/systest/multi-tenancy/upgrade_test.go +++ b/systest/multi-tenancy/upgrade_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type MultitenancyTestSuite struct { diff --git a/systest/mutations-and-queries/integration_test.go b/systest/mutations-and-queries/integration_test.go index 89e78e6f7f6..54bc01bf05e 100644 --- a/systest/mutations-and-queries/integration_test.go +++ b/systest/mutations-and-queries/integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) type SystestTestSuite struct { diff --git a/systest/mutations-and-queries/mutations_test.go b/systest/mutations-and-queries/mutations_test.go index 59f92c5edf0..6fd4bc4919b 100644 --- a/systest/mutations-and-queries/mutations_test.go +++ b/systest/mutations-and-queries/mutations_test.go @@ -36,9 +36,9 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/testutil" ) // TestSystem uses the externally run Dgraph cluster for testing. Most other diff --git a/systest/mutations-and-queries/queries_test.go b/systest/mutations-and-queries/queries_test.go index 0f1f4cb7554..0b28f237995 100644 --- a/systest/mutations-and-queries/queries_test.go +++ b/systest/mutations-and-queries/queries_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func (ssuite *SystestTestSuite) TestQuery() { diff --git a/systest/mutations-and-queries/upgrade_test.go b/systest/mutations-and-queries/upgrade_test.go index 66847fac3dd..b670c30adae 100644 --- a/systest/mutations-and-queries/upgrade_test.go +++ b/systest/mutations-and-queries/upgrade_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type SystestTestSuite struct { diff --git a/systest/online-restore/namespace-aware/restore_test.go b/systest/online-restore/namespace-aware/restore_test.go index 76ef1738b1a..7cfefee1ec5 100644 --- a/systest/online-restore/namespace-aware/restore_test.go +++ b/systest/online-restore/namespace-aware/restore_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) // func addData(gc *dgraphapi.GrpcClient, pred string, start, end int) error { diff --git a/systest/online-restore/online_restore_test.go b/systest/online-restore/online_restore_test.go index 11e35c3a885..a40047273d1 100644 --- a/systest/online-restore/online_restore_test.go +++ b/systest/online-restore/online_restore_test.go @@ -37,9 +37,9 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type restoreReq struct { diff --git a/systest/plugin/integration_test.go b/systest/plugin/integration_test.go index c8bda8a98e3..60fd17fb22e 100644 --- a/systest/plugin/integration_test.go +++ b/systest/plugin/integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) type PluginTestSuite struct { diff --git a/systest/plugin/plugin_test.go b/systest/plugin/plugin_test.go index 82e5a61d3f5..2ad331cd9e3 100644 --- a/systest/plugin/plugin_test.go +++ b/systest/plugin/plugin_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphapi" ) type testCase struct { diff --git a/systest/plugin/upgrade_test.go b/systest/plugin/upgrade_test.go index effeeb2ea2c..74d8f626521 100644 --- a/systest/plugin/upgrade_test.go +++ b/systest/plugin/upgrade_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type PluginTestSuite struct { diff --git a/systest/posting-list-benchmark/main.go b/systest/posting-list-benchmark/main.go index 764c0ba676a..6b094eebd61 100644 --- a/systest/posting-list-benchmark/main.go +++ b/systest/posting-list-benchmark/main.go @@ -28,8 +28,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type flagOptions struct { diff --git a/systest/unique_test.go b/systest/unique_test.go index 4f9614ba8ce..c56a7cb8fb2 100644 --- a/systest/unique_test.go +++ b/systest/unique_test.go @@ -32,9 +32,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraph/cmd/live" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/live" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) const emailQuery = `{ diff --git a/systest/vector/backup_test.go b/systest/vector/backup_test.go index db0900a7636..b812b14d062 100644 --- a/systest/vector/backup_test.go +++ b/systest/vector/backup_test.go @@ -27,9 +27,9 @@ import ( "time" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/vector/load_test.go b/systest/vector/load_test.go index 7154fba81da..ac547c0613a 100644 --- a/systest/vector/load_test.go +++ b/systest/vector/load_test.go @@ -25,9 +25,9 @@ import ( "time" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/vector/vector_test.go b/systest/vector/vector_test.go index af786f8cc27..899502e1efa 100644 --- a/systest/vector/vector_test.go +++ b/systest/vector/vector_test.go @@ -26,9 +26,9 @@ import ( "time" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/t/t.go b/t/t.go index 8a5e90c4a6e..4de4791f961 100644 --- a/t/t.go +++ b/t/t.go @@ -45,8 +45,8 @@ import ( "github.com/spf13/pflag" "golang.org/x/tools/go/packages" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) @@ -326,7 +326,7 @@ func runTestsFor(ctx context.Context, pkg, prefix string) error { } func hasTestFiles(pkg string) bool { - dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/", "", 1) + dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/v24/", "", 1) dir = filepath.Join(*baseDir, dir) hasTests := false @@ -529,7 +529,7 @@ func (o *outputCatcher) Print() { if dur.dur < time.Second { continue } - pkg := strings.Replace(dur.pkg, "github.com/dgraph-io/dgraph/", "", 1) + pkg := strings.Replace(dur.pkg, "github.com/dgraph-io/dgraph/v24/", "", 1) fmt.Printf("[%6s]%s[%d] %s took: %s\n", dur.ts.Sub(baseTs).Round(time.Second), strings.Repeat(" ", int(dur.threadId)), dur.threadId, pkg, dur.dur.Round(time.Second)) @@ -547,14 +547,14 @@ type task struct { // for custom cluster tests (i.e. those not using default docker-compose.yml) func composeFileFor(pkg string) string { - dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/", "", 1) + dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/v24/", "", 1) return filepath.Join(*baseDir, dir, "docker-compose.yml") } func getPackages() []task { has := func(list []string, in string) bool { for _, l := range list { - if len(l) > 0 && strings.Contains(in+"/", "github.com/dgraph-io/dgraph/"+l+"/") { + if len(l) > 0 && strings.Contains(in+"/", "github.com/dgraph-io/dgraph/v24/"+l+"/") { return true } } @@ -994,7 +994,7 @@ func run() error { }() signal.Notify(sdCh, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) - // pkgs, err := packages.Load(nil, "github.com/dgraph-io/dgraph/...") + // pkgs, err := packages.Load(nil, "github.com/dgraph-io/dgraph/v24/...") go func() { defer close(testCh) valid := getPackages() diff --git a/task/conversion.go b/task/conversion.go index ea97cd24a85..dcbd73cb221 100644 --- a/task/conversion.go +++ b/task/conversion.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "math" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) var ( diff --git a/telemetry/telemetry.go b/telemetry/telemetry.go index 35e37f84e40..dc50aef26b5 100644 --- a/telemetry/telemetry.go +++ b/telemetry/telemetry.go @@ -27,9 +27,9 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) // Telemetry holds information about the state of the zero and alpha server. diff --git a/testutil/backup.go b/testutil/backup.go index ac8bed1a752..465816b06b8 100644 --- a/testutil/backup.go +++ b/testutil/backup.go @@ -32,11 +32,11 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) // KeyFile is set to the path of the file containing the key. Used for testing purposes only. diff --git a/testutil/bulk.go b/testutil/bulk.go index 80802991c1d..51a02960354 100644 --- a/testutil/bulk.go +++ b/testutil/bulk.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type LiveOpts struct { diff --git a/testutil/client.go b/testutil/client.go index 61f0e711d92..8a03dbf63a8 100644 --- a/testutil/client.go +++ b/testutil/client.go @@ -42,8 +42,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/x" ) // socket addr = IP address and port number diff --git a/testutil/docker.go b/testutil/docker.go index 95c17321ac5..8e475b769ae 100644 --- a/testutil/docker.go +++ b/testutil/docker.go @@ -35,7 +35,7 @@ import ( "github.com/pkg/errors" "golang.org/x/net/context" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/testutil/exec.go b/testutil/exec.go index b6e2355c059..75670a942b3 100644 --- a/testutil/exec.go +++ b/testutil/exec.go @@ -25,7 +25,7 @@ import ( "os/exec" "strconv" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // These are exported so they can also be set directly from outside this package. diff --git a/testutil/graphql.go b/testutil/graphql.go index 34111b5b910..3d43f81a1fb 100644 --- a/testutil/graphql.go +++ b/testutil/graphql.go @@ -35,7 +35,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ExportRequest = `mutation { diff --git a/testutil/multi_tenancy.go b/testutil/multi_tenancy.go index fa10a5c2c72..904ef1ba9b1 100644 --- a/testutil/multi_tenancy.go +++ b/testutil/multi_tenancy.go @@ -30,7 +30,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type Rule struct { diff --git a/testutil/testaudit/audit.go b/testutil/testaudit/audit.go index aa4e067f57e..1a7f06ff59b 100644 --- a/testutil/testaudit/audit.go +++ b/testutil/testaudit/audit.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" "github.com/stretchr/testify/require" ) diff --git a/testutil/utils.go b/testutil/utils.go index 3baedf0c2b2..21303834be1 100644 --- a/testutil/utils.go +++ b/testutil/utils.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func GalaxySchemaKey(attr string) []byte { diff --git a/tlstest/acl/acl_over_tls_test.go b/tlstest/acl/acl_over_tls_test.go index e6051f9c737..937c673ddec 100644 --- a/tlstest/acl/acl_over_tls_test.go +++ b/tlstest/acl/acl_over_tls_test.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func TestLoginOverTLS(t *testing.T) { diff --git a/tlstest/certrequest/certrequest_test.go b/tlstest/certrequest/certrequest_test.go index 0d1ce2ded5c..780c6022864 100644 --- a/tlstest/certrequest/certrequest_test.go +++ b/tlstest/certrequest/certrequest_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestAccessOverPlaintext(t *testing.T) { diff --git a/tlstest/certrequireandverify/certrequireandverify_test.go b/tlstest/certrequireandverify/certrequireandverify_test.go index 11924935afb..b3689669fd5 100644 --- a/tlstest/certrequireandverify/certrequireandverify_test.go +++ b/tlstest/certrequireandverify/certrequireandverify_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestAccessWithoutClientCert(t *testing.T) { diff --git a/tlstest/certverifyifgiven/certverifyifgiven_test.go b/tlstest/certverifyifgiven/certverifyifgiven_test.go index b59483de7a7..1e4ba580a20 100644 --- a/tlstest/certverifyifgiven/certverifyifgiven_test.go +++ b/tlstest/certverifyifgiven/certverifyifgiven_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestAccessWithoutClientCert(t *testing.T) { diff --git a/tlstest/mtls_internal/ha_6_node/ha_test.go b/tlstest/mtls_internal/ha_6_node/ha_test.go index 00c473b5c0e..e7ae2ba3e67 100644 --- a/tlstest/mtls_internal/ha_6_node/ha_test.go +++ b/tlstest/mtls_internal/ha_6_node/ha_test.go @@ -13,8 +13,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func runTests(t *testing.T, client *dgo.Dgraph) { diff --git a/tlstest/mtls_internal/multi_group/multi_group_test.go b/tlstest/mtls_internal/multi_group/multi_group_test.go index 32f4927cc36..bafa5fe86e7 100644 --- a/tlstest/mtls_internal/multi_group/multi_group_test.go +++ b/tlstest/mtls_internal/multi_group/multi_group_test.go @@ -13,8 +13,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func runTests(t *testing.T, client *dgo.Dgraph) { diff --git a/tlstest/mtls_internal/single_node/single_node_test.go b/tlstest/mtls_internal/single_node/single_node_test.go index 494e67340ab..7024724c089 100644 --- a/tlstest/mtls_internal/single_node/single_node_test.go +++ b/tlstest/mtls_internal/single_node/single_node_test.go @@ -13,8 +13,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func runTests(t *testing.T, client *dgo.Dgraph) { diff --git a/tlstest/zero_https/all_routes_tls/all_routes_tls_test.go b/tlstest/zero_https/all_routes_tls/all_routes_tls_test.go index acc0a91791d..2203baeb2aa 100644 --- a/tlstest/zero_https/all_routes_tls/all_routes_tls_test.go +++ b/tlstest/zero_https/all_routes_tls/all_routes_tls_test.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) type testCase struct { diff --git a/tlstest/zero_https/no_tls/no_tls_test.go b/tlstest/zero_https/no_tls/no_tls_test.go index f85c53080bf..c4b23398a7b 100644 --- a/tlstest/zero_https/no_tls/no_tls_test.go +++ b/tlstest/zero_https/no_tls/no_tls_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) type testCase struct { diff --git a/tok/bleve.go b/tok/bleve.go index 006a37d5ea5..d4bb1ec9670 100644 --- a/tok/bleve.go +++ b/tok/bleve.go @@ -24,7 +24,7 @@ import ( "github.com/blevesearch/bleve/v2/analysis/tokenizer/unicode" "github.com/blevesearch/bleve/v2/registry" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const unicodenormName = "unicodenorm_nfkc" diff --git a/tok/hnsw/heap.go b/tok/hnsw/heap.go index fee786dd607..78b61d9fd58 100644 --- a/tok/hnsw/heap.go +++ b/tok/hnsw/heap.go @@ -21,7 +21,7 @@ package hnsw import ( "container/heap" - c "github.com/dgraph-io/dgraph/tok/constraints" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" ) const notAUid uint64 = 0 diff --git a/tok/hnsw/helper.go b/tok/hnsw/helper.go index 6111e05f355..988015068da 100644 --- a/tok/hnsw/helper.go +++ b/tok/hnsw/helper.go @@ -31,8 +31,8 @@ import ( "strings" "unsafe" - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" "github.com/getsentry/sentry-go" "github.com/pkg/errors" "github.com/viterin/vek" diff --git a/tok/hnsw/persistent_factory.go b/tok/hnsw/persistent_factory.go index 2b353e1a25b..b61c4dd69aa 100644 --- a/tok/hnsw/persistent_factory.go +++ b/tok/hnsw/persistent_factory.go @@ -21,9 +21,9 @@ package hnsw import ( "sync" - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" - opt "github.com/dgraph-io/dgraph/tok/options" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" + opt "github.com/dgraph-io/dgraph/v24/tok/options" "github.com/pkg/errors" ) diff --git a/tok/hnsw/persistent_hnsw.go b/tok/hnsw/persistent_hnsw.go index f6a33585bd4..bd7584650dc 100644 --- a/tok/hnsw/persistent_hnsw.go +++ b/tok/hnsw/persistent_hnsw.go @@ -25,9 +25,9 @@ import ( "time" "github.com/bits-and-blooms/bitset" - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" - opt "github.com/dgraph-io/dgraph/tok/options" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" + opt "github.com/dgraph-io/dgraph/v24/tok/options" "github.com/golang/glog" "github.com/pkg/errors" ) diff --git a/tok/hnsw/persistent_hnsw_test.go b/tok/hnsw/persistent_hnsw_test.go index 11adcbea90e..be4acb0d9b1 100644 --- a/tok/hnsw/persistent_hnsw_test.go +++ b/tok/hnsw/persistent_hnsw_test.go @@ -24,9 +24,9 @@ import ( "sync" "testing" - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" - opt "github.com/dgraph-io/dgraph/tok/options" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" + opt "github.com/dgraph-io/dgraph/v24/tok/options" "golang.org/x/exp/slices" ) diff --git a/tok/hnsw/search_layer.go b/tok/hnsw/search_layer.go index 2e39472dcc6..448afa32c28 100644 --- a/tok/hnsw/search_layer.go +++ b/tok/hnsw/search_layer.go @@ -19,8 +19,8 @@ package hnsw import ( - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" "fmt" ) diff --git a/tok/hnsw/test_helper.go b/tok/hnsw/test_helper.go index 69f851e659e..32705ed35d6 100644 --- a/tok/hnsw/test_helper.go +++ b/tok/hnsw/test_helper.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "github.com/dgraph-io/dgraph/tok/index" + "github.com/dgraph-io/dgraph/v24/tok/index" "github.com/pkg/errors" ) diff --git a/tok/index/helper.go b/tok/index/helper.go index 2d08897c18b..c09672254b3 100644 --- a/tok/index/helper.go +++ b/tok/index/helper.go @@ -24,7 +24,7 @@ import ( "reflect" "unsafe" - c "github.com/dgraph-io/dgraph/tok/constraints" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" "github.com/golang/glog" ) diff --git a/tok/index/helper_test.go b/tok/index/helper_test.go index 0dc0ab1a7b3..d3acd9b079b 100644 --- a/tok/index/helper_test.go +++ b/tok/index/helper_test.go @@ -28,8 +28,8 @@ import ( "testing" "unsafe" - "github.com/dgraph-io/dgraph/protos/pb" - c "github.com/dgraph-io/dgraph/tok/constraints" + "github.com/dgraph-io/dgraph/v24/protos/pb" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" "github.com/viterin/vek/vek32" ) diff --git a/tok/index/index.go b/tok/index/index.go index e5c46894ba2..9c8144782ee 100644 --- a/tok/index/index.go +++ b/tok/index/index.go @@ -21,8 +21,8 @@ package index import ( "context" - c "github.com/dgraph-io/dgraph/tok/constraints" - opts "github.com/dgraph-io/dgraph/tok/options" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + opts "github.com/dgraph-io/dgraph/v24/tok/options" ) // IndexFactory is responsible for being able to create, find, and remove diff --git a/tok/index_factory.go b/tok/index_factory.go index a3d7e425b28..fcaeb0a5110 100644 --- a/tok/index_factory.go +++ b/tok/index_factory.go @@ -19,8 +19,8 @@ package tok import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/tok/index" - opts "github.com/dgraph-io/dgraph/tok/options" + "github.com/dgraph-io/dgraph/v24/tok/index" + opts "github.com/dgraph-io/dgraph/v24/tok/options" ) // registerIndexFactory(f) will register f as both a Tokenizer and specifically diff --git a/tok/options/options.go b/tok/options/options.go index a61755bb0cb..69a02b65fbe 100644 --- a/tok/options/options.go +++ b/tok/options/options.go @@ -19,7 +19,7 @@ package options import ( "fmt" - c "github.com/dgraph-io/dgraph/tok/constraints" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" ) // An Options instance maps the various named options to their specific values. diff --git a/tok/tok.go b/tok/tok.go index 908ca4ea4f7..47684853b09 100644 --- a/tok/tok.go +++ b/tok/tok.go @@ -29,11 +29,11 @@ import ( "golang.org/x/crypto/blake2b" "golang.org/x/text/collate" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/hnsw" - opts "github.com/dgraph-io/dgraph/tok/options" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + opts "github.com/dgraph-io/dgraph/v24/tok/options" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) // Tokenizer identifiers are unique and can't be reused. diff --git a/types/compare.go b/types/compare.go index 27d6a410ac8..973acf5c96c 100644 --- a/types/compare.go +++ b/types/compare.go @@ -16,7 +16,7 @@ package types -import "github.com/dgraph-io/dgraph/x" +import "github.com/dgraph-io/dgraph/v24/x" // CompareVals compares two values using the given comparison type. // Should be used only in filtering arg1 by comparing with arg2. diff --git a/types/facets/utils.go b/types/facets/utils.go index 9ec6a6ab4af..46db27c5790 100644 --- a/types/facets/utils.go +++ b/types/facets/utils.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" ) // SortAndValidate sorts And validates the facets. diff --git a/types/geofilter.go b/types/geofilter.go index 26a6d932b64..52e9c6f4079 100644 --- a/types/geofilter.go +++ b/types/geofilter.go @@ -26,8 +26,8 @@ import ( geom "github.com/twpayne/go-geom" "github.com/twpayne/go-geom/xy" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // QueryType indicates the type of geo query. diff --git a/types/s2.go b/types/s2.go index 03e629db534..8be12f2d618 100644 --- a/types/s2.go +++ b/types/s2.go @@ -24,7 +24,7 @@ import ( geom "github.com/twpayne/go-geom" "github.com/twpayne/go-geom/encoding/geojson" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func edgesCrossPoints(l *s2.Loop, pts []s2.Point) bool { diff --git a/types/s2index.go b/types/s2index.go index 477eda8d1eb..a0b13ecc572 100644 --- a/types/s2index.go +++ b/types/s2index.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" geom "github.com/twpayne/go-geom" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func parentCoverTokens(parents s2.CellUnion, cover s2.CellUnion) []string { diff --git a/types/scalar_types.go b/types/scalar_types.go index 609290c565f..f134841a77a 100644 --- a/types/scalar_types.go +++ b/types/scalar_types.go @@ -23,7 +23,7 @@ import ( "github.com/twpayne/go-geom" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const ( diff --git a/types/sort.go b/types/sort.go index 577eef32c69..9457643c268 100644 --- a/types/sort.go +++ b/types/sort.go @@ -25,8 +25,8 @@ import ( "golang.org/x/text/collate" "golang.org/x/text/language" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) type sortBase struct { diff --git a/types/sort_test.go b/types/sort_test.go index dba97da0a2c..faa6d1f0c2e 100644 --- a/types/sort_test.go +++ b/types/sort_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) func toString(t *testing.T, values [][]Val, vID TypeID) []string { diff --git a/upgrade/change_v20.03.0.go b/upgrade/change_v20.03.0.go index 2c5133015d8..d2adace08cd 100644 --- a/upgrade/change_v20.03.0.go +++ b/upgrade/change_v20.03.0.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/upgrade/change_v20.07.0.go b/upgrade/change_v20.07.0.go index a76292d2f2d..152d1cb3040 100644 --- a/upgrade/change_v20.07.0.go +++ b/upgrade/change_v20.07.0.go @@ -21,8 +21,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/upgrade/change_v21.03.0.go b/upgrade/change_v21.03.0.go index 61c4af8c22c..1fa88493db0 100644 --- a/upgrade/change_v21.03.0.go +++ b/upgrade/change_v21.03.0.go @@ -28,10 +28,10 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/upgrade/upgrade.go b/upgrade/upgrade.go index cc19028f8c5..f09df27971a 100644 --- a/upgrade/upgrade.go +++ b/upgrade/upgrade.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/upgrade/utils.go b/upgrade/utils.go index 2c5a850041b..f016c08fdd1 100644 --- a/upgrade/utils.go +++ b/upgrade/utils.go @@ -31,8 +31,8 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func hasAclCreds() bool { diff --git a/worker/acl_cache.go b/worker/acl_cache.go index 55c408c4771..8e0f7703aa5 100644 --- a/worker/acl_cache.go +++ b/worker/acl_cache.go @@ -18,8 +18,8 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/x" ) // AclCache is the cache mapping group names to the corresponding group acls diff --git a/worker/acl_cache_test.go b/worker/acl_cache_test.go index c6a913d3173..0a57bb7fb6b 100644 --- a/worker/acl_cache_test.go +++ b/worker/acl_cache_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/x" ) func TestAclCache(t *testing.T) { diff --git a/worker/aggregator.go b/worker/aggregator.go index a0e5b9ee16c..788038e6229 100644 --- a/worker/aggregator.go +++ b/worker/aggregator.go @@ -17,7 +17,7 @@ package worker import ( - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/types" ) func couldApplyAggregatorOn(agrtr string, typ types.TypeID) bool { diff --git a/worker/backup.go b/worker/backup.go index a8d62ac2c9d..6aabb13f0c4 100644 --- a/worker/backup.go +++ b/worker/backup.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // predicateSet is a map whose keys are predicates. It is meant to be used as a set. diff --git a/worker/backup_ee.go b/worker/backup_ee.go index dc77652dba5..fb7234dcdc9 100644 --- a/worker/backup_ee.go +++ b/worker/backup_ee.go @@ -34,11 +34,11 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/posting" + "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" ) diff --git a/worker/backup_handler.go b/worker/backup_handler.go index 530b8c3ddea..7d0c5c937a1 100644 --- a/worker/backup_handler.go +++ b/worker/backup_handler.go @@ -27,8 +27,8 @@ import ( "github.com/minio/minio-go/v6/pkg/credentials" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/backup_manifest.go b/worker/backup_manifest.go index 315a811359e..b85c3d73779 100644 --- a/worker/backup_manifest.go +++ b/worker/backup_manifest.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func verifyManifests(manifests []*Manifest) error { diff --git a/worker/backup_oss.go b/worker/backup_oss.go index 17b66434250..d06be88c4e7 100644 --- a/worker/backup_oss.go +++ b/worker/backup_oss.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // Backup implements the Worker interface. diff --git a/worker/cdc.go b/worker/cdc.go index 361d7dc458f..b4fa056651a 100644 --- a/worker/cdc.go +++ b/worker/cdc.go @@ -22,7 +22,7 @@ package worker import ( "math" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) type CDC struct { diff --git a/worker/cdc_ee.go b/worker/cdc_ee.go index ef9b408cc73..8243900cbe4 100644 --- a/worker/cdc_ee.go +++ b/worker/cdc_ee.go @@ -28,10 +28,10 @@ import ( "github.com/pkg/errors" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "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" ) diff --git a/worker/config.go b/worker/config.go index 8eb09aa7a8b..96d04c19b23 100644 --- a/worker/config.go +++ b/worker/config.go @@ -22,7 +22,7 @@ import ( "github.com/golang-jwt/jwt/v5" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/draft.go b/worker/draft.go index 6ed5d97489c..265df7b5588 100644 --- a/worker/draft.go +++ b/worker/draft.go @@ -41,13 +41,13 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "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" ) diff --git a/worker/draft_test.go b/worker/draft_test.go index c404c52fd19..4ba38797e4f 100644 --- a/worker/draft_test.go +++ b/worker/draft_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/x" ) func getEntryForMutation(index, startTs uint64) raftpb.Entry { diff --git a/worker/export.go b/worker/export.go index e35fa4c4a58..d51a11bd0de 100644 --- a/worker/export.go +++ b/worker/export.go @@ -38,12 +38,12 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/worker/export_test.go b/worker/export_test.go index bb0d8ca701d..d14797b23ba 100644 --- a/worker/export_test.go +++ b/worker/export_test.go @@ -38,16 +38,16 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/graphql_schema.go b/worker/graphql_schema.go index a630a74cf33..ac312596a78 100644 --- a/worker/graphql_schema.go +++ b/worker/graphql_schema.go @@ -26,10 +26,10 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/groups.go b/worker/groups.go index 74bf38e5c8e..3ecfa4459f8 100644 --- a/worker/groups.go +++ b/worker/groups.go @@ -31,12 +31,12 @@ import ( badgerpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/worker/match.go b/worker/match.go index baf53a39c38..34e68594ce1 100644 --- a/worker/match.go +++ b/worker/match.go @@ -17,11 +17,11 @@ package worker import ( - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/x" ) // LevenshteinDistance measures the difference between two strings. diff --git a/worker/multi_tenancy.go b/worker/multi_tenancy.go index 6cd6725c45b..6d2847db290 100644 --- a/worker/multi_tenancy.go +++ b/worker/multi_tenancy.go @@ -22,8 +22,8 @@ package worker import ( "context" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func (w *grpcWorker) DeleteNamespace(ctx context.Context, diff --git a/worker/multi_tenancy_ee.go b/worker/multi_tenancy_ee.go index 81bc6850d1f..d71d1c130a3 100644 --- a/worker/multi_tenancy_ee.go +++ b/worker/multi_tenancy_ee.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func (w *grpcWorker) DeleteNamespace(ctx context.Context, req *pb.DeleteNsRequest) (*pb.Status, error) { diff --git a/worker/mutation.go b/worker/mutation.go index 71b3db0cbc0..8effb47a76b 100644 --- a/worker/mutation.go +++ b/worker/mutation.go @@ -34,12 +34,12 @@ import ( "github.com/dgraph-io/badger/v4/y" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/worker/mutation_integration_test.go b/worker/mutation_integration_test.go index 0fe20706a38..249505a2d6f 100644 --- a/worker/mutation_integration_test.go +++ b/worker/mutation_integration_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func TestPopulateMutationMap(t *testing.T) { diff --git a/worker/mutation_unit_test.go b/worker/mutation_unit_test.go index 1bfb3441f51..d2b1053e95c 100644 --- a/worker/mutation_unit_test.go +++ b/worker/mutation_unit_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) func TestConvertEdgeType(t *testing.T) { diff --git a/worker/online_restore.go b/worker/online_restore.go index 8fcf44294ac..78c07337844 100644 --- a/worker/online_restore.go +++ b/worker/online_restore.go @@ -31,12 +31,12 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/online_restore_oss.go b/worker/online_restore_oss.go index 48582a6b863..cca2673c619 100644 --- a/worker/online_restore_oss.go +++ b/worker/online_restore_oss.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func ProcessRestoreRequest(ctx context.Context, req *pb.RestoreRequest, wg *sync.WaitGroup) error { diff --git a/worker/predicate_move.go b/worker/predicate_move.go index b80f230a4e7..39a65d4f9dc 100644 --- a/worker/predicate_move.go +++ b/worker/predicate_move.go @@ -32,11 +32,11 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/worker/predicate_test.go b/worker/predicate_test.go index 5144a6583e5..7e6bd547c2c 100644 --- a/worker/predicate_test.go +++ b/worker/predicate_test.go @@ -32,9 +32,9 @@ package worker // "github.com/stretchr/testify/require" // "google.golang.org/grpc" -// "github.com/dgraph-io/dgraph/posting" -// "github.com/dgraph-io/dgraph/protos/pb" -// "github.com/dgraph-io/dgraph/x" +// "github.com/dgraph-io/dgraph/v24/posting" +// "github.com/dgraph-io/dgraph/v24/protos/pb" +// "github.com/dgraph-io/dgraph/v24/x" // ) // func checkShard(ps *badger.DB) (int, []byte) { diff --git a/worker/proposal.go b/worker/proposal.go index 677d5dbf487..1797f220430 100644 --- a/worker/proposal.go +++ b/worker/proposal.go @@ -29,10 +29,10 @@ import ( tag "go.opencensus.io/tag" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const baseTimeout time.Duration = 4 * time.Second diff --git a/worker/queue.go b/worker/queue.go index e469cd93732..953c1fe4039 100644 --- a/worker/queue.go +++ b/worker/queue.go @@ -29,10 +29,10 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "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" ) diff --git a/worker/restore_map.go b/worker/restore_map.go index 96e0bc5882a..14e1cca887e 100644 --- a/worker/restore_map.go +++ b/worker/restore_map.go @@ -40,14 +40,14 @@ import ( bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "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" ) diff --git a/worker/restore_reduce.go b/worker/restore_reduce.go index a3cd03f29f1..8007a55c643 100644 --- a/worker/restore_reduce.go +++ b/worker/restore_reduce.go @@ -31,8 +31,8 @@ import ( "github.com/golang/snappy" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/schema.go b/worker/schema.go index b5f7db5297b..94aa83c4132 100644 --- a/worker/schema.go +++ b/worker/schema.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" ) var ( diff --git a/worker/server_state.go b/worker/server_state.go index 9cb256c7acd..d61d4817cd7 100644 --- a/worker/server_state.go +++ b/worker/server_state.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "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" ) diff --git a/worker/sink_handler.go b/worker/sink_handler.go index d1feddcce32..bdbe8b0018b 100644 --- a/worker/sink_handler.go +++ b/worker/sink_handler.go @@ -31,7 +31,7 @@ import ( "github.com/pkg/errors" "github.com/xdg/scram" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/snapshot.go b/worker/snapshot.go index 676821a4051..548fcc1d04b 100644 --- a/worker/snapshot.go +++ b/worker/snapshot.go @@ -27,11 +27,11 @@ import ( "go.etcd.io/etcd/raft/v3" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "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" ) diff --git a/worker/snapshot_test.go b/worker/snapshot_test.go index dc29f47b144..cd333ad5f81 100644 --- a/worker/snapshot_test.go +++ b/worker/snapshot_test.go @@ -33,7 +33,7 @@ import ( "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestSnapshot(t *testing.T) { diff --git a/worker/sort.go b/worker/sort.go index a1867dd0d13..79e3f5b4a37 100644 --- a/worker/sort.go +++ b/worker/sort.go @@ -28,13 +28,13 @@ import ( otrace "go.opencensus.io/trace" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) var emptySortResult pb.SortResult diff --git a/worker/stringfilter.go b/worker/stringfilter.go index 59cb3e27f24..0a34b35365e 100644 --- a/worker/stringfilter.go +++ b/worker/stringfilter.go @@ -21,10 +21,10 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) type matchFunc func(types.Val, *stringFilter) bool diff --git a/worker/task.go b/worker/task.go index 91e1b28a884..fce9bd4227c 100644 --- a/worker/task.go +++ b/worker/task.go @@ -35,18 +35,18 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - ctask "github.com/dgraph-io/dgraph/task" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/tok/index" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + ctask "github.com/dgraph-io/dgraph/v24/task" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/tok/index" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) func invokeNetworkRequest(ctx context.Context, addr string, diff --git a/worker/tokens.go b/worker/tokens.go index 13f7f2cf703..3d54f79db58 100644 --- a/worker/tokens.go +++ b/worker/tokens.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) func verifyStringIndex(ctx context.Context, attr string, funcType FuncType) (string, bool) { diff --git a/worker/trigram.go b/worker/trigram.go index b012e236c59..0cc0f8c2f22 100644 --- a/worker/trigram.go +++ b/worker/trigram.go @@ -21,11 +21,11 @@ import ( cindex "github.com/google/codesearch/index" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/x" ) var errRegexTooWide = errors.New( diff --git a/worker/worker.go b/worker/worker.go index 1620d78c4af..4b6ed55424b 100644 --- a/worker/worker.go +++ b/worker/worker.go @@ -34,10 +34,10 @@ import ( "github.com/dgraph-io/badger/v4" badgerpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/worker/worker_test.go b/worker/worker_test.go index 006a2a433cd..5be92c2e3f4 100644 --- a/worker/worker_test.go +++ b/worker/worker_test.go @@ -32,11 +32,11 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230" "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ts uint64 diff --git a/worker/zero.go b/worker/zero.go index c09499e90e6..2af29194671 100644 --- a/worker/zero.go +++ b/worker/zero.go @@ -19,8 +19,8 @@ package worker import ( "context" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) // RemoveNodeOverNetwork sends a request to remove the given node from given group to a zero server. diff --git a/worker/zero_proxy.go b/worker/zero_proxy.go index 03a416ff0e2..c94e75ad0e5 100644 --- a/worker/zero_proxy.go +++ b/worker/zero_proxy.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func forwardAssignUidsToZero(ctx context.Context, in *pb.Num) (*pb.AssignedIds, error) { diff --git a/x/debug.go b/x/debug.go index 5774bbcb102..6b758b2f464 100644 --- a/x/debug.go +++ b/x/debug.go @@ -28,7 +28,7 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) func PrintRollup(plist *pb.PostingList, parts map[uint64]*pb.PostingList, baseKey []byte, ts uint64) { diff --git a/x/keys.go b/x/keys.go index 1b0986fd0be..b55f0830e45 100644 --- a/x/keys.go +++ b/x/keys.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const ( diff --git a/x/minioclient.go b/x/minioclient.go index 75fc79b6ea0..c787a64555f 100644 --- a/x/minioclient.go +++ b/x/minioclient.go @@ -12,7 +12,7 @@ import ( "github.com/minio/minio-go/v6/pkg/credentials" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const ( diff --git a/x/nodebug.go b/x/nodebug.go index 930064f2342..65424e7779d 100644 --- a/x/nodebug.go +++ b/x/nodebug.go @@ -22,7 +22,7 @@ package x import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) // PrintRollup prints information about any rollup that happen diff --git a/xidmap/xidmap.go b/xidmap/xidmap.go index 81e77fa511b..dc12106ab65 100644 --- a/xidmap/xidmap.go +++ b/xidmap/xidmap.go @@ -34,8 +34,8 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/xidmap/xidmap_test.go b/xidmap/xidmap_test.go index 831711c3b77..87f376bc57a 100644 --- a/xidmap/xidmap_test.go +++ b/xidmap/xidmap_test.go @@ -16,8 +16,8 @@ import ( "google.golang.org/grpc" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" )