From 32c73844d36b703b3962ac70804d06468b19047d Mon Sep 17 00:00:00 2001
From: Manish R Jain <manishrjain@gmail.com>
Date: Thu, 29 Oct 2015 13:54:23 +1100
Subject: [PATCH] Switch imports to dgraph-io
---
gql/lexer.go | 2 +-
gql/parser.go | 4 ++--
gql/parser_test.go | 2 +-
posting/list.go | 6 +++---
posting/list_test.go | 6 +++---
posting/lists.go | 2 +-
posting/worker.go | 2 +-
posting/worker_test.go | 6 +++---
query/query.go | 8 ++++----
query/query_test.go | 8 ++++----
store/store.go | 4 ++--
store/store_test.go | 2 +-
uid/assigner.go | 6 +++---
uid/assigner_test.go | 4 ++--
14 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/gql/lexer.go b/gql/lexer.go
index 3a30e4a7..d16b5bf3 100644
--- a/gql/lexer.go
+++ b/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")
diff --git a/gql/parser.go b/gql/parser.go
index 5b3f2753..1d654023 100644
--- a/gql/parser.go
+++ b/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) {
diff --git a/gql/parser_test.go b/gql/parser_test.go
index e4dab4ee..b1acd0c5 100644
--- a/gql/parser_test.go
+++ b/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 {
diff --git a/posting/list.go b/posting/list.go
index 5b290654..e0cd7992 100644
--- a/posting/list.go
+++ b/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"
)
diff --git a/posting/list_test.go b/posting/list_test.go
index 10aa5940..c6c1dee3 100644
--- a/posting/list_test.go
+++ b/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 {
diff --git a/posting/lists.go b/posting/lists.go
index fa68a310..65bfb400 100644
--- a/posting/lists.go
+++ b/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
diff --git a/posting/worker.go b/posting/worker.go
index 56529b78..acee33c9 100644
--- a/posting/worker.go
+++ b/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 {
diff --git a/posting/worker_test.go b/posting/worker_test.go
index 010afc5f..9ed5ba1d 100644
--- a/posting/worker_test.go
+++ b/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) {
diff --git a/query/query.go b/query/query.go
index 1cec4f2e..90a76e74 100644
--- a/query/query.go
+++ b/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"
)
/*
diff --git a/query/query_test.go b/query/query_test.go
index d8273065..6efd9a8d 100644
--- a/query/query_test.go
+++ b/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) {
diff --git a/store/store.go b/store/store.go
index 33628bce..e29abdee 100644
--- a/store/store.go
+++ b/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
}
diff --git a/store/store_test.go b/store/store_test.go
index cffc93ca..a8860d52 100644
--- a/store/store_test.go
+++ b/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()
diff --git a/uid/assigner.go b/uid/assigner.go
index 9c26695d..9c61a860 100644
--- a/uid/assigner.go
+++ b/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")
diff --git a/uid/assigner_test.go b/uid/assigner_test.go
index 715a0217..8d9d85e4 100644
--- a/uid/assigner_test.go
+++ b/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 {
--
GitLab