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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-dgraph-integration2-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
dgraph-integration2-tests:
if: github.event.pull_request.draft == false
runs-on: warp-ubuntu-latest-x64-4x
timeout-minutes: 15
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
with:
Expand Down
32 changes: 16 additions & 16 deletions edgraph/alter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestDropAllInNs(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAllNamespaces(context.Background()))

Expand Down Expand Up @@ -55,7 +55,7 @@ func TestDropAllInNs(t *testing.T) {
require.JSONEq(t, `{"q":[{"name":"Alice"}]}`, string(resp.GetJson()))

// namespace 2
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.SetSchema(ctx, "ns2", `name: string @index(exact) .`))
require.NoError(t, client.LoginIntoNamespace(context.Background(),
Expand All @@ -70,7 +70,7 @@ func TestDropAllInNs(t *testing.T) {
require.JSONEq(t, `{"q":[{"name":"Bob"}]}`, string(resp.GetJson()))

// Drop everything in namespace 1
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.Dgraph.DropAll(context.Background(), "ns1"))

Expand All @@ -95,13 +95,13 @@ func TestDropAll(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAllNamespaces(context.Background()))

// Create two namespaces
ctx := context.Background()
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.CreateNamespace(ctx, "ns1"))
require.NoError(t, client.CreateNamespace(ctx, "ns2"))
Expand All @@ -127,7 +127,7 @@ func TestDropAll(t *testing.T) {
require.JSONEq(t, `{"q":[{"name":"Alice"}]}`, string(resp.GetJson()))

// namespace 2
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.SetSchema(ctx, "ns2", `name: string @index(exact) .`))
require.NoError(t, client.LoginIntoNamespace(context.Background(),
Expand All @@ -142,7 +142,7 @@ func TestDropAll(t *testing.T) {
require.JSONEq(t, `{"q":[{"name":"Bob"}]}`, string(resp.GetJson()))

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAllNamespaces(context.Background()))

Expand All @@ -162,13 +162,13 @@ func TestDropData(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAllNamespaces(context.Background()))

// Create two namespaces
ctx := context.Background()
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.CreateNamespace(ctx, "ns1"))
require.NoError(t, client.CreateNamespace(ctx, "ns2"))
Expand All @@ -193,7 +193,7 @@ func TestDropData(t *testing.T) {
require.NoError(t, err)
require.JSONEq(t, `{"q":[{"name":"Alice"}]}`, string(resp.GetJson()))

require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropData(context.Background(), "ns1"))

Expand All @@ -215,13 +215,13 @@ func TestDropPredicate(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAllNamespaces(context.Background()))

// Create two namespaces
ctx := context.Background()
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.CreateNamespace(ctx, "ns1"))
require.NoError(t, client.CreateNamespace(ctx, "ns2"))
Expand All @@ -246,7 +246,7 @@ func TestDropPredicate(t *testing.T) {
require.NoError(t, err)
require.JSONEq(t, `{"q":[{"name":"Alice"}]}`, string(resp.GetJson()))

require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.Dgraph.DropPredicate(context.Background(), "ns1", "name"))

Expand All @@ -268,13 +268,13 @@ func TestDropType(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAllNamespaces(context.Background()))

// Create two namespaces
ctx := context.Background()
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.CreateNamespace(ctx, "ns1"))
require.NoError(t, client.CreateNamespace(ctx, "ns2"))
Expand Down Expand Up @@ -303,7 +303,7 @@ func TestDropType(t *testing.T) {
require.NoError(t, err)
require.Contains(t, string(resp.GetJson()), `"name":"name"`)

require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropType(context.Background(), "ns1", "Person"))
resp, err = client.Query(`schema{}`)
Expand Down
12 changes: 6 additions & 6 deletions edgraph/namespace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestNamespaces(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAll())

Expand Down Expand Up @@ -91,7 +91,7 @@ func TestNamespacesPreV25(t *testing.T) {
dgraphapi.DefaultPassword, x.GalaxyNamespace))

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAll())

Expand Down Expand Up @@ -158,7 +158,7 @@ func TestCreateNamespaceErr(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAll())

Expand Down Expand Up @@ -200,7 +200,7 @@ func TestDropNamespaceErr(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAll())

Expand Down Expand Up @@ -250,7 +250,7 @@ func TestRenameNamespaceErr(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAll())

