Skip to content

Commit d2b63c1

Browse files
mxyngmxyng
authored
fs(ggml): fill in arch prefix if necessary (ollama#12646)
1 parent 94f110b commit d2b63c1

File tree

6 files changed

+82
-54
lines changed

6 files changed

+82
-54
lines changed

‎convert/convert_test.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"strings"
1919
"testing"
2020

21+
"github.com/google/go-cmp/cmp"
2122
"github.com/ollama/ollama/fs/ggml"
2223
)
2324

@@ -339,13 +340,8 @@ func TestConvertAdapter(t *testing.T) {
339340
}
340341

341342
actual := generateResultsJSON(t, r, m.KV(), m.Tensors())
342-
343-
for _, k := range slices.Sorted(maps.Keys(c.Expected)) {
344-
if v, ok := actual[k]; !ok {
345-
t.Errorf("missing %s", k)
346-
} else if v != c.Expected[k] {
347-
t.Errorf("unexpected %s: want %s, got %s", k, c.Expected[k], v)
348-
}
343+
if diff := cmp.Diff(c.Expected, actual); diff != "" {
344+
t.Errorf("mismatch (-want +got):\n%s", diff)
349345
}
350346
})
351347
}

‎fs/ggml/gguf.go‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,10 @@ func writeGGUFArray[S ~[]E, E any](w io.Writer, t uint32, s S) error {
509509
}
510510

