Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/workflows/ci-dgraph-core-upgrade-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ jobs:
cp dgraph/dgraph ~/go/bin/dgraph
# run the core upgrade tests
go test -v -timeout=120m -failfast -tags=upgrade \
github.com/hypermodeinc/dgraph/v24/acl \
github.com/hypermodeinc/dgraph/v24/worker \
github.com/hypermodeinc/dgraph/v24/query
github.com/hypermodeinc/dgraph/v25/acl \
github.com/hypermodeinc/dgraph/v25/worker \
github.com/hypermodeinc/dgraph/v25/query
# clean up docker containers after test execution
go clean -testcache
# sleep
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-dgraph-system-upgrade-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ jobs:
cp dgraph/dgraph ~/go/bin/dgraph
# run the sytem upgrade tests
go test -v -timeout=120m -failfast -tags=upgrade \
github.com/hypermodeinc/dgraph/v24/systest/mutations-and-queries \
github.com/hypermodeinc/dgraph/v24/systest/plugin \
github.com/hypermodeinc/dgraph/v24/systest/multi-tenancy
github.com/hypermodeinc/dgraph/v25/systest/mutations-and-queries \
github.com/hypermodeinc/dgraph/v25/systest/plugin \
github.com/hypermodeinc/dgraph/v25/systest/multi-tenancy
# clean up docker containers after test execution
go clean -testcache
# sleep
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ delivery process.

Non-integration unit tests exist for many core packages that can be exercised without invoking the
testing framework. For instance, to unit test the core DQL parsing package:
`go test github.com/hypermodeinc/dgraph/v24/dql`.
`go test github.com/hypermodeinc/dgraph/v25/dql`.

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion acl/acl.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

"github.com/dgraph-io/dgo/v250"
"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/x"
)

func getUserAndGroup(conf *viper.Viper) (userId string, groupId string, err error) {
Expand Down
6 changes: 3 additions & 3 deletions acl/acl_curl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"github.com/golang/glog"
"github.com/stretchr/testify/require"

"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/testutil"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/testutil"
"github.com/hypermodeinc/dgraph/v25/x"
)

func (asuite *AclTestSuite) TestCurlAuthorization() {
Expand Down
4 changes: 2 additions & 2 deletions acl/acl_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/x"
)

func (asuite *AclTestSuite) TestInvalidGetUser() {
Expand Down
6 changes: 3 additions & 3 deletions acl/acl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

"github.com/dgraph-io/dgo/v250"
"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/dgraphtest"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/dgraphtest"
"github.com/hypermodeinc/dgraph/v25/x"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions acl/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/stretchr/testify/suite"

"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/dgraphtest"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/dgraphtest"
)

type AclTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions acl/jwt_algo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"github.com/golang-jwt/jwt/v5"
"github.com/stretchr/testify/require"

"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/dgraphtest"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/dgraphtest"
"github.com/hypermodeinc/dgraph/v25/x"
)

func TestACLJwtAlgo(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion acl/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/x"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions acl/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/dgraphtest"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/dgraphtest"
"github.com/hypermodeinc/dgraph/v25/x"
)

type AclTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion acl/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/dgraph-io/dgo/v250"
"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/dgraph-io/ristretto/v2/z"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/x"
)

// GetGroupIDs returns a slice containing the group ids of all the given groups.
Expand Down
2 changes: 1 addition & 1 deletion algo/heap.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package algo

import (
"github.com/hypermodeinc/dgraph/v24/codec"
"github.com/hypermodeinc/dgraph/v25/codec"
)

type elem struct {
Expand Down
4 changes: 2 additions & 2 deletions algo/packed.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"container/heap"
"sort"

"github.com/hypermodeinc/dgraph/v24/codec"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v25/codec"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
)

// ApplyFilterPacked applies the filter to a list of packed uids.
Expand Down
4 changes: 2 additions & 2 deletions algo/packed_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/stretchr/testify/require"

"github.com/hypermodeinc/dgraph/v24/codec"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v25/codec"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
)

func newUidPack(data []uint64) *pb.UidPack {
Expand Down
4 changes: 2 additions & 2 deletions algo/uidlist.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"container/heap"
"sort"

"github.com/hypermodeinc/dgraph/v24/codec"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v25/codec"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
)

const jump = 32 // Jump size in InsersectWithJump.
Expand Down
4 changes: 2 additions & 2 deletions algo/uidlist_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"

"github.com/hypermodeinc/dgraph/v24/codec"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v25/codec"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
)

func newList(data []uint64) *pb.List {
Expand Down
4 changes: 2 additions & 2 deletions audit/audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/golang/glog"

"github.com/dgraph-io/ristretto/v2/z"
"github.com/hypermodeinc/dgraph/v24/worker"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/worker"
"github.com/hypermodeinc/dgraph/v25/x"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions audit/interceptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/dgraph-io/gqlparser/v2/ast"
"github.com/dgraph-io/gqlparser/v2/parser"
"github.com/hypermodeinc/dgraph/v24/graphql/schema"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/graphql/schema"
"github.com/hypermodeinc/dgraph/v25/x"

"github.com/golang/glog"
"github.com/gorilla/websocket"
Expand Down
2 changes: 1 addition & 1 deletion audit/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/x"
)

