chore: fix imports order across the repo (#8618)

dgraph-io · Jan 20, 2023 · cbec230 · cbec230
1 parent 0ba4e26
commit cbec230
Show file tree

Hide file tree

Showing 318 changed files with 1,241 additions and 1,040 deletions.
diff --git a/algo/packed_test.go b/algo/packed_test.go
@@ -20,9 +20,10 @@ import (
 	"math"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/dgraph-io/dgraph/codec"
 	"github.com/dgraph-io/dgraph/protos/pb"
-	"github.com/stretchr/testify/require"
 )
 
 func newUidPack(data []uint64) *pb.UidPack {

diff --git a/algo/uidlist_test.go b/algo/uidlist_test.go
@@ -23,9 +23,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/dgraph-io/dgraph/codec"
 	"github.com/dgraph-io/dgraph/protos/pb"
-	"github.com/stretchr/testify/require"
 )
 
 func newList(data []uint64) *pb.List {

diff --git a/chunker/chunk.go b/chunker/chunk.go
@@ -28,11 +28,11 @@ import (
 	"strings"
 	"unicode"
 
+	"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/pkg/errors"
 )
 
 // Chunker describes the interface to parse and process the input to the live and bulk loaders.

diff --git a/chunker/json_parser.go b/chunker/json_parser.go
@@ -26,15 +26,16 @@ import (
 	"sync/atomic"
 	"unicode"
 
+	"github.com/pkg/errors"
+	geom "github.com/twpayne/go-geom"
+	"github.com/twpayne/go-geom/encoding/geojson"
+
 	"github.com/dgraph-io/dgo/v210/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"
 	simdjson "github.com/dgraph-io/simdjson-go"
-	"github.com/pkg/errors"
-	geom "github.com/twpayne/go-geom"
-	"github.com/twpayne/go-geom/encoding/geojson"
 )
 
 func stripSpaces(str string) string {

diff --git a/chunker/json_parser_test.go b/chunker/json_parser_test.go
@@ -25,13 +25,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dgraph-io/dgraph/testutil"
-	"github.com/dgraph-io/dgraph/tok"
 	"github.com/golang/glog"
+	"github.com/stretchr/testify/require"
 
 	"github.com/dgraph-io/dgo/v210/protos/api"
+	"github.com/dgraph-io/dgraph/testutil"
+	"github.com/dgraph-io/dgraph/tok"
 	"github.com/dgraph-io/dgraph/types"
-	"github.com/stretchr/testify/require"
 )
 
 func makeNquad(sub, pred string, val *api.Value) *api.NQuad {

diff --git a/chunker/rdf_parser.go b/chunker/rdf_parser.go
@@ -22,13 +22,14 @@ import (
 	"strings"
 	"unicode"
 
+	"github.com/pkg/errors"
+
 	"github.com/dgraph-io/dgo/v210/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/pkg/errors"
 )
 
 var (

diff --git a/chunker/rdf_parser_test.go b/chunker/rdf_parser_test.go
@@ -19,11 +19,12 @@ package chunker
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/dgraph-io/dgo/v210/protos/api"
 	"github.com/dgraph-io/dgraph/lex"
 	"github.com/dgraph-io/dgraph/types/facets"
 	"github.com/dgraph-io/dgraph/x"
-	"github.com/stretchr/testify/require"
 )
 
 var testNQuads = []struct {

diff --git a/chunker/rdf_state.go b/chunker/rdf_state.go
@@ -364,7 +364,8 @@ func lexLabel(l *lex.Lexer) lex.StateFn {
 
 // lexFacets parses key-value pairs of Facets. sample is :
 // ( key1 = "value1", key2=13, key3=, key4 =2.4, key5=2006-01-02T15:04:05,
-//   key6=2006-01-02 )
+//
+//	key6=2006-01-02 )
 func lexFacets(l *lex.Lexer) lex.StateFn {
 	r := l.Next()
 	if r != leftRound {

diff --git a/codec/codec.go b/codec/codec.go
@@ -23,10 +23,11 @@ import (
 	"sort"
 	"unsafe"
 
+	"github.com/dgryski/go-groupvarint"
+
 	"github.com/dgraph-io/dgraph/protos/pb"
 	"github.com/dgraph-io/dgraph/x"
 	"github.com/dgraph-io/ristretto/z"
-	"github.com/dgryski/go-groupvarint"
 )
 
 type seekPos int

diff --git a/codec/codec_test.go b/codec/codec_test.go
@@ -26,11 +26,12 @@ import (
 	"testing"
 	"time"
 
+	humanize "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/ristretto/z"
-	humanize "github.com/dustin/go-humanize"
-	"github.com/stretchr/testify/require"
 )
 
 func getUids(size int) []uint64 {

diff --git a/conn/node_test.go b/conn/node_test.go
@@ -26,11 +26,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dgraph-io/dgraph/protos/pb"
-	"github.com/dgraph-io/dgraph/raftwal"
 	"github.com/stretchr/testify/require"
 	"go.etcd.io/etcd/raft"
 	"go.etcd.io/etcd/raft/raftpb"
+
+	"github.com/dgraph-io/dgraph/protos/pb"
+	"github.com/dgraph-io/dgraph/raftwal"
 )
 
 func (n *Node) run(wg *sync.WaitGroup) {

diff --git a/conn/pool.go b/conn/pool.go
@@ -23,16 +23,16 @@ import (
 	"sync"
 	"time"
 
-	"github.com/dgraph-io/dgo/v210/protos/api"
-	"github.com/dgraph-io/dgraph/protos/pb"
-	"github.com/dgraph-io/dgraph/x"
-	"github.com/dgraph-io/ristretto/z"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"go.opencensus.io/plugin/ocgrpc"
-
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+
+	"github.com/dgraph-io/dgo/v210/protos/api"
+	"github.com/dgraph-io/dgraph/protos/pb"
+	"github.com/dgraph-io/dgraph/x"
+	"github.com/dgraph-io/ristretto/z"
 )
 
 var (

diff --git a/conn/raft_server.go b/conn/raft_server.go
@@ -25,13 +25,14 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/dgraph-io/dgo/v210/protos/api"
-	"github.com/dgraph-io/dgraph/protos/pb"
-	"github.com/dgraph-io/dgraph/x"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"go.etcd.io/etcd/raft/raftpb"
 	otrace "go.opencensus.io/trace"
+
+	"github.com/dgraph-io/dgo/v210/protos/api"
+	"github.com/dgraph-io/dgraph/protos/pb"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 type sendmsg struct {

diff --git a/contrib/integration/bank/main.go b/contrib/integration/bank/main.go
@@ -35,11 +35,12 @@ import (
 	"sync/atomic"
 	"time"
 
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+
 	"github.com/dgraph-io/dgo/v210"
 	"github.com/dgraph-io/dgo/v210/protos/api"
 	"github.com/dgraph-io/dgraph/x"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
 )
 
 var (

diff --git a/contrib/integration/bigdata/main.go b/contrib/integration/bigdata/main.go
@@ -28,10 +28,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"google.golang.org/grpc"
+
 	"github.com/dgraph-io/dgo/v210"
 	"github.com/dgraph-io/dgo/v210/protos/api"
 	"github.com/dgraph-io/dgraph/x"
-	"google.golang.org/grpc"
 )
 
 var addrs = flag.String("addrs", "", "comma separated dgraph addresses")

diff --git a/contrib/integration/mutates/main.go b/contrib/integration/mutates/main.go
@@ -23,10 +23,11 @@ import (
 	"fmt"
 	"log"
 
+	"google.golang.org/grpc"
+
 	"github.com/dgraph-io/dgo/v210"
 	"github.com/dgraph-io/dgo/v210/protos/api"
 	"github.com/dgraph-io/dgraph/x"
-	"google.golang.org/grpc"
 )
 
 var alpha = flag.String("alpha", "localhost:9080", "Dgraph alpha addr")

diff --git a/contrib/integration/swap/main.go b/contrib/integration/swap/main.go
@@ -28,11 +28,12 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/dgraph-io/dgo/v210"
 	"github.com/dgraph-io/dgo/v210/protos/api"
 	"github.com/dgraph-io/dgraph/testutil"
 	"github.com/dgraph-io/dgraph/x"
-	"github.com/pkg/errors"
 )
 
 var (

diff --git a/contrib/integration/testtxn/main_test.go b/contrib/integration/testtxn/main_test.go
@@ -29,12 +29,13 @@ import (
 	"testing"
 	"time"
 
+	"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/dgraph/testutil"
 	"github.com/dgraph-io/dgraph/x"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 type state struct {

diff --git a/contrib/jepsen/main.go b/contrib/jepsen/main.go
@@ -43,8 +43,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/dgraph-io/dgraph/contrib/jepsen/browser"
 	"github.com/spf13/pflag"
+
+	"github.com/dgraph-io/dgraph/contrib/jepsen/browser"
 )
 
 type jepsenTest struct {

diff --git a/dgraph/cmd/alpha/admin.go b/dgraph/cmd/alpha/admin.go
@@ -25,7 +25,6 @@ import (
 	"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"

diff --git a/dgraph/cmd/alpha/admin_backup.go b/dgraph/cmd/alpha/admin_backup.go
@@ -1,3 +1,4 @@
+//go:build !oss
 // +build !oss
 
 /*
@@ -21,10 +22,10 @@ package alpha
 import (
 	"net/http"
 
-	"github.com/dgraph-io/dgraph/graphql/schema"
+	"github.com/golang/glog"
 
+	"github.com/dgraph-io/dgraph/graphql/schema"
 	"github.com/dgraph-io/dgraph/x"
-	"github.com/golang/glog"
 )
 
 func init() {

diff --git a/dgraph/cmd/alpha/http.go b/dgraph/cmd/alpha/http.go
@@ -32,18 +32,18 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/dgraph-io/dgraph/graphql/admin"
+	"github.com/gogo/protobuf/jsonpb"
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
+	"google.golang.org/grpc/metadata"
 
 	"github.com/dgraph-io/dgo/v210/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/gogo/protobuf/jsonpb"
-	"github.com/golang/glog"
-	"github.com/pkg/errors"
-	"google.golang.org/grpc/metadata"
 )
 
 func allowed(method string) bool {

diff --git a/dgraph/cmd/alpha/login_ee.go b/dgraph/cmd/alpha/login_ee.go
@@ -1,3 +1,4 @@
+//go:build !oss
 // +build !oss
 
 /*
@@ -17,10 +18,11 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"github.com/golang/glog"
+
 	"github.com/dgraph-io/dgo/v210/protos/api"
 	"github.com/dgraph-io/dgraph/edgraph"
 	"github.com/dgraph-io/dgraph/x"
-	"github.com/golang/glog"
 )
 
 func loginHandler(w http.ResponseWriter, r *http.Request) {

diff --git a/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go b/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go
@@ -21,12 +21,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc"
+
 	"github.com/dgraph-io/dgo/v210"
 	"github.com/dgraph-io/dgo/v210/protos/api"
 	"github.com/dgraph-io/dgraph/testutil"
-	"github.com/stretchr/testify/require"
-
-	"google.golang.org/grpc"
 )
 
 // Tests in this file require a cluster running with the --limit "mutations=<mode>;" flag.