Skip to content

Commit

Permalink
adopt go modules; replacing until dgo v2 is published
Browse files Browse the repository at this point in the history
  • Loading branch information
@campoy @mangalaman93
campoy authored and mangalaman93 committed Aug 23, 2019
1 parent 93f87f4 commit 4ec20be
Show file tree
Hide file tree
Showing 2,423 changed files with 593 additions and 926,061 deletions.
2 changes: 1 addition & 1 deletion chunker/chunk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"strings"
"unicode"

"github.com/dgraph-io/dgo/x"
"github.com/dgraph-io/dgo/v2/x"
"github.com/dgraph-io/dgraph/lex"

"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion chunker/json_parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"sync/atomic"
"unicode"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/types"
"github.com/dgraph-io/dgraph/types/facets"
"github.com/dgraph-io/dgraph/x"
Expand Down
2 changes: 1 addition & 1 deletion chunker/json_parser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/dgraph-io/dgraph/tok"
"github.com/golang/glog"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/types"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion chunker/rdf_parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"
"unicode"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/lex"
"github.com/dgraph-io/dgraph/types"
"github.com/dgraph-io/dgraph/types/facets"
Expand Down
2 changes: 1 addition & 1 deletion chunker/rdf_parser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package chunker
import (
"testing"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"time"

"github.com/dgraph-io/badger/y"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/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
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/dgraph-io/badger/y"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/x"
"github.com/golang/glog"
Expand Down
2 changes: 1 addition & 1 deletion conn/raft_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sync/atomic"
"time"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/x"
"github.com/golang/glog"
Expand Down
8 changes: 4 additions & 4 deletions contrib/integration/acctupsert/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"sync/atomic"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/x"
"github.com/dgraph-io/dgo/y"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v2/x"
"github.com/dgraph-io/dgo/v2/y"
"github.com/dgraph-io/dgraph/testutil"
)

Expand Down
6 changes: 3 additions & 3 deletions contrib/integration/bank/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"sync/atomic"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/x"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v2/x"
"google.golang.org/grpc"
)

Expand Down
6 changes: 3 additions & 3 deletions contrib/integration/bigdata/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"sync/atomic"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/x"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v2/x"
"google.golang.org/grpc"
)

Expand Down
6 changes: 3 additions & 3 deletions contrib/integration/mutates/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"fmt"
"log"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/x"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v2/x"
"google.golang.org/grpc"
)

Expand Down
6 changes: 3 additions & 3 deletions contrib/integration/swap/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"sync/atomic"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/x"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v2/x"
"github.com/dgraph-io/dgraph/testutil"
)

Expand Down
4 changes: 2 additions & 2 deletions contrib/integration/testtxn/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"strings"
"testing"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/testutil"
"github.com/dgraph-io/dgraph/x"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/alpha/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"strings"
"time"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/y"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v2/y"
"github.com/dgraph-io/dgraph/edgraph"
"github.com/dgraph-io/dgraph/gql"
"github.com/dgraph-io/dgraph/query"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/login_ee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"net/http"
"strconv"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/edgraph"
"github.com/dgraph-io/dgraph/x"
"github.com/golang/glog"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"testing"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/x"
"github.com/stretchr/testify/require"

Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"time"

"github.com/dgraph-io/badger/y"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/edgraph"
"github.com/dgraph-io/dgraph/posting"
"github.com/dgraph-io/dgraph/schema"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/alpha/run_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"testing"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/gql"
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/query"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/upsert_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sync"
"testing"

"github.com/dgraph-io/dgo/y"
"github.com/dgraph-io/dgo/v2/y"
"github.com/dgraph-io/dgraph/testutil"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/bulk/mapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"sync"
"sync/atomic"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/chunker"
"github.com/dgraph-io/dgraph/gql"
"github.com/dgraph-io/dgraph/posting"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/counter/increment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"fmt"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/x"
"github.com/pkg/errors"
"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/counter/increment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"testing"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/testutil"
"github.com/dgraph-io/dgraph/x"
"github.com/spf13/viper"
Expand Down
6 changes: 3 additions & 3 deletions dgraph/cmd/live/batch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"google.golang.org/grpc/status"

"github.com/dgraph-io/badger"
"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/y"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v2/y"
"github.com/dgraph-io/dgraph/x"
"github.com/dgraph-io/dgraph/xidmap"
"github.com/dustin/go-humanize/english"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/live/load-json/load_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"testing"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/v2"
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgraph/testutil"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/live/load-uids/load_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"runtime"
"testing"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgraph/testutil"
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/live/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (

"github.com/dgraph-io/badger"
bopt "github.com/dgraph-io/badger/options"
"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"

"github.com/dgraph-io/dgraph/chunker"
"github.com/dgraph-io/dgraph/x"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/zero/oracle.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"time"

"github.com/dgraph-io/badger/y"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/x"
"github.com/golang/glog"
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/zero/zero.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"golang.org/x/net/context"

"github.com/dgraph-io/badger/y"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/conn"
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/x"
Expand Down
2 changes: 1 addition & 1 deletion edgraph/access.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"context"

"github.com/dgraph-io/badger/y"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/gql"
"github.com/dgraph-io/dgraph/x"
"github.com/golang/glog"
Expand Down
2 changes: 1 addition & 1 deletion edgraph/access_ee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/dgraph-io/badger/y"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/ee/acl"
"github.com/dgraph-io/dgraph/gql"
"github.com/dgraph-io/dgraph/schema"
Expand Down
4 changes: 2 additions & 2 deletions edgraph/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (

"github.com/dgraph-io/badger"
"github.com/dgraph-io/badger/options"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/y"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgo/v2/y"

"github.com/dgraph-io/dgraph/chunker"
"github.com/dgraph-io/dgraph/gql"
Expand Down
2 changes: 1 addition & 1 deletion edgraph/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package edgraph
import (
"testing"

"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/chunker"
"github.com/dgraph-io/dgraph/x"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions ee/acl/acl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"strings"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/x"
"github.com/golang/glog"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions ee/acl/acl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/testutil"
"github.com/dgraph-io/dgraph/x"
"github.com/golang/glog"
Expand Down
4 changes: 2 additions & 2 deletions ee/acl/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ package acl
import (
"encoding/json"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/dgraph-io/dgraph/x"
"github.com/golang/glog"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions ee/backup/tests/filesystem/backup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"testing"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"

Expand Down
4 changes: 2 additions & 2 deletions ee/backup/tests/minio/backup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"testing"
"time"

"github.com/dgraph-io/dgo"
"github.com/dgraph-io/dgo/protos/api"
"github.com/dgraph-io/dgo/v2"
"github.com/dgraph-io/dgo/v2/protos/api"
minio "github.com/minio/minio-go"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
Expand Down
Loading

0 comments on commit 4ec20be

Please sign in to comment.