Merge branch 'main' into matthewmcneely/update-changelog-for-ngram

Author: Harshil Goel

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

@@ -25,7 +25,7 @@ permissions:
 jobs:
   dgraph-core-tests:
     if: github.event.pull_request.draft == false
-    runs-on: warp-ubuntu-latest-x64-4x
+    runs-on: warp-ubuntu-latest-x64-16x
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v5

acl/acl_curl_test.go

@@ -49,7 +49,7 @@ func (asuite *AclTestSuite) TestCurlAuthorization() {
 		return []string{"-H", fmt.Sprintf("X-Dgraph-AccessToken:%s", jwt),
 			"--ipv4",
 			"-H", "Content-Type: application/dql",
-			"-d", query, testutil.SockAddrHttp + "/query"}
+			"-d", query, testutil.GetSockAddrHttp() + "/query"}
 	}
 	testutil.VerifyCurlCmd(t, queryArgs(hc.AccessJwt), &testutil.CurlFailureConfig{
 		ShouldFail: false,
@@ -60,7 +60,7 @@ func (asuite *AclTestSuite) TestCurlAuthorization() {
 			"-H", "Content-Type: application/rdf",
 			"-d", fmt.Sprintf(`{ set {
 	   _:a <%s>  "string" .
-	   }}`, predicateToWrite), testutil.SockAddrHttp + "/mutate"}
+	   }}`, predicateToWrite), testutil.GetSockAddrHttp() + "/mutate"}
 
 	}
 
@@ -71,7 +71,7 @@ func (asuite *AclTestSuite) TestCurlAuthorization() {
 
 	alterArgs := func(jwt string) []string {
 		return []string{"-H", fmt.Sprintf("X-Dgraph-AccessToken:%s", jwt),
-			"-d", fmt.Sprintf(`%s: int .`, predicateToAlter), testutil.SockAddrHttp + "/alter"}
+			"-d", fmt.Sprintf(`%s: int .`, predicateToAlter), testutil.GetSockAddrHttp() + "/alter"}
 	}
 	testutil.VerifyCurlCmd(t, alterArgs(hc.AccessJwt), &testutil.CurlFailureConfig{
 		ShouldFail:   true,

check_upgrade/check_upgrade_test.go

@@ -10,9 +10,11 @@ package checkupgrade
 import (
 	"context"
 	"fmt"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"runtime"
 	"testing"
 	"time"
 
@@ -26,6 +28,11 @@ import (
 )
 
 func TestCheckUpgrade(t *testing.T) {
+	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
+		fmt.Println("Skipping live load-uids tests on non-Linux platforms due to dgraph binary dependency")
+		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
+		os.Exit(0)
+	}
 	conf := dgraphtest.NewClusterConfig().WithNumAlphas(1).WithNumZeros(1).WithReplicas(1).
 		WithACL(time.Hour).WithVersion("57aa5c4ac")
 	c, err := dgraphtest.NewLocalCluster(conf)

dgraph/cmd/dgraphimport/import_test.go

@@ -10,7 +10,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"testing"
@@ -301,6 +303,10 @@ func runImportTest(t *testing.T, tt testcase) {
 
 // setupBulkCluster creates and configures a cluster for bulk loading data
 func setupBulkCluster(t *testing.T, numAlphas int, encrypted bool) (*dgraphtest.LocalCluster, string) {
+	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
+		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
+		t.Skip("Skipping test on non-Linux platforms due to dgraph binary dependency")
+	}
 	baseDir := t.TempDir()
 	bulkConf := dgraphtest.NewClusterConfig().
 		WithNumAlphas(numAlphas).

dgraph/cmd/increment/increment_test.go

@@ -124,7 +124,7 @@ func readBestEffort(t *testing.T, dg *dgo.Dgraph, pred string, M int) {
 }
 
 func setup(t *testing.T) *dgo.Dgraph {
-	dg, err := testutil.DgraphClientWithGroot(testutil.SockAddr)
+	dg, err := testutil.DgraphClientWithGroot(testutil.GetSockAddr())
 	if err != nil {
 		t.Fatalf("Error while getting a dgraph client: %v", err)
 	}

dgraph/cmd/live/load-json/load_test.go

@@ -9,6 +9,7 @@ package live
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -22,7 +23,7 @@ import (
 	"github.com/hypermodeinc/dgraph/v25/x"
 )
 
-var alphaService = testutil.SockAddr
+var alphaService = testutil.GetSockAddr()
 
 var (
 	testDataDir string
@@ -161,11 +162,17 @@ func TestLiveLoadJSONMultipleFiles(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
+	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
+		fmt.Println("Skipping live load-json tests on non-Linux platforms due to dgraph binary dependency")
+		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
+		os.Exit(0)
+	}
+
 	_, thisFile, _, _ := runtime.Caller(0)
 	testDataDir = filepath.Dir(thisFile)
 
 	var err error
-	dg, err = testutil.DgraphClientWithGroot(testutil.SockAddr)
+	dg, err = testutil.DgraphClientWithGroot(testutil.GetSockAddr())
 	x.Panic(err)
 
 	// Try to create any files in a dedicated temp directory that gets cleaned up

dgraph/cmd/live/load-uids/load_test.go

@@ -251,7 +251,7 @@ func TestLiveLoadExportedSchema(t *testing.T) {
 			  }
 			}`,
 	}