511511
func WriteGGUF(f *os.File, kv KV, ts []*Tensor) error {
512-
alignment := kv.Uint("general.alignment", 32)
512+
arch := kv.String("general.architecture")
513+
if arch == "" {
514+
return fmt.Errorf("architecture not set")
515+
}
513516

514517
if err := binary.Write(f, binary.LittleEndian, []byte("GGUF")); err != nil {
515518
return err
@@ -528,7 +531,7 @@ func WriteGGUF(f *os.File, kv KV, ts []*Tensor) error {
528531
}
529532

530533
for _, key := range slices.Sorted(maps.Keys(kv)) {
531-
if err := ggufWriteKV(f, key, kv[key]); err != nil {
534+
if err := ggufWriteKV(f, arch, key, kv[key]); err != nil {
532535
return err
533536
}
534537
}
@@ -543,6 +546,8 @@ func WriteGGUF(f *os.File, kv KV, ts []*Tensor) error {
543546
},
544547
)
545548

549+
alignment := kv.Uint("general.alignment", 32)
550+
546551
var s uint64
547552
for i := range ts {
548553
ts[i].Offset = s
@@ -574,7 +579,14 @@ func WriteGGUF(f *os.File, kv KV, ts []*Tensor) error {
574579
return g.Wait()
575580
}
576581

577-
func ggufWriteKV(ws io.WriteSeeker, k string, v any) error {
582+
func ggufWriteKV(ws io.WriteSeeker, arch, k string, v any) error {
583+
if !strings.HasPrefix(k, arch+".") &&
584+
!strings.HasPrefix(k, "general.") &&
585+
!strings.HasPrefix(k, "adapter.") &&
586+
!strings.HasPrefix(k, "tokenizer.") {
587+
k = arch + "." + k
588+
}
589+
578590
slog.Debug(k, "type", fmt.Sprintf("%T", v))
579591
if err := binary.Write(ws, binary.LittleEndian, uint64(len(k))); err != nil {
580592
return err

‎fs/ggml/gguf_test.go‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ func TestWriteGGUF(t *testing.T) {
3939
defer w.Close()
4040

4141
if err := WriteGGUF(w, KV{
42-
"general.alignment": uint32(16),
42+
"general.architecture": "test",
43+
"general.alignment": uint32(16),
44+
"test.key": "value",
45+
"attention.key": "value2",
46+
"tokenizer.key": "value3",
47+
"adapter.key": "value4",
4348
}, ts); err != nil {
4449
t.Fatal(err)
4550
}
@@ -56,14 +61,19 @@ func TestWriteGGUF(t *testing.T) {
5661
}
5762

5863
if diff := cmp.Diff(KV{
64+
"general.architecture": "test",
5965
"general.alignment": uint32(16),
6066
"general.parameter_count": uint64(54),
67+
"test.key": "value",
68+
"test.attention.key": "value2",
69+
"tokenizer.key": "value3",
70+
"adapter.key": "value4",
6171
}, ff.KV()); diff != "" {
6272
t.Errorf("Mismatch (-want +got):\n%s", diff)
6373
}
6474

6575
if diff := cmp.Diff(Tensors{
66-
Offset: 592,
76+
Offset: 800,
6777
items: []*Tensor{
6878
{Name: "blk.0.attn_k.weight", Offset: 0, Shape: []uint64{2, 3}},
6979
{Name: "blk.0.attn_norm.weight", Offset: 32, Shape: []uint64{2, 3}},

‎parser/parser_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"errors"
88
"fmt"
99
"io"
10+
"maps"
1011
"os"
1112
"strings"
1213
"testing"
@@ -799,7 +800,10 @@ func createBinFile(t *testing.T, kv map[string]any, ti []*ggml.Tensor) (string,
799800
}
800801
defer f.Close()
801802

802-
if err := ggml.WriteGGUF(f, kv, ti); err != nil {
803+
base := map[string]any{"general.architecture": "test"}
804+
maps.Copy(base, kv)
805+
806+
if err := ggml.WriteGGUF(f, base, ti); err != nil {
803807
t.Fatal(err)
804808
}
805809
// Calculate sha256 of file

‎server/routes_create_test.go‎

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"encoding/json"
88
"fmt"
99
"io"
10+
"maps"
1011
"net/http"
1112
"net/http/httptest"
1213
"os"
@@ -17,6 +18,8 @@ import (
1718
"testing"
1819

1920
"github.com/gin-gonic/gin"
21+
gocmp "github.com/google/go-cmp/cmp"
22+
gocmpopts "github.com/google/go-cmp/cmp/cmpopts"
2023

2124
"github.com/ollama/ollama/api"
2225
"github.com/ollama/ollama/envconfig"
@@ -38,7 +41,10 @@ func createBinFile(t *testing.T, kv map[string]any, ti []*ggml.Tensor) (string,
3841
}
3942
defer f.Close()
4043

41-
if err := ggml.WriteGGUF(f, kv, ti); err != nil {
44+
base := map[string]any{"general.architecture": "test"}
45+
maps.Copy(base, kv)
46+
47+
if err := ggml.WriteGGUF(f, base, ti); err != nil {
4248
t.Fatal(err)
4349
}
4450
// Calculate sha256 of file
@@ -102,8 +108,8 @@ func checkFileExists(t *testing.T, p string, expect []string) {
102108
t.Fatal(err)
103109
}
104110

105-
if !slices.Equal(actual, expect) {
106-
t.Fatalf("expected slices to be equal %v", actual)
111+
if diff := gocmp.Diff(expect, actual, gocmpopts.SortSlices(strings.Compare), gocmpopts.EquateEmpty()); diff != "" {
112+
t.Errorf("file exists mismatch (-want +got):\n%s", diff)
107113
}
108114
}
109115

@@ -133,8 +139,8 @@ func TestCreateFromBin(t *testing.T) {
133139
})
134140

135141
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
136-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
137-
filepath.Join(p, "blobs", "sha256-ca239d7bd8ea90e4a5d2e6bf88f8d74a47b14336e73eb4e18bed4dd325018116"),
142+
filepath.Join(p, "blobs", "sha256-6bcdb8859d417753645538d7bbfbd7ca91a3f0c191aef5379c53c05e86b669dd"),
143+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
138144
})
139145
}
140146

@@ -177,8 +183,8 @@ func TestCreateFromModel(t *testing.T) {
177183
})
178184

179185
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
180-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
181-
filepath.Join(p, "blobs", "sha256-ca239d7bd8ea90e4a5d2e6bf88f8d74a47b14336e73eb4e18bed4dd325018116"),
186+
filepath.Join(p, "blobs", "sha256-6bcdb8859d417753645538d7bbfbd7ca91a3f0c191aef5379c53c05e86b669dd"),
187+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
182188
})
183189
}
184190

@@ -206,9 +212,9 @@ func TestCreateRemovesLayers(t *testing.T) {
206212
})
207213

208214
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
209-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
215+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
210216
filepath.Join(p, "blobs", "sha256-b507b9c2f6ca642bffcd06665ea7c91f235fd32daeefdf875a0f938db05fb315"),
211-
filepath.Join(p, "blobs", "sha256-bc80b03733773e0728011b2f4adf34c458b400e1aad48cb28d61170f3a2ad2d6"),
217+
filepath.Join(p, "blobs", "sha256-f6e7e4b28e0b1d0c635f2d465bd248c5387c3e75b61a48c4374192b26d832a56"),
212218
})
213219

214220
w = createRequest(t, s.CreateHandler, api.CreateRequest{
@@ -227,8 +233,8 @@ func TestCreateRemovesLayers(t *testing.T) {
227233
})
228234

229235
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
230-
filepath.Join(p, "blobs", "sha256-8f2c2167d789c6b2302dff965160fa5029f6a24096d262c1cbb469f21a045382"),
231-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
236+
filepath.Join(p, "blobs", "sha256-136bf7c76bac2ec09d6617885507d37829e04b41acc47687d45e512b544e893a"),
237+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
232238
filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"),
233239
})
234240
}
@@ -257,8 +263,8 @@ func TestCreateUnsetsSystem(t *testing.T) {
257263
})
258264

