mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 18:49:14 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Merge pull request #1233 from cmasone-attic/ds-bug

Browse Source 
Special-case Package chunks when caching reachables during ReadValue
This commit is contained in:
cmasone-attic
2016-04-13 15:17:13 -07:00
parent 9a244c851a a8423c9234
commit ff4dc2c688
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
datas/caching_value_store.go
View File

@@ -53,12 +53,27 @@ func (cvs *cachingValueStore) ReadValue(r ref.Ref) types.Value {
var entry chunkCacheEntry = absentChunk{}
if v != nil {
entry = presentChunk(v.Type())
for _, reachable := range v.Chunks() {
cvs.checkAndSet(reachable.TargetRef(), hintedChunk{getTargetType(reachable), r})
cvs.cacheChunks(v, r)
}
if cur := cvs.check(r); cur == nil || cur.Hint().IsEmpty() {
cvs.set(r, entry)
}
return v
}
func (cvs *cachingValueStore) cacheChunks(v types.Value, r ref.Ref) {
for _, reachable := range v.Chunks() {
hash := reachable.TargetRef()
if cur := cvs.check(hash); cur == nil || cur.Hint().IsEmpty() {
cvs.set(hash, hintedChunk{getTargetType(reachable), r})
// Code-genned Packages are side-loaded when reading Values for performance reasons. This means that they won't pass through the ReadValue() codepath above, which means that they won't have their Chunks added to the cache. So, if reachable is a RefOfPackage, go look the package up in the types.PackageRegistry and recursively add its Chunks to the cache.
if _, ok := reachable.(types.RefOfPackage); ok {
if p := types.LookupPackage(hash); p != nil {
cvs.cacheChunks(p, hash)
}
}
}
}
cvs.checkAndSet(r, entry)
return v
}
func (cvs *cachingValueStore) isPresent(r ref.Ref) (present bool) {