-	token := testutil.GrootHttpLogin("http://" + testutil.SockAddrHttp + "/admin")
+	token := testutil.GrootHttpLogin("http://" + testutil.GetSockAddrHttp() + "/admin")
 	resp := testutil.MakeGQLRequestWithAccessJwt(t, params, token.AccessJwt)
 	require.Nilf(t, resp.Errors, resp.Errors.Error())
 
@@ -351,8 +351,14 @@ func TestLiveLoadFileNameMultipleCorrect(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
+	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
+		fmt.Println("Skipping live load-uids tests on non-Linux platforms due to dgraph binary dependency")
+		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
+		os.Exit(0)
+	}
+
+	alphaService = testutil.GetSockAddr()
 	alphaName = testutil.Instance
-	alphaService = testutil.SockAddr
 
 	x.AssertTrue(strings.Count(alphaName, "_") == 2)
 	left := strings.Index(alphaName, "_")
@@ -365,7 +371,7 @@ func TestMain(m *testing.M) {
 	fmt.Printf("Using test data dir: %s\n", testDataDir)
 
 	var err error
-	dg, err = testutil.DgraphClientWithGroot(testutil.SockAddr)
+	dg, err = testutil.DgraphClientWithGroot(testutil.GetSockAddr())
 	if err != nil {
 		log.Fatalf("Error while getting a dgraph client: %v", err)
 	}

dgraph/cmd/version/version_test.go

@@ -6,8 +6,10 @@
 package version
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -16,6 +18,15 @@ import (
 )
 
 // Test `dgraph version` with an empty config file.
+func TestMain(m *testing.M) {
+	if runtime.GOOS != "linux" && os.Getenv("DGRAPH_BINARY") == "" {
+		fmt.Println("Skipping version tests on non-Linux platforms due to dgraph binary dependency")
+		fmt.Println("You can set the DGRAPH_BINARY environment variable to path of a native dgraph binary to run these tests")
+		os.Exit(0)
+	}
+	m.Run()
+}
+
 func TestDgraphVersion(t *testing.T) {
 	tmpPath := t.TempDir()
 	configPath := filepath.Join(tmpPath, "config.yml")

dgraph/cmd/zero/zero_test.go

@@ -41,7 +41,7 @@ func TestRemoveNode(t *testing.T) {
 
 func TestIdLeaseOverflow(t *testing.T) {
 	dialOpts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
-	con, err := grpc.NewClient(testutil.SockAddrZero, dialOpts...)
+	con, err := grpc.NewClient(testutil.GetSockAddrZero(), dialOpts...)
 	require.NoError(t, err)
 	zc := pb.NewZeroClient(con)
 
@@ -55,7 +55,7 @@ func TestIdLeaseOverflow(t *testing.T) {
 
 func TestIdBump(t *testing.T) {
 	dialOpts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
-	con, err := grpc.NewClient(testutil.SockAddrZero, dialOpts...)
+	con, err := grpc.NewClient(testutil.GetSockAddrZero(), dialOpts...)
 	require.NoError(t, err)
 	zc := pb.NewZeroClient(con)
 

dgraph/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       service: zero
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
     command:
@@ -32,7 +32,7 @@ services:
       service: zero
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
     command:
@@ -52,7 +52,7 @@ services:
       service: zero
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
     command:
@@ -64,7 +64,7 @@ services:
     working_dir: /data/alpha1
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
       - type: bind
@@ -95,7 +95,7 @@ services:
       - alpha1
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
       - type: bind
@@ -126,7 +126,7 @@ services:
       - alpha2
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
       - type: bind
@@ -157,7 +157,7 @@ services:
       - alpha3
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
       - type: bind
@@ -188,7 +188,7 @@ services:
       - alpha4
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
       - type: bind
@@ -219,7 +219,7 @@ services:
       - alpha5
     volumes:
       - type: bind
-        source: $GOPATH/bin
+        source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
         target: /gobin
         read_only: true
       - type: bind