259265
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
260-
filepath.Join(p, "blobs", "sha256-8585df945d1069bc78b79bd10bb73ba07fbc29b0f5479a31a601c0d12731416e"),
261-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
266+
filepath.Join(p, "blobs", "sha256-0a666d113e8e0a3d27e9c7bd136a0bdfb6241037db50729d81568451ebfdbde8"),
267+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
262268
filepath.Join(p, "blobs", "sha256-f29e82a8284dbdf5910b1555580ff60b04238b8da9d5e51159ada67a4d0d5851"),
263269
})
264270

@@ -278,8 +284,8 @@ func TestCreateUnsetsSystem(t *testing.T) {
278284
})
279285

280286
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
281-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
282-
filepath.Join(p, "blobs", "sha256-ca239d7bd8ea90e4a5d2e6bf88f8d74a47b14336e73eb4e18bed4dd325018116"),
287+
filepath.Join(p, "blobs", "sha256-6bcdb8859d417753645538d7bbfbd7ca91a3f0c191aef5379c53c05e86b669dd"),
288+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
283289
})
284290
}
285291

@@ -312,8 +318,8 @@ func TestCreateMergeParameters(t *testing.T) {
312318

313319
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
314320
filepath.Join(p, "blobs", "sha256-1d0ad71299d48c2fb7ae2b98e683643e771f8a5b72be34942af90d97a91c1e37"),
315-
filepath.Join(p, "blobs", "sha256-4a384beaf47a9cbe452dfa5ab70eea691790f3b35a832d12933a1996685bf2b6"),
316-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
321+
filepath.Join(p, "blobs", "sha256-6d6e36c1f90fc7deefc33a7300aa21ad4b67c506e33ecdeddfafa98147e60bbf"),
322+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
317323
})
318324

319325
// in order to merge parameters, the second model must be created FROM the first
@@ -354,9 +360,9 @@ func TestCreateMergeParameters(t *testing.T) {
354360

355361
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
356362
filepath.Join(p, "blobs", "sha256-1d0ad71299d48c2fb7ae2b98e683643e771f8a5b72be34942af90d97a91c1e37"),
357-
filepath.Join(p, "blobs", "sha256-4a384beaf47a9cbe452dfa5ab70eea691790f3b35a832d12933a1996685bf2b6"),
358-
filepath.Join(p, "blobs", "sha256-4cd9d4ba6b734d9b4cbd1e5caa60374c00722e993fce5e1e2d15a33698f71187"),
359-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
363+
filepath.Join(p, "blobs", "sha256-6d6e36c1f90fc7deefc33a7300aa21ad4b67c506e33ecdeddfafa98147e60bbf"),
364+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
365+
filepath.Join(p, "blobs", "sha256-bbdce269dabe013033632238b4b2d1e02fac2f97787c5e895f4da84e09cccd5d"),
360366
filepath.Join(p, "blobs", "sha256-e29a7b3c47287a2489c895d21fe413c20f859a85d20e749492f52a838e36e1ba"),
361367
})
362368

