Merge branch 'main' into aman/gomod

hypermodeinc · Jan 27, 2025 · c11f4f8 · c11f4f8
2 parents 3a5b173 + a0d027d
commit c11f4f8
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 19 deletions.
diff --git a/.github/workflows/ci-dgraph-code-coverage.yml b/.github/workflows/ci-dgraph-code-coverage.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     branches:
       - main
       - release/**

diff --git a/.github/workflows/ci-dgraph-core-tests.yml b/.github/workflows/ci-dgraph-core-tests.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-core-upgrade-tests.yml b/.github/workflows/ci-dgraph-core-upgrade-tests.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-fuzz.yml b/.github/workflows/ci-dgraph-fuzz.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-integration2-tests.yml b/.github/workflows/ci-dgraph-integration2-tests.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-ldbc-tests.yml b/.github/workflows/ci-dgraph-ldbc-tests.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-load-tests.yml b/.github/workflows/ci-dgraph-load-tests.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-oss-build.yml b/.github/workflows/ci-dgraph-oss-build.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-system-upgrade-tests.yml b/.github/workflows/ci-dgraph-system-upgrade-tests.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-systest-tests.yml b/.github/workflows/ci-dgraph-systest-tests.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-tests-arm64.yml b/.github/workflows/ci-dgraph-tests-arm64.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.github/workflows/ci-dgraph-vector-tests.yml b/.github/workflows/ci-dgraph-vector-tests.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "**/*.go"
       - "**/go.mod"
+      - "**/*.yml"
+      - "**/Dockerfile"
+      - "**/Makefile"
     types:
       - opened
       - reopened

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -2,7 +2,7 @@
 # To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
 version: 0.1
 cli:
-  version: 1.22.8
+  version: 1.22.9
 
 # Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
 plugins:
@@ -25,8 +25,8 @@ lint:
       paths:
         - contrib/**
   enabled:
-    - [email protected].6
-    - [email protected].351
+    - [email protected].7
+    - [email protected].353
     - [email protected]
     - git-diff-check
     - [email protected]
@@ -36,11 +36,11 @@ lint:
     - [email protected]
     - [email protected]
     - [email protected]
-    - renovate@39.92.0
+    - renovate@39.119.0
     - [email protected]
     - [email protected]
-    - tflint@0.54.0
-    - [email protected].1
+    - tflint@0.55.0
+    - [email protected].2
     - [email protected]
 actions:
   enabled:

diff --git a/graphql/e2e/custom_logic/cmd/Dockerfile b/graphql/e2e/custom_logic/cmd/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine
+FROM golang:1.23-alpine
 
 COPY . /go/src/cmd/
 

diff --git a/ocagent/docker-compose.yml b/ocagent/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       --raft="idx=1" --my=zero1:5180 --replicas=3 --logtostderr -v=2 --bindall --trace
       "jaeger=http://ocagent:14268;"
   ocagent:
-    image: omnition/opencensus-agent:0.1.6
+    image: omnition/opencensus-agent:0.1.11
     container_name: ocagent
     labels:
       cluster: test

diff --git a/posting/mvcc.go b/posting/mvcc.go
@@ -347,9 +347,9 @@ func RemoveCacheFor(key []byte) {
 type Cache struct {
 	data *ristretto.Cache[[]byte, *CachePL]
 
-	numCacheRead      int
-	numCacheReadFails int
-	numCacheSave      int
+	numCacheRead      int64
+	numCacheReadFails int64
+	numCacheSave      int64
 }
 
 func (c *Cache) wait() {
@@ -365,13 +365,14 @@ func (c *Cache) get(key []byte) (*CachePL, bool) {
 	}
 	val, ok := c.data.Get(key)
 	if !ok {
-		c.numCacheReadFails += 1
+		atomic.AddInt64(&c.numCacheReadFails, 1)
 		return val, ok
 	}
 	if val.list == nil {
-		c.numCacheReadFails += 1
+		atomic.AddInt64(&c.numCacheReadFails, 1)
 		return nil, false
 	}
+	atomic.AddInt64(&c.numCacheRead, 1)
 	c.numCacheRead += 1
 	return val, true
 }
@@ -407,7 +408,7 @@ type MemoryLayer struct {
 
 	// metrics
 	statsHolder  *StatsHolder
-	numDisksRead int
+	numDisksRead int64
 }
 
 func (ml *MemoryLayer) clear() {
@@ -656,7 +657,7 @@ func (ml *MemoryLayer) readFromCache(key []byte, readTs uint64) *List {
 }
 
 func (ml *MemoryLayer) readFromDisk(key []byte, pstore *badger.DB, readTs uint64) (*List, error) {
-	ml.numDisksRead += 1
+	atomic.AddInt64(&ml.numDisksRead, 1)
 	txn := pstore.NewTransactionAt(readTs, false)
 	defer txn.Discard()
 

diff --git a/worker/docker-compose.yml b/worker/docker-compose.yml
@@ -111,7 +111,7 @@ services:
       --logtostderr -v=2 --raft "idx=6; group=2; snapshot-after-entries=100;
       snapshot-after-duration=1m" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;"
   jaeger:
-    image: jaegertracing/all-in-one:1.18
+    image: jaegertracing/all-in-one:1.60
     working_dir: /working/jaeger
     environment:
       - SPAN_STORAGE_TYPE=badger

diff --git a/x/x.go b/x/x.go
@@ -38,7 +38,6 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
-	"syscall"
 	"time"
 
 	"github.com/dustin/go-humanize"
@@ -1117,7 +1116,7 @@ func AskUserPassword(userid string, pwdType string, times int) (string, error) {
 	AssertTrue(pwdType == "Current" || pwdType == "New")
 	// ask for the user's password
 	fmt.Printf("%s password for %v:", pwdType, userid)
-	pd, err := term.ReadPassword(syscall.Stdin)
+	pd, err := term.ReadPassword(int(os.Stdin.Fd()))
 	if err != nil {
 		return "", errors.Wrapf(err, "while reading password")
 	}
@@ -1126,7 +1125,7 @@ func AskUserPassword(userid string, pwdType string, times int) (string, error) {
 
 	if times == 2 {
 		fmt.Printf("Retype %s password for %v:", strings.ToLower(pwdType), userid)
-		pd2, err := term.ReadPassword(syscall.Stdin)
+		pd2, err := term.ReadPassword(int(os.Stdin.Fd()))
 		if err != nil {
 			return "", errors.Wrapf(err, "while reading password")
 		}