mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-01 00:59:14 -06:00
Code Issues Packages Projects Releases 139 Wiki Activity

/go/store/blobstore: fix chunk width

Browse Source
This commit is contained in:
coffeegoddd☕️✨
2026-02-09 16:00:51 -08:00
parent 92128656de
commit e971d39a38
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
go/store/blobstore/git_blobstore.go
View File

@@ -34,7 +34,7 @@ import (
gitrebase "github.com/dolthub/dolt/go/store/blobstore/internal/gitrebase"
)
const gitblobstorePartNameWidth = 8 // "00000001"
const gitblobstorePartNameWidth = 4 // "0001"
type chunkPartRef struct {
oidHex string
@@ -54,7 +54,7 @@ type treeWrite struct {
type putPlan struct {
writes []treeWrite
// If true, the key should be represented as a tree (chunked parts under key/NNNNNNNN).
// If true, the key should be represented as a tree (chunked parts under key/NNNN).
chunked bool
}
@@ -600,10 +600,9 @@ func (gbs *GitBlobstore) validateAndSizeChunkedParts(ctx context.Context, entrie
return nil, 0, fmt.Errorf("gitblobstore: chunked tree has no parts")
}
width := len(entries[0].Name)
// First pass: validate names + types, and determine width.
if width < 4 {
return nil, 0, fmt.Errorf("gitblobstore: invalid part name %q (expected at least 4 digits)", entries[0].Name)
// GitBlobstore chunked trees use fixed-width 4-digit part names: 0001, 0002, ...
if len(entries[0].Name) != gitblobstorePartNameWidth {
return nil, 0, fmt.Errorf("gitblobstore: invalid part name %q (expected width %d)", entries[0].Name, gitblobstorePartNameWidth)
}
parts := make([]chunkPartRef, 0, len(entries))
@@ -612,18 +611,18 @@ func (gbs *GitBlobstore) validateAndSizeChunkedParts(ctx context.Context, entrie
if e.Type != git.ObjectTypeBlob {
return nil, 0, fmt.Errorf("gitblobstore: invalid part %q: expected blob, got %q", e.Name, e.Type)
}
if len(e.Name) != width {
return nil, 0, fmt.Errorf("gitblobstore: invalid part name %q (expected width %d)", e.Name, width)
if len(e.Name) != gitblobstorePartNameWidth {
return nil, 0, fmt.Errorf("gitblobstore: invalid part name %q (expected width %d)", e.Name, gitblobstorePartNameWidth)
}
n, err := strconv.Atoi(e.Name)
if err != nil {
return nil, 0, fmt.Errorf("gitblobstore: invalid part name %q (expected digits): %w", e.Name, err)
}
if n != i+1 {
want := fmt.Sprintf("%0*d", width, i+1)
want := fmt.Sprintf("%0*d", gitblobstorePartNameWidth, i+1)
return nil, 0, fmt.Errorf("gitblobstore: invalid part name %q (expected %q)", e.Name, want)
}
if want := fmt.Sprintf("%0*d", width, n); want != e.Name {
if want := fmt.Sprintf("%0*d", gitblobstorePartNameWidth, n); want != e.Name {
return nil, 0, fmt.Errorf("gitblobstore: invalid part name %q (expected %q)", e.Name, want)
}

4
go/store/blobstore/git_blobstore_chunked_put_test.go
View File

@@ -62,8 +62,8 @@ func TestGitBlobstore_Put_ChunkedWritesTreeParts(t *testing.T) {
entries, err := api.ListTree(ctx, head, "big")
require.NoError(t, err)
require.Len(t, entries, 4)
require.Equal(t, "00000001", entries[0].Name)
require.Equal(t, "00000004", entries[3].Name)
require.Equal(t, "0001", entries[0].Name)
require.Equal(t, "0004", entries[3].Name)
}
func TestGitBlobstore_Put_IdempotentDoesNotChangeExistingRepresentation(t *testing.T) {

2
go/store/blobstore/git_blobstore_test.go
View File

@@ -537,7 +537,7 @@ func TestGitBlobstore_Concatenate_ChunkedResult(t *testing.T) {
parts, err := bs.api.ListTree(ctx, head, "c")
require.NoError(t, err)
require.GreaterOrEqual(t, len(parts), 2)
require.Equal(t, "00000001", parts[0].Name)
require.Equal(t, "0001", parts[0].Name)
got, ver2, err := GetBytes(ctx, bs, "c", AllRange)
require.NoError(t, err)