@@ -398,9 +404,9 @@ func TestCreateMergeParameters(t *testing.T) {
398404
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
399405
filepath.Join(p, "blobs", "sha256-12f58bb75cb3042d69a7e013ab87fb3c3c7088f50ddc62f0c77bd332f0d44d35"),
400406
filepath.Join(p, "blobs", "sha256-1d0ad71299d48c2fb7ae2b98e683643e771f8a5b72be34942af90d97a91c1e37"),
401-
filepath.Join(p, "blobs", "sha256-257aa726584f24970a4f240765e75a7169bfbe7f4966c1f04513d6b6c860583a"),
402-
filepath.Join(p, "blobs", "sha256-4a384beaf47a9cbe452dfa5ab70eea691790f3b35a832d12933a1996685bf2b6"),
403-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
407+
filepath.Join(p, "blobs", "sha256-6d6e36c1f90fc7deefc33a7300aa21ad4b67c506e33ecdeddfafa98147e60bbf"),
408+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
409+
filepath.Join(p, "blobs", "sha256-9443591d14be23c1e33d101934d76ad03bdb0715fe0879e8b0d1819e7bb063dd"),
404410
})
405411

406412
actual, err = os.ReadFile(filepath.Join(p, "blobs", "sha256-12f58bb75cb3042d69a7e013ab87fb3c3c7088f50ddc62f0c77bd332f0d44d35"))
@@ -456,8 +462,8 @@ func TestCreateReplacesMessages(t *testing.T) {
456462

457463
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
458464
filepath.Join(p, "blobs", "sha256-298baeaf6928a60cf666d88d64a1ba606feb43a2865687c39e40652e407bffc4"),
459-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
460-
filepath.Join(p, "blobs", "sha256-e0e27d47045063ccb167ae852c51d49a98eab33fabaee4633fdddf97213e40b5"),
465+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
466+
filepath.Join(p, "blobs", "sha256-c84aee28f2af350596f674de51d2a802ea782653ef2930a21d48bd43d5cd5317"),
461467
})
462468

463469
w = createRequest(t, s.CreateHandler, api.CreateRequest{
@@ -491,11 +497,11 @@ func TestCreateReplacesMessages(t *testing.T) {
491497

492498
// Old layers will not have been pruned
493499
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
500+
filepath.Join(p, "blobs", "sha256-09cfac3e6a637e25cb41aa85c24c110dc17ba89634de7df141b564dd2da4168b"),
494501
filepath.Join(p, "blobs", "sha256-298baeaf6928a60cf666d88d64a1ba606feb43a2865687c39e40652e407bffc4"),
495-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
502+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
496503
filepath.Join(p, "blobs", "sha256-a60ecc9da299ec7ede453f99236e5577fd125e143689b646d9f0ddc9971bf4db"),
497-
filepath.Join(p, "blobs", "sha256-e0e27d47045063ccb167ae852c51d49a98eab33fabaee4633fdddf97213e40b5"),
498-
filepath.Join(p, "blobs", "sha256-f4e2c3690efef1b4b63ba1e1b2744ffeb6a7438a0110b86596069f6d9999c80b"),
504+
filepath.Join(p, "blobs", "sha256-c84aee28f2af350596f674de51d2a802ea782653ef2930a21d48bd43d5cd5317"),
499505
})
500506

501507
type message struct {
@@ -550,9 +556,9 @@ func TestCreateTemplateSystem(t *testing.T) {
550556
})
551557

552558
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
553-
filepath.Join(p, "blobs", "sha256-2b5e330885117c82f3fd75169ea323e141070a2947c11ddb9f79ee0b01c589c1"),
559+
filepath.Join(p, "blobs", "sha256-0a04d979734167da3b80811a1874d734697f366a689f3912589b99d2e86e7ad1"),
554560
filepath.Join(p, "blobs", "sha256-4c5f51faac758fecaff8db42f0b7382891a4d0c0bb885f7b86be88c814a7cc86"),
555-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
561+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
556562
filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"),
557563
})
558564

