Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use /v24 in the import #9131

Merged
merged 1 commit into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion algo/heap.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package algo

import (
"github.com/dgraph-io/dgraph/codec"
"github.com/dgraph-io/dgraph/v24/codec"
)

type elem struct {
Expand Down
4 changes: 2 additions & 2 deletions algo/packed.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions algo/packed_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions algo/uidlist.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions algo/uidlist_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions check_upgrade/check_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions check_upgrade/check_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions chunker/chunk.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions chunker/json_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions chunker/json_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions chunker/rdf_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions chunker/rdf_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion chunker/rdf_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions codec/benchmark/benchmark.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions codec/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions codec/codec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion compose/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions conn/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions conn/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions conn/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions conn/raft_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/acctupsert/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion contrib/integration/bank/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion contrib/integration/bigdata/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion contrib/integration/mutates/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/swap/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/testtxn/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion contrib/jepsen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions dgraph/cmd/alpha/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions dgraph/cmd/alpha/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions dgraph/cmd/alpha/http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/alpha/login_ee.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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=<mode>;" flag.
Expand Down
Loading
Loading