Switch imports to dgraph-io

gql/lexer.go

@@ -21,7 +21,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 var glog = x.Log("lexer")

gql/parser.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/manishrjain/dgraph/query"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/query"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func Parse(input string) (sg *query.SubGraph, rerr error) {

gql/parser_test.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/manishrjain/dgraph/query"
+	"github.com/dgraph-io/dgraph/query"
 )
 
 func checkAttr(g *query.SubGraph, attr string) error {

posting/list.go

@@ -27,9 +27,9 @@ import (
 	"sync"
 
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/posting/types"
-	"github.com/manishrjain/dgraph/store"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting/types"
+	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/x"
 
 	linked "container/list"
 )

posting/list_test.go

@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/manishrjain/dgraph/posting/types"
-	"github.com/manishrjain/dgraph/store"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting/types"
+	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func checkUids(t *testing.T, l List, uids ...uint64) error {

posting/lists.go

@@ -20,7 +20,7 @@ import (
 	"sync"
 
 	"github.com/dgryski/go-farm"
-	"github.com/manishrjain/dgraph/store"
+	"github.com/dgraph-io/dgraph/store"
 )
 
 var lmutex sync.RWMutex

posting/worker.go

@@ -4,7 +4,7 @@ import (
 	"container/heap"
 
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/task"
+	"github.com/dgraph-io/dgraph/task"
 )
 
 type elem struct {

posting/worker_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/store"
-	"github.com/manishrjain/dgraph/task"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/task"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func TestPush(t *testing.T) {

query/query.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/posting"
-	"github.com/manishrjain/dgraph/task"
-	"github.com/manishrjain/dgraph/uid"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting"
+	"github.com/dgraph-io/dgraph/task"
+	"github.com/dgraph-io/dgraph/uid"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 /*

query/query_test.go

@@ -24,10 +24,10 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/google/flatbuffers/go"
-	"github.com/manishrjain/dgraph/posting"
-	"github.com/manishrjain/dgraph/store"
-	"github.com/manishrjain/dgraph/task"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting"
+	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/task"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func setErr(err *error, nerr error) {

store/store.go

@@ -17,7 +17,7 @@
 package store
 
 import (
-	"github.com/manishrjain/gocrud/x"
+	"github.com/dgraph-io/dgraph/x"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
@@ -33,7 +33,7 @@ func (s *Store) Init(filepath string) {
 	var err error
 	s.db, err = leveldb.OpenFile(filepath, s.opt)
 	if err != nil {
-		x.LogErr(log, err).WithField("filepath", filepath).
+		x.Err(log, err).WithField("filepath", filepath).
 			Fatal("While opening store")
 		return
 	}

store/store_test.go

@@ -33,7 +33,7 @@ func TestGet(t *testing.T) {
 
 	var s Store
 	s.Init(path)
-	k := Key("name", 1)
+	k := []byte("mykey")
 	if err := s.SetOne(k, []byte("neo")); err != nil {
 		t.Error(err)
 		t.Fail()

uid/assigner.go

@@ -23,9 +23,9 @@ import (
 	"time"
 
 	"github.com/dgryski/go-farm"
-	"github.com/manishrjain/dgraph/posting"
-	"github.com/manishrjain/dgraph/posting/types"
-	"github.com/manishrjain/dgraph/x"
+	"github.com/dgraph-io/dgraph/posting"
+	"github.com/dgraph-io/dgraph/posting/types"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 var log = x.Log("uid")

uid/assigner_test.go

@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/manishrjain/dgraph/posting"
-	"github.com/manishrjain/dgraph/store"
+	"github.com/dgraph-io/dgraph/posting"
+	"github.com/dgraph-io/dgraph/store"
 )
 
 func NewStore(t *testing.T) string {