Merge branch 'main' into ryan/repo-organization

.github/workflows/ci-dgraph-core-upgrade-tests.yml

@@ -41,9 +41,9 @@ jobs:
           cp dgraph/dgraph ~/go/bin/dgraph
           # run the core upgrade tests
           go test -tags=upgrade \
-          github.com/dgraph-io/dgraph/v24/ee/acl \
-          github.com/dgraph-io/dgraph/v24/worker \
-          github.com/dgraph-io/dgraph/v24/query \
+          github.com/hypermodeinc/dgraph/v24/ee/acl \
+          github.com/hypermodeinc/dgraph/v24/worker \
+          github.com/hypermodeinc/dgraph/v24/query \
           -v -timeout=120m -failfast
           # clean up docker containers after test execution
           go clean -testcache

.github/workflows/ci-dgraph-system-upgrade-tests.yml

@@ -40,10 +40,10 @@ jobs:
           # move the binary
           cp dgraph/dgraph ~/go/bin/dgraph
           # run the sytem upgrade tests
-          go test -tags=upgrade  github.com/dgraph-io/dgraph/v24/systest/mutations-and-queries \
-          github.com/dgraph-io/dgraph/v24/systest/plugin \
-          github.com/dgraph-io/dgraph/v24/systest/license \
-          github.com/dgraph-io/dgraph/v24/systest/multi-tenancy \
+          go test -tags=upgrade  github.com/hypermodeinc/dgraph/v24/systest/mutations-and-queries \
+          github.com/hypermodeinc/dgraph/v24/systest/plugin \
+          github.com/hypermodeinc/dgraph/v24/systest/license \
+          github.com/hypermodeinc/dgraph/v24/systest/multi-tenancy \
           -v -timeout=120m -failfast
           # clean up docker containers after test execution
           go clean -testcache

README.md

@@ -17,9 +17,9 @@
 [![ci-dgraph-load-tests](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-dgraph-load-tests.yml/badge.svg)](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-dgraph-load-tests.yml)
 [![ci-golang-lint](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-golang-lint.yml/badge.svg)](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-golang-lint.yml)
 [![ci-aqua-security-trivy-tests](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-aqua-security-trivy-tests.yml/badge.svg)](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-aqua-security-trivy-tests.yml)
