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.

Sign up for GitHub

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

Jump to bottom

upgrade dgo to v230 #8785

Merged
merged 1 commit into from
May 11, 2023
Merged

upgrade dgo to v230 #8785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chunker/json_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/twpayne/go-geom"
"github.com/twpayne/go-geom/encoding/geojson"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion chunker/json_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/golang/glog"
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion chunker/rdf_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/pkg/errors"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion chunker/rdf_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion conn/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
otrace "go.opencensus.io/trace"

"github.com/dgraph-io/badger/v4/y"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion conn/pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"

"github.com/dgraph-io/dgo/v210/protos/api"
"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/ristretto/z"
Expand Down
2 changes: 1 addition & 1 deletion conn/raft_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"go.etcd.io/etcd/raft/raftpb"
otrace "go.opencensus.io/trace"

"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/x"
)
Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/acctupsert/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (

"github.com/golang/glog"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
)
Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/bank/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/x"
)

Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/bigdata/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/x"
)

Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/mutates/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/x"
)

Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/swap/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (

"github.com/pkg/errors"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
)
Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/testtxn/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
)
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/pkg/errors"
"google.golang.org/grpc/metadata"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/login_ee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/golang/glog"

"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/edgraph"
"github.com/dgraph-io/dgraph/x"
)
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/testutil"
)

Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import (
hapi "google.golang.org/grpc/health/grpc_health_v1"

"github.com/dgraph-io/badger/v4"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/alpha/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ import (
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/encoding/gzip"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/alpha/upsert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (

"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
)
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/bulk/mapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/golang/glog"
"github.com/golang/snappy"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
6 changes: 3 additions & 3 deletions dgraph/cmd/increment/increment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"github.com/spf13/viper"
"go.opencensus.io/trace"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/x"
"github.com/dgraph-io/ristretto/z"
)
Expand Down Expand Up @@ -190,7 +190,7 @@ func run(conf *viper.Viper) {
var dg *dgo.Dgraph
sf := z.NewSuperFlag(conf.GetString("cloud"))
if addr := sf.GetString("addr"); len(addr) > 0 {
conn, err := dgo.DialSlashEndpoint(addr, sf.GetString("jwt"))
conn, err := dgo.DialCloud(addr, sf.GetString("jwt"))
x.Check(err)
dc := api.NewDgraphClient(conn)
dg = dgo.NewDgraphClient(dc)
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/increment/increment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/grpc/metadata"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/testutil"
)

Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/live/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"google.golang.org/grpc/status"

"github.com/dgraph-io/badger/v4"
"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/live/load-json/load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgraph/testutil"
"github.com/dgraph-io/dgraph/x"
)
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/live/load-uids/load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/live/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ import (

"github.com/dgraph-io/badger/v4"
bopt "github.com/dgraph-io/badger/v4/options"
"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/zero/oracle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
otrace "go.opencensus.io/trace"

"github.com/dgraph-io/badger/v4/y"
"github.com/dgraph-io/dgo/v210/protos/api"
"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/ristretto/z"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/zero/zero.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/pkg/errors"
otrace "go.opencensus.io/trace"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
4 changes: 2 additions & 2 deletions dgraphtest/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"github.com/go-git/go-git/v5/plumbing"
"github.com/pkg/errors"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/x"
)

Expand Down
2 changes: 1 addition & 1 deletion dgraphtest/compose_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package dgraphtest

import (
"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgraph/testutil"
)

Expand Down
4 changes: 2 additions & 2 deletions dgraphtest/dcloud_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/pkg/errors"
"google.golang.org/grpc"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
)

type DCloudCluster struct {
Expand Down
4 changes: 2 additions & 2 deletions dgraphtest/local_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/dgraph-io/dgo/v210"
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
)

// cluster's network struct
Expand Down
2 changes: 1 addition & 1 deletion dql/mutation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/pkg/errors"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion dql/parser_mutation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package dql

import (
"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/lex"
)

Expand Down
2 changes: 1 addition & 1 deletion dql/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/chunker"
"github.com/dgraph-io/dgraph/lex"
)
Expand Down
2 changes: 1 addition & 1 deletion edgraph/access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/golang/glog"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion edgraph/access_ee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"google.golang.org/grpc/status"

bpb "github.com/dgraph-io/badger/v4/pb"
"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
2 changes: 1 addition & 1 deletion edgraph/graphql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/golang/glog"
"github.com/pkg/errors"

"github.com/dgraph-io/dgo/v210/protos/api"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/graphql/schema"
"github.com/dgraph-io/dgraph/x"
)
Expand Down
2 changes: 1 addition & 1 deletion edgraph/multi_tenancy_ee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/golang/glog"
"github.com/pkg/errors"

"github.com/dgraph-io/dgo/v210/protos/api"
"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"
Expand Down
Loading