Skip to content

Commit 436b55f

Browse files
chore: resolve merge of main into mutation-pipeline branch
Mechanical fixes after merging current main: - Update stale `hypermodeinc/dgraph` import paths to `dgraph-io/dgraph` in posting/lists.go and worker/sort_test.go. - Fix posting/mvcc_test.go TestRegression9597 (added on main) — the branch refactored LocalCache.deltas from a map to a *Deltas wrapping a sharded map, so direct map indexing no longer compiles. Use Deltas.AddToDeltas() instead. - Bring types/locked_sharded_map.go license header into the project's standard format. - Doc fix in TESTING.md (stray hypermodeinc reference). No behavior change. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent b0c4645 commit 436b55f

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

TESTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ programmatic control over local Dgraph clusters. Most newer integration2 and upg
8787

8888
## Module Structure
8989

90-
The main module is `github.com/hypermodeinc/dgraph`
90+
The main module is `github.com/dgraph-io/dgraph`
9191

9292
The codebase is organized into several key packages:
9393

posting/lists.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@ import (
1919
"github.com/dgraph-io/badger/v4"
2020
"github.com/dgraph-io/dgo/v250/protos/api"
2121
"github.com/dgraph-io/dgraph/v25/protos/pb"
22+
"github.com/dgraph-io/dgraph/v25/types"
2223
"github.com/dgraph-io/dgraph/v25/x"
2324
"github.com/dgraph-io/ristretto/v2/z"
24-
"github.com/hypermodeinc/dgraph/v25/protos/pb"
25-
"github.com/hypermodeinc/dgraph/v25/types"
26-
"github.com/hypermodeinc/dgraph/v25/x"
2725
)
2826

2927
const (

posting/mvcc_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func TestCacheStaleWhenMaxTsLessThanReadTs(t *testing.T) {
214214
require.NoError(t, err)
215215

216216
txn1 := Oracle().RegisterStartTs(5)
217-
txn1.cache.deltas[string(key)] = delta1
217+
txn1.cache.deltas.AddToDeltas(string(key), delta1)
218218

219219
writer1 := NewTxnWriter(pstore)
220220
require.NoError(t, txn1.CommitToDisk(writer1, 10))
@@ -247,7 +247,7 @@ func TestCacheStaleWhenMaxTsLessThanReadTs(t *testing.T) {
247247
require.NoError(t, err)
248248

249249
txn2 := Oracle().RegisterStartTs(15)
250-
txn2.cache.deltas[string(key)] = delta2
250+
txn2.cache.deltas.AddToDeltas(string(key), delta2)
251251

252252
writer2 := NewTxnWriter(pstore)
253253
require.NoError(t, txn2.CommitToDisk(writer2, 20))

types/locked_sharded_map.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
// SPDX-FileCopyrightText: © Hypermode Inc. <hello@hypermode.com>
2-
// SPDX-License-Identifier: Apache-2.0
1+
/*
2+
* SPDX-FileCopyrightText: © 2017-2025 Istari Digital, Inc.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
35

46
// Package types contains some very common utilities used by Dgraph. These utilities
57
// are of "miscellaneous" nature, e.g., error checking.

worker/sort_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import (
1616

1717
"github.com/dgraph-io/badger/v4"
1818
bpb "github.com/dgraph-io/badger/v4/pb"
19-
"github.com/hypermodeinc/dgraph/v25/posting"
20-
"github.com/hypermodeinc/dgraph/v25/protos/pb"
21-
"github.com/hypermodeinc/dgraph/v25/schema"
22-
"github.com/hypermodeinc/dgraph/v25/tok"
23-
"github.com/hypermodeinc/dgraph/v25/types"
24-
"github.com/hypermodeinc/dgraph/v25/x"
19+
"github.com/dgraph-io/dgraph/v25/posting"
20+
"github.com/dgraph-io/dgraph/v25/protos/pb"
21+
"github.com/dgraph-io/dgraph/v25/schema"
22+
"github.com/dgraph-io/dgraph/v25/tok"
23+
"github.com/dgraph-io/dgraph/v25/types"
24+
"github.com/dgraph-io/dgraph/v25/x"
2525
"github.com/pkg/errors"
2626
"github.com/stretchr/testify/require"
2727
)

0 commit comments

Comments
 (0)