mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-26 03:30:09 -05:00
Code Issues Packages Projects Releases 158 Wiki Activity

/go/store/blobstore: pr feedback

Browse Source
This commit is contained in:
coffeegoddd☕️✨
2026-02-16 15:49:47 -08:00
parent fdbe952f4a
commit 481633d9fd
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/store/blobstore/git_blobstore.go
+5 -1
View File
@@ -638,7 +638,11 @@ func (gbs *GitBlobstore) remoteManagedWrite(ctx context.Context, key, msg string
gbs.mergeCacheObjectLocked(key, keyOID, keyType, true)
parent, base := splitGitPathParentBase(key)
if base != "" {
child := git.TreeEntry{Mode: "100644", Type: keyType, OID: keyOID, Name: base}
mode := "100644"
if keyType == git.ObjectTypeTree {
mode = "040000"
}
child := git.TreeEntry{Mode: mode, Type: keyType, OID: keyOID, Name: base}
gbs.mergeCacheChildLocked(parent, child, true)
}
gbs.cacheMu.Unlock()
go/store/blobstore/git_blobstore_test.go
+54
View File
@@ -195,6 +195,60 @@ func TestGitBlobstore_RemoteAndLocalRefNaming_ConfigurableRemoteRef(t *testing.T
require.True(t, strings.HasPrefix(bs.localRef, "refs/dolt/blobstore/origin/heads/alt/"))
}
func TestGitBlobstore_TwoInstances_IndependentTrackingRefs(t *testing.T) {
requireGitOnPath(t)
ctx := context.Background()
remoteRepo, err := gitrepo.InitBare(ctx, t.TempDir()+"/remote.git")
require.NoError(t, err)
_, err = remoteRepo.SetRefToTree(ctx, DoltDataRef, map[string][]byte{
"manifest": []byte("v1\n"),
}, "seed")
require.NoError(t, err)
localRepo, err := gitrepo.InitBare(ctx, t.TempDir()+"/local.git")
require.NoError(t, err)
localRunner, err := git.NewRunner(localRepo.GitDir)
require.NoError(t, err)
_, err = localRunner.Run(ctx, git.RunOptions{}, "remote", "add", "origin", remoteRepo.GitDir)
require.NoError(t, err)
opts := GitBlobstoreOptions{RemoteName: "origin"}
bs1, err := NewGitBlobstoreWithOptions(localRepo.GitDir, DoltDataRef, opts)
require.NoError(t, err)
bs2, err := NewGitBlobstoreWithOptions(localRepo.GitDir, DoltDataRef, opts)
require.NoError(t, err)
// The two instances must have distinct tracking and local refs.
require.NotEqual(t, bs1.remoteTrackingRef, bs2.remoteTrackingRef)
require.NotEqual(t, bs1.localRef, bs2.localRef)
// Both instances can fetch independently without interfering.
ok1, err := bs1.Exists(ctx, "manifest")
require.NoError(t, err)
require.True(t, ok1)
ok2, err := bs2.Exists(ctx, "manifest")
require.NoError(t, err)
require.True(t, ok2)
// Verify each instance wrote to its own tracking ref.
localAPI := git.NewGitAPIImpl(localRunner)
head1, err := localAPI.ResolveRefCommit(ctx, bs1.remoteTrackingRef)
require.NoError(t, err)
head2, err := localAPI.ResolveRefCommit(ctx, bs2.remoteTrackingRef)
require.NoError(t, err)
require.Equal(t, head1, head2, "both should track the same remote commit")
// Verify local refs are also distinct and valid.
local1, err := localAPI.ResolveRefCommit(ctx, bs1.localRef)
require.NoError(t, err)
local2, err := localAPI.ResolveRefCommit(ctx, bs2.localRef)
require.NoError(t, err)
require.Equal(t, local1, local2, "both should point at the same commit")
}
func TestGitBlobstore_CleanupOwnedLocalRef_DeletesRef(t *testing.T) {
requireGitOnPath(t)