-[![Coverage Status](https://coveralls.io/repos/github/dgraph-io/dgraph/badge.svg?branch=main)](https://coveralls.io/github/dgraph-io/dgraph?branch=main)
-[![Go Report Card](https://goreportcard.com/badge/github.com/dgraph-io/dgraph)](https://goreportcard.com/report/github.com/dgraph-io/dgraph)
-[![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/dgraph-io/dgraph/main)](https://www.tickgit.com/browse?repo=github.com/dgraph-io/dgraph&branch=main)
+[![Coverage Status](https://coveralls.io/repos/github/hypermodeinc/dgraph/badge.svg?branch=main)](https://coveralls.io/github/hypermodeinc/dgraph?branch=main)
+[![Go Report Card](https://goreportcard.com/badge/github.com/hypermodeinc/dgraph)](https://goreportcard.com/report/github.com/hypermodeinc/dgraph)
+[![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/hypermodeinc/dgraph/main)](https://www.tickgit.com/browse?repo=github.com/hypermodeinc/dgraph&branch=main)
 
 Dgraph is a horizontally scalable and distributed GraphQL database with a graph backend. It provides ACID transactions, consistent replication, and linearizable reads. It's built from the ground up to perform 
 a rich set of queries. Being a native GraphQL database, it tightly controls how the

algo/heap.go

@@ -17,7 +17,7 @@
 package algo
 
 import (
-	"github.com/dgraph-io/dgraph/v24/codec"
+	"github.com/hypermodeinc/dgraph/v24/codec"
 )
 
 type elem struct {

algo/packed.go

@@ -20,8 +20,8 @@ import (
 	"container/heap"
 	"sort"
 
-	"github.com/dgraph-io/dgraph/v24/codec"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/codec"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
 )
 
 // ApplyFilterPacked applies the filter to a list of packed uids.

algo/packed_test.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/dgraph-io/dgraph/v24/codec"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/codec"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
 )
 
 func newUidPack(data []uint64) *pb.UidPack {

algo/uidlist.go

@@ -20,8 +20,8 @@ import (
 	"container/heap"
 	"sort"
 
-	"github.com/dgraph-io/dgraph/v24/codec"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/codec"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
 )
 
 const jump = 32          // Jump size in InsersectWithJump.

algo/uidlist_test.go

@@ -26,8 +26,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/dgraph-io/dgraph/v24/codec"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/codec"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
 )
 
 func newList(data []uint64) *pb.List {

check_upgrade/check_upgrade.go

@@ -30,8 +30,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/dgraph-io/dgraph/v24/dgraphapi"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/dgraphapi"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var (

check_upgrade/check_upgrade_test.go

@@ -28,10 +28,10 @@ import (
 	"time"
 
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/dgraphapi"
-	"github.com/dgraph-io/dgraph/v24/dgraphtest"
-	"github.com/dgraph-io/dgraph/v24/x"
 	"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/stretchr/testify/require"
 )
 

chunker/chunk.go

@@ -30,9 +30,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/dgraph-io/dgraph/v24/ee/enc"
-	"github.com/dgraph-io/dgraph/v24/lex"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/ee/enc"
+	"github.com/hypermodeinc/dgraph/v24/lex"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 // Chunker describes the interface to parse and process the input to the live and bulk loaders.

chunker/json_parser.go

@@ -31,11 +31,11 @@ import (
 	"github.com/twpayne/go-geom/encoding/geojson"
 
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/types"
-	"github.com/dgraph-io/dgraph/v24/types/facets"
-	"github.com/dgraph-io/dgraph/v24/x"
 	"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"
 )
 
 func stripSpaces(str string) string {

chunker/json_parser_test.go

@@ -32,9 +32,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/testutil"
-	"github.com/dgraph-io/dgraph/v24/tok"
-	"github.com/dgraph-io/dgraph/v24/types"
+	"github.com/hypermodeinc/dgraph/v24/testutil"
+	"github.com/hypermodeinc/dgraph/v24/tok"
+	"github.com/hypermodeinc/dgraph/v24/types"
 )
 
 func makeNquad(sub, pred string, val *api.Value) *api.NQuad {

chunker/rdf_parser.go

@@ -25,11 +25,11 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/lex"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/types"
-	"github.com/dgraph-io/dgraph/v24/types/facets"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"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"
 )
 
 var (

chunker/rdf_parser_test.go

@@ -22,9 +22,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/lex"
-	"github.com/dgraph-io/dgraph/v24/types/facets"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/lex"
+	"github.com/hypermodeinc/dgraph/v24/types/facets"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var testNQuads = []struct {

chunker/rdf_state.go

@@ -19,7 +19,7 @@ package chunker
 import (
 	"strconv"
 
-	"github.com/dgraph-io/dgraph/v24/lex"
+	"github.com/hypermodeinc/dgraph/v24/lex"
 )
 
 // The constants represent different types of lexed Items possible for an rdf N-Quad.

codec/benchmark/benchmark.go

@@ -33,9 +33,9 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/dgraph-io/dgraph/v24/codec"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/codec"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 // So, with SIMD instructions before, we were getting great performance, but at the cost of

codec/codec.go

@@ -25,9 +25,9 @@ import (
 
 	"github.com/dgryski/go-groupvarint"
 
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/x"
 	"github.com/dgraph-io/ristretto/v2/z"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 type seekPos int

codec/codec_test.go

@@ -30,9 +30,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/x"
 	"github.com/dgraph-io/ristretto/v2/z"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 func getUids(size int) []uint64 {

compose/compose.go

@@ -30,7 +30,7 @@ import (
 	"github.com/spf13/pflag"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 type stringMap map[string]string
@@ -471,7 +471,7 @@ func addMetrics(cfg *composeConfig) {
 			},
 			{
 				Type:     "bind",
-				Source:   "$GOPATH/src/github.com/dgraph-io/dgraph/compose/prometheus.yml",
+				Source:   "$GOPATH/src/github.com/hypermodeinc/dgraph/compose/prometheus.yml",
 				Target:   "/etc/prometheus/prometheus.yml",
 				ReadOnly: true,
 			},

conn/node.go

@@ -37,10 +37,10 @@ import (
 
 	"github.com/dgraph-io/badger/v4/y"
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/raftwal"
-	"github.com/dgraph-io/dgraph/v24/x"
 	"github.com/dgraph-io/ristretto/v2/z"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/raftwal"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var (

conn/node_test.go

@@ -28,8 +28,8 @@ import (
 	"go.etcd.io/etcd/raft/v3"
 	"go.etcd.io/etcd/raft/v3/raftpb"
 
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/raftwal"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/raftwal"
 )
 
 func (n *Node) run(wg *sync.WaitGroup) {

conn/pool.go

@@ -31,9 +31,9 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/x"
 	"github.com/dgraph-io/ristretto/v2/z"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var (

conn/raft_server.go

@@ -31,8 +31,8 @@ import (
 	otrace "go.opencensus.io/trace"
 
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/protos/pb"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/protos/pb"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 type sendmsg struct {

contrib/integration/acctupsert/main.go

@@ -31,8 +31,8 @@ import (
 
 	"github.com/dgraph-io/dgo/v240"
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/testutil"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/testutil"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var (

contrib/integration/bank/main.go

@@ -41,7 +41,7 @@ import (
 
 	"github.com/dgraph-io/dgo/v240"
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var (

contrib/integration/bigdata/main.go

@@ -33,7 +33,7 @@ import (
 
 	"github.com/dgraph-io/dgo/v240"
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var addrs = flag.String("addrs", "", "comma separated dgraph addresses")

contrib/integration/mutates/main.go

@@ -28,7 +28,7 @@ import (
 
 	"github.com/dgraph-io/dgo/v240"
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var alpha = flag.String("alpha", "localhost:9080", "Dgraph alpha addr")

contrib/integration/swap/main.go

@@ -32,8 +32,8 @@ import (
 
 	"github.com/dgraph-io/dgo/v240"
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/testutil"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/testutil"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 var (

contrib/integration/testtxn/main_test.go

@@ -35,8 +35,8 @@ import (
 
 	"github.com/dgraph-io/dgo/v240"
 	"github.com/dgraph-io/dgo/v240/protos/api"
-	"github.com/dgraph-io/dgraph/v24/testutil"
-	"github.com/dgraph-io/dgraph/v24/x"
+	"github.com/hypermodeinc/dgraph/v24/testutil"
+	"github.com/hypermodeinc/dgraph/v24/x"
 )
 
 type state struct {

contrib/jepsen/main.go

@@ -46,7 +46,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
 
-	"github.com/dgraph-io/dgraph/v24/contrib/jepsen/browser"
+	"github.com/hypermodeinc/dgraph/v24/contrib/jepsen/browser"
 )
 
 type jepsenTest struct {

contrib/tlstest/Makefile

@@ -15,7 +15,7 @@
 #
 
 
-DGRAPH_PATH = $(GOPATH)/src/github.com/dgraph-io/dgraph/dgraph
+DGRAPH_PATH = $(GOPATH)/src/github.com/hypermodeinc/dgraph/dgraph
 DGRAPH_BIN  = $(DGRAPH_PATH)/dgraph
 
 TARGETS     = test1 test2 test3 test4 test5 test6

dgraph/Makefile

@@ -36,11 +36,11 @@ endif
 GOPATH        ?= $(shell go env GOPATH)
 
 # Build-time Go variables
-dgraphVersion   = github.com/dgraph-io/dgraph/v24/x.dgraphVersion
-dgraphCodename  = github.com/dgraph-io/dgraph/v24/x.dgraphCodename
-gitBranch       = github.com/dgraph-io/dgraph/v24/x.gitBranch
-lastCommitSHA   = github.com/dgraph-io/dgraph/v24/x.lastCommitSHA
-lastCommitTime  = github.com/dgraph-io/dgraph/v24/x.lastCommitTime
+dgraphVersion   = github.com/hypermodeinc/dgraph/v24/x.dgraphVersion
+dgraphCodename  = github.com/hypermodeinc/dgraph/v24/x.dgraphCodename
+gitBranch       = github.com/hypermodeinc/dgraph/v24/x.gitBranch
+lastCommitSHA   = github.com/hypermodeinc/dgraph/v24/x.lastCommitSHA
+lastCommitTime  = github.com/hypermodeinc/dgraph/v24/x.lastCommitTime
 
 BUILD_FLAGS   ?= -ldflags '-X ${lastCommitSHA}=${BUILD} -X "${lastCommitTime}=${BUILD_DATE}" -X "${dgraphVersion}=${BUILD_VERSION}" -X "${dgraphCodename}=${BUILD_CODENAME}" -X ${gitBranch}=${BUILD_BRANCH}'