Skip to content

Commit

Permalink
fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@mangalaman93
mangalaman93 committed Jan 2, 2023
1 parent 42b50ec commit 5372973
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 30 deletions.
1 change: 1 addition & 0 deletions worker/acl_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/dgraph-io/dgraph/ee/acl"
"github.com/dgraph-io/dgraph/x"

"github.com/pkg/errors"
)

Expand Down
2 changes: 2 additions & 0 deletions worker/acl_cache_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !oss
// +build !oss

/*
Expand All @@ -17,6 +18,7 @@ import (

"github.com/dgraph-io/dgraph/ee/acl"
"github.com/dgraph-io/dgraph/x"

"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 3 additions & 1 deletion worker/aggregator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

package worker

import "github.com/dgraph-io/dgraph/types"
import (
"github.com/dgraph-io/dgraph/types"
)

func couldApplyAggregatorOn(agrtr string, typ types.TypeID) bool {
if !typ.IsScalar() {
Expand Down
4 changes: 2 additions & 2 deletions worker/backup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"sync"

"github.com/dgraph-io/badger/v3"
"github.com/pkg/errors"

"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/x"

"github.com/pkg/errors"
)

// predicateSet is a map whose keys are predicates. It is meant to be used as a set.
Expand Down
2 changes: 1 addition & 1 deletion worker/backup_ee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ import (
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/x"
"github.com/dgraph-io/ristretto/z"
ostats "go.opencensus.io/stats"

"github.com/golang/glog"
"github.com/golang/protobuf/proto"
"github.com/golang/snappy"
"github.com/pkg/errors"
ostats "go.opencensus.io/stats"
)

// Backup handles a request coming from another node.
Expand Down
1 change: 1 addition & 0 deletions worker/backup_oss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/x"

"github.com/golang/glog"
)

Expand Down
2 changes: 2 additions & 0 deletions worker/cdc_ee.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !oss
// +build !oss

/*
Expand Down Expand Up @@ -27,6 +28,7 @@ import (
"github.com/dgraph-io/dgraph/types"
"github.com/dgraph-io/dgraph/x"
"github.com/dgraph-io/ristretto/z"

"github.com/golang/glog"
"github.com/pkg/errors"
"go.etcd.io/etcd/raft/raftpb"
Expand Down
21 changes: 10 additions & 11 deletions worker/draft.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@ import (
"sync/atomic"
"time"

"github.com/dustin/go-humanize"
"github.com/golang/glog"
"github.com/pkg/errors"
"go.etcd.io/etcd/raft"
"go.etcd.io/etcd/raft/raftpb"
"golang.org/x/net/trace"

ostats "go.opencensus.io/stats"
"go.opencensus.io/tag"
otrace "go.opencensus.io/trace"

"github.com/dgraph-io/badger/v3"
bpb "github.com/dgraph-io/badger/v3/pb"
"github.com/dgraph-io/dgraph/conn"
Expand All @@ -49,6 +38,16 @@ import (
"github.com/dgraph-io/dgraph/types"
"github.com/dgraph-io/dgraph/x"
"github.com/dgraph-io/ristretto/z"

"github.com/dustin/go-humanize"
"github.com/golang/glog"
"github.com/pkg/errors"
"go.etcd.io/etcd/raft"
"go.etcd.io/etcd/raft/raftpb"
ostats "go.opencensus.io/stats"
"go.opencensus.io/tag"
otrace "go.opencensus.io/trace"
"golang.org/x/net/trace"
)

type operation struct {
Expand Down
1 change: 1 addition & 0 deletions worker/draft_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/raftwal"
"github.com/dgraph-io/dgraph/x"

"github.com/stretchr/testify/require"
"go.etcd.io/etcd/raft/raftpb"
)
Expand Down
1 change: 1 addition & 0 deletions worker/executor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/dgraph-io/dgraph/types"
"github.com/dgraph-io/dgraph/x"
"github.com/dgraph-io/ristretto/z"

"github.com/dgryski/go-farm"
"github.com/golang/glog"
)
Expand Down
12 changes: 5 additions & 7 deletions worker/export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,20 @@ import (
"strings"
"time"

"github.com/golang/glog"
"github.com/minio/minio-go/v6"
"github.com/pkg/errors"

"github.com/dgraph-io/badger/v3"
bpb "github.com/dgraph-io/badger/v3/pb"
"github.com/dgraph-io/ristretto/z"

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

"github.com/dgraph-io/dgraph/ee/enc"
"github.com/dgraph-io/dgraph/posting"
"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/dgraph-io/ristretto/z"

"github.com/golang/glog"
"github.com/minio/minio-go/v6"
"github.com/pkg/errors"
)

// DefaultExportFormat stores the name of the default format for exports.
Expand Down
7 changes: 3 additions & 4 deletions worker/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ import (
"testing"
"time"

"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/require"

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

"github.com/dgraph-io/dgraph/chunker"
"github.com/dgraph-io/dgraph/gql"
"github.com/dgraph-io/dgraph/lex"
Expand All @@ -47,6 +43,9 @@ import (
"github.com/dgraph-io/dgraph/types"
"github.com/dgraph-io/dgraph/types/facets"
"github.com/dgraph-io/dgraph/x"

"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/require"
)

const (
Expand Down
7 changes: 3 additions & 4 deletions worker/graphql_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ import (
"sync"
"time"

"google.golang.org/grpc/metadata"

"github.com/golang/glog"

"github.com/dgraph-io/dgraph/conn"
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/dgraph/schema"
"github.com/dgraph-io/dgraph/x"

"github.com/golang/glog"
"github.com/pkg/errors"
"google.golang.org/grpc/metadata"
)

const (
Expand Down
1 change: 1 addition & 0 deletions worker/groups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"github.com/dgraph-io/dgraph/schema"
"github.com/dgraph-io/dgraph/x"
"github.com/dgraph-io/ristretto/z"

"github.com/golang/glog"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
Expand Down

0 comments on commit 5372973

Please sign in to comment.