@@ -714,8 +720,8 @@ func TestCreateLicenses(t *testing.T) {
714720

715721
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
716722
filepath.Join(p, "blobs", "sha256-2af71558e438db0b73a20beab92dc278a94e1bbe974c00c1a33e3ab62d53a608"),
717-
filepath.Join(p, "blobs", "sha256-79a39c37536ddee29cbadd5d5e2dcba8ed7f03e431f626ff38432c1c866bb7e2"),
718-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
723+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
724+
filepath.Join(p, "blobs", "sha256-a762f214df0d96c9a7b82f96da98d99ceb2776c88e3ea7ffa09d1e5835516ec6"),
719725
filepath.Join(p, "blobs", "sha256-e5dcffe836b6ec8a58e492419b550e65fb8cbdc308503979e5dacb33ac7ea3b7"),
720726
})
721727

@@ -761,9 +767,9 @@ func TestCreateDetectTemplate(t *testing.T) {
761767

762768
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
763769
filepath.Join(p, "blobs", "sha256-0d79f567714c62c048378f2107fb332dabee0135d080c302d884317da9433cc5"),
770+
filepath.Join(p, "blobs", "sha256-3322a0c650c758b7386ff55629d27d07c07b6c3d3515e259dc3e5598c41e9f4e"),
764771
filepath.Join(p, "blobs", "sha256-35360843d0c84fb1506952a131bbef13cd2bb4a541251f22535170c05b56e672"),
765-
filepath.Join(p, "blobs", "sha256-553c4a3f747b3d22a4946875f1cc8ed011c2930d83f864a0c7265f9ec0a20413"),
766-
filepath.Join(p, "blobs", "sha256-de3959f841e9ef6b4b6255fa41cb9e0a45da89c3066aa72bdd07a4747f848990"),
772+
filepath.Join(p, "blobs", "sha256-a56c12acca8068cb6c335e237da6643e8a802a92959a63ad5bd17828e3b5e9b0"),
767773
})
768774
})
769775

@@ -780,8 +786,8 @@ func TestCreateDetectTemplate(t *testing.T) {
780786
}
781787

782788
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
783-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
784-
filepath.Join(p, "blobs", "sha256-ca239d7bd8ea90e4a5d2e6bf88f8d74a47b14336e73eb4e18bed4dd325018116"),
789+
filepath.Join(p, "blobs", "sha256-6bcdb8859d417753645538d7bbfbd7ca91a3f0c191aef5379c53c05e86b669dd"),
790+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
785791
})
786792
})
787793
}

‎server/routes_delete_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ func TestDelete(t *testing.T) {
4747
})
4848

4949
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
50-
filepath.Join(p, "blobs", "sha256-8f2c2167d789c6b2302dff965160fa5029f6a24096d262c1cbb469f21a045382"),
51-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
52-
filepath.Join(p, "blobs", "sha256-ca239d7bd8ea90e4a5d2e6bf88f8d74a47b14336e73eb4e18bed4dd325018116"),
50+
filepath.Join(p, "blobs", "sha256-136bf7c76bac2ec09d6617885507d37829e04b41acc47687d45e512b544e893a"),
51+
filepath.Join(p, "blobs", "sha256-6bcdb8859d417753645538d7bbfbd7ca91a3f0c191aef5379c53c05e86b669dd"),
52+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
5353
filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"),
5454
})
5555

@@ -64,8 +64,8 @@ func TestDelete(t *testing.T) {
6464
})
6565

6666
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
67-
filepath.Join(p, "blobs", "sha256-8f2c2167d789c6b2302dff965160fa5029f6a24096d262c1cbb469f21a045382"),
68-
filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),
67+
filepath.Join(p, "blobs", "sha256-136bf7c76bac2ec09d6617885507d37829e04b41acc47687d45e512b544e893a"),
68+
filepath.Join(p, "blobs", "sha256-89a2116c3a82d6a97f59f748d86ed4417214353fd178ee54df418fde32495fad"),
6969
filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"),
7070
})
7171

0 commit comments

Comments
 (0)