diff --git a/go/store/nbs/generational_chunk_store.go b/go/store/nbs/generational_chunk_store.go index 42663b8962..9cc588fbe0 100644 --- a/go/store/nbs/generational_chunk_store.go +++ b/go/store/nbs/generational_chunk_store.go @@ -459,7 +459,7 @@ func (gcs *GenerationalNBS) GetChunkLocationsWithPaths(ctx context.Context, hash return res, nil } -func (gcs *GenerationalNBS) GetChunkLocations(ctx context.Context, hashes hash.HashSet) (map[string]map[hash.Hash]Range, error) { +func (gcs *GenerationalNBS) GetChunkLocations(ctx context.Context, hashes hash.HashSet) (map[hash.Hash]map[hash.Hash]Range, error) { res, err := gcs.newGen.GetChunkLocations(ctx, hashes) if err != nil { return nil, err diff --git a/go/store/nbs/store.go b/go/store/nbs/store.go index 5d5058389b..78ab22843b 100644 --- a/go/store/nbs/store.go +++ b/go/store/nbs/store.go @@ -227,20 +227,15 @@ func (nbs *NomsBlockStore) getChunkLocations(ctx context.Context, hashes hash.Ha } -func (nbs *NomsBlockStore) GetChunkLocations(ctx context.Context, hashes hash.HashSet) (map[string]map[hash.Hash]Range, error) { +func (nbs *NomsBlockStore) GetChunkLocations(ctx context.Context, hashes hash.HashSet) (map[hash.Hash]map[hash.Hash]Range, error) { sourcesToRanges, err := nbs.getChunkLocations(ctx, hashes) if err != nil { return nil, err } - res := make(map[string]map[hash.Hash]Range, len(hashes)) + res := make(map[hash.Hash]map[hash.Hash]Range, len(hashes)) for csP, ranges := range sourcesToRanges { cs := *csP - suffix := "" - if _, ok := cs.(archiveChunkSource); ok { - suffix = ArchiveFileSuffix - } - h := cs.hash() - res[h.String()+suffix] = ranges + res[cs.hash()] = ranges } return res, nil }