var CmdAudit x.SubCommand
Expand Down
2 changes: 1 addition & 1 deletion audit/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/hypermodeinc/dgraph/v24/testutil/testaudit"
"github.com/hypermodeinc/dgraph/v25/testutil/testaudit"
)

// we will truncate copy of encrypted audit log file
Expand Down
8 changes: 4 additions & 4 deletions backup/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

bpb "github.com/dgraph-io/badger/v4/pb"
"github.com/dgraph-io/ristretto/v2/z"
"github.com/hypermodeinc/dgraph/v24/posting"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v24/worker"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/posting"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
"github.com/hypermodeinc/dgraph/v25/worker"
"github.com/hypermodeinc/dgraph/v25/x"
)

// Restore is the sub-command used to restore a backup.
Expand Down
4 changes: 2 additions & 2 deletions check_upgrade/check_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/golang-jwt/jwt/v5"
"github.com/spf13/cobra"

"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/x"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions check_upgrade/check_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (

"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/golang-jwt/jwt/v5"
"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/dgraphtest"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/dgraphtest"
"github.com/hypermodeinc/dgraph/v25/x"
"github.com/stretchr/testify/require"
)

Expand Down
6 changes: 3 additions & 3 deletions chunker/chunk.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"strings"
"unicode"

"github.com/hypermodeinc/dgraph/v24/enc"
"github.com/hypermodeinc/dgraph/v24/lex"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/enc"
"github.com/hypermodeinc/dgraph/v25/lex"
"github.com/hypermodeinc/dgraph/v25/x"
)

// Chunker describes the interface to parse and process the input to the live and bulk loaders.
Expand Down
8 changes: 4 additions & 4 deletions chunker/json_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/dgraph-io/simdjson-go"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v24/types"
"github.com/hypermodeinc/dgraph/v24/types/facets"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
"github.com/hypermodeinc/dgraph/v25/types"
"github.com/hypermodeinc/dgraph/v25/types/facets"
"github.com/hypermodeinc/dgraph/v25/x"
)

var errEmptyUID = errors.New("UID must be present and non-zero while deleting edges")
Expand Down
12 changes: 6 additions & 6 deletions chunker/json_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/hypermodeinc/dgraph/v24/dgraphapi"
"github.com/hypermodeinc/dgraph/v24/dgraphtest"
"github.com/hypermodeinc/dgraph/v24/testutil"
"github.com/hypermodeinc/dgraph/v24/tok"
"github.com/hypermodeinc/dgraph/v24/types"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/dgraphapi"
"github.com/hypermodeinc/dgraph/v25/dgraphtest"
"github.com/hypermodeinc/dgraph/v25/testutil"
"github.com/hypermodeinc/dgraph/v25/tok"
"github.com/hypermodeinc/dgraph/v25/types"
"github.com/hypermodeinc/dgraph/v25/x"
)

var (
Expand Down
10 changes: 5 additions & 5 deletions chunker/rdf_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"unicode"

"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/hypermodeinc/dgraph/v24/lex"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v24/types"
"github.com/hypermodeinc/dgraph/v24/types/facets"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/lex"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
"github.com/hypermodeinc/dgraph/v25/types"
"github.com/hypermodeinc/dgraph/v25/types/facets"
"github.com/hypermodeinc/dgraph/v25/x"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions chunker/rdf_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/require"

"github.com/dgraph-io/dgo/v250/protos/api"
"github.com/hypermodeinc/dgraph/v24/lex"
"github.com/hypermodeinc/dgraph/v24/types/facets"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/lex"
"github.com/hypermodeinc/dgraph/v25/types/facets"
"github.com/hypermodeinc/dgraph/v25/x"
)

var testNQuads = []struct {
Expand Down
2 changes: 1 addition & 1 deletion chunker/rdf_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package chunker
import (
"strconv"

"github.com/hypermodeinc/dgraph/v24/lex"
"github.com/hypermodeinc/dgraph/v25/lex"
)

// The constants represent different types of lexed Items possible for an rdf N-Quad.
Expand Down
6 changes: 3 additions & 3 deletions codec/benchmark/benchmark.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (

"github.com/golang/glog"

"github.com/hypermodeinc/dgraph/v24/codec"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/codec"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
"github.com/hypermodeinc/dgraph/v25/x"
)

// So, with SIMD instructions before, we were getting great performance, but at the cost of
Expand Down
4 changes: 2 additions & 2 deletions codec/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/dgryski/go-groupvarint"

"github.com/dgraph-io/ristretto/v2/z"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
"github.com/hypermodeinc/dgraph/v25/x"
)

type seekPos int
Expand Down
4 changes: 2 additions & 2 deletions codec/codec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"google.golang.org/protobuf/proto"

"github.com/dgraph-io/ristretto/v2/z"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/protos/pb"
"github.com/hypermodeinc/dgraph/v25/x"
)

func getUids(size int) []uint64 {
Expand Down
2 changes: 1 addition & 1 deletion compose/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/spf13/pflag"
yaml "gopkg.in/yaml.v3"

"github.com/hypermodeinc/dgraph/v24/x"
"github.com/hypermodeinc/dgraph/v25/x"
)

type stringMap map[string]string
Expand Down
Loading