Expand Down Expand Up @@ -294,7 +294,7 @@ func TestListNamespacesErr(t *testing.T) {
defer cleanup()

// Drop all data
require.NoError(t, client.SignInUser(context.Background(),
require.NoError(t, client.Login(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword))
require.NoError(t, client.DropAll())

Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/Masterminds/semver/v3 v3.3.1
github.com/blevesearch/bleve/v2 v2.4.4
github.com/dgraph-io/badger/v4 v4.6.0
github.com/dgraph-io/dgo/v240 v240.1.1-0.20250324210355-12f8ff79cd3d
github.com/dgraph-io/dgo/v240 v240.1.1-0.20250403071431-f8296b028c14
github.com/dgraph-io/gqlgen v0.13.2
github.com/dgraph-io/gqlparser/v2 v2.2.2
github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15
Expand Down Expand Up @@ -44,24 +44,24 @@ require (
github.com/spf13/cast v1.7.1
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6
github.com/spf13/viper v1.20.0
github.com/spf13/viper v1.20.1
github.com/stretchr/testify v1.10.0
github.com/twpayne/go-geom v1.6.0
github.com/viterin/vek v0.4.2
github.com/xdg/scram v1.0.5
go.etcd.io/etcd/raft/v3 v3.5.20
go.etcd.io/etcd/raft/v3 v3.5.21
go.opencensus.io v0.24.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.36.0
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
golang.org/x/mod v0.24.0
golang.org/x/net v0.37.0
golang.org/x/net v0.38.0
golang.org/x/sync v0.12.0
golang.org/x/sys v0.31.0
golang.org/x/term v0.30.0
golang.org/x/text v0.23.0
golang.org/x/tools v0.31.0
google.golang.org/grpc v1.71.0
google.golang.org/grpc v1.71.1
google.golang.org/protobuf v1.36.6
gopkg.in/yaml.v3 v3.0.1
)
Expand Down
24 changes: 12 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ=
github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI=
github.com/dgraph-io/dgo/v240 v240.1.1-0.20250324210355-12f8ff79cd3d h1:sq4YzJo70kL0TA+Tq6sjM+3tQyxuMEYm+Qfz1x7ScSI=
github.com/dgraph-io/dgo/v240 v240.1.1-0.20250324210355-12f8ff79cd3d/go.mod h1:CyEuwJgQ8NoNjWbj2ZnvVFPixe5akCbWPR1O0fHpQ+U=
github.com/dgraph-io/dgo/v240 v240.1.1-0.20250403071431-f8296b028c14 h1:juO1dROmkoBY2WV3HD2xman/f5s0VGVs4GzG7ZXuQ1o=
github.com/dgraph-io/dgo/v240 v240.1.1-0.20250403071431-f8296b028c14/go.mod h1:r0vwLSNewHs8ngmn5xeLPBRnutzzTN1H/Gvb+A3cgS8=
github.com/dgraph-io/gqlgen v0.13.2 h1:TNhndk+eHKj5qE7BenKKSYdSIdOGhLqxR1rCiMso9KM=
github.com/dgraph-io/gqlgen v0.13.2/go.mod h1:iCOrOv9lngN7KAo+jMgvUPVDlYHdf7qDwsTkQby2Sis=
github.com/dgraph-io/gqlparser/v2 v2.1.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU=
Expand Down Expand Up @@ -540,8 +540,8 @@ github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.20.0 h1:zrxIyR3RQIOsarIrgL8+sAvALXul9jeEPa06Y0Ph6vY=
github.com/spf13/viper v1.20.0/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
Expand Down Expand Up @@ -587,10 +587,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.etcd.io/etcd/client/pkg/v3 v3.5.20 h1:sZIAtra+xCo56gdf6BR62to/hiie5Bwl7hQIqMzVTEM=
go.etcd.io/etcd/client/pkg/v3 v3.5.20/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0=
go.etcd.io/etcd/raft/v3 v3.5.20 h1:8Y20WH1z8PxOV2OD7Ufge30wKySXQ0sEnNrBPNp9viU=
go.etcd.io/etcd/raft/v3 v3.5.20/go.mod h1:1sx0UxxQ+skIYgLwFJprFZm2LActM4HNWTqjzpLU7Vk=
go.etcd.io/etcd/client/pkg/v3 v3.5.21 h1:lPBu71Y7osQmzlflM9OfeIV2JlmpBjqBNlLtcoBqUTc=
go.etcd.io/etcd/client/pkg/v3 v3.5.21/go.mod h1:BgqT/IXPjK9NkeSDjbzwsHySX3yIle2+ndz28nVsjUs=
go.etcd.io/etcd/raft/v3 v3.5.21 h1:dOmE0mT55dIUsX77TKBLq+RgyumsQuYeiRQnW/ylugk=
go.etcd.io/etcd/raft/v3 v3.5.21/go.mod h1:fmcuY5R2SNkklU4+fKVBQi2biVp5vafMrWUEj4TJ4Cs=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
Expand Down Expand Up @@ -717,8 +717,8 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -942,8 +942,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
Expand Down