mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-23 21:59:01 -05:00
Code Issues Packages Projects Releases 157 Wiki Activity

/go/store/{nbs,blobstore}: overwrite cache during check and put

Browse Source
This commit is contained in:
coffeegoddd☕️✨
2026-02-10 15:35:36 -08:00
parent 60a8819169
commit 6953aac280
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/store/blobstore/git_blobstore.go
+15 -4
View File
@@ -413,6 +413,14 @@ func (gbs *GitBlobstore) sortCacheChildrenLocked(dirs map[string]struct{}) {
}
func (gbs *GitBlobstore) mergeCacheFromHead(ctx context.Context, head git.OID) error {
return gbs.mergeCacheFromHeadWithOverwrite(ctx, head, false)
}
func (gbs *GitBlobstore) mergeCacheFromHeadOverwriteAll(ctx context.Context, head git.OID) error {
return gbs.mergeCacheFromHeadWithOverwrite(ctx, head, true)
}
func (gbs *GitBlobstore) mergeCacheFromHeadWithOverwrite(ctx context.Context, head git.OID, overwriteAll bool) error {
if head == "" {
return fmt.Errorf("gitblobstore: cannot merge cache for empty head")
}
@@ -453,16 +461,17 @@ func (gbs *GitBlobstore) mergeCacheFromHead(ctx context.Context, head git.OID) e
}
isManifest := e.Name == gitblobstoreManifestKey
gbs.mergeCacheObjectLocked(e.Name, e.OID, e.Type, isManifest)
overwrite := overwriteAll || isManifest
gbs.mergeCacheObjectLocked(e.Name, e.OID, e.Type, overwrite)
// Merge parent -> child membership (ensure presence; update only for manifest).
// Merge parent -> child membership (ensure presence; overwrite on demand).
parent, base := splitGitPathParentBase(e.Name)
if base == "" {
continue
}
child := git.TreeEntry{Mode: e.Mode, Type: e.Type, OID: e.OID, Name: base}
if gbs.mergeCacheChildLocked(parent, child, isManifest) {
if gbs.mergeCacheChildLocked(parent, child, overwrite) {
touchedDirs[parent] = struct{}{}
}
}
@@ -581,7 +590,9 @@ func (gbs *GitBlobstore) remoteManagedWrite(ctx context.Context, key, msg string
}
// 5) Merge cache to reflect the new head after a successful push.
if err := gbs.mergeCacheFromHead(ctx, newCommit); err != nil {
// When we successfully push a new head, it is safe (and required for correctness)
// to overwrite cache entries to reflect the new head's tree.
if err := gbs.mergeCacheFromHeadOverwriteAll(ctx, newCommit); err != nil {
return backoff.Permanent(err)
}
go/store/nbs/store.go
+11
View File
@@ -620,6 +620,17 @@ func NewOCISStore(ctx context.Context, nbfVerStr string, bucketName, path string
return NewNoConjoinBSStore(ctx, nbfVerStr, bs, memTableSize, q)
}
// NewGitStore returns an nbs implementation backed by a GitBlobstore.
func NewGitStore(ctx context.Context, nbfVerStr string, gitDir string, ref string, opts blobstore.GitBlobstoreOptions, memTableSize uint64, q MemoryQuotaProvider) (*NomsBlockStore, error) {
cacheOnce.Do(makeGlobalCaches)
bs, err := blobstore.NewGitBlobstoreWithOptions(gitDir, ref, opts)
if err != nil {
return nil, err
}
return NewBSStore(ctx, nbfVerStr, bs, memTableSize, q)
}
// NewBSStore returns an nbs implementation backed by a Blobstore
func NewBSStore(ctx context.Context, nbfVerStr string, bs blobstore.Blobstore, memTableSize uint64, q MemoryQuotaProvider) (*NomsBlockStore, error) {
cacheOnce.Do(makeGlobalCaches)