mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-16 03:41:40 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity

Merge branch 'zachmu/session-rebase' of github.com:dolthub/dolt into zachmu/session-rebase

Browse Source
This commit is contained in:
Zach Musgrave
2021-09-20 15:03:28 -07:00
parent 5b2922d134 49ffd53a25
commit af4443ce41
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
go/store/nbs/root_tracker_test.go
View File

@@ -408,10 +408,10 @@ func (fm *fakeManifest) Update(ctx context.Context, lastLock addr, newContents m
if fm.contents.lock == lastLock {
fm.contents = manifestContents{
manifestVers: StorageVersion,
nbfVers: newContents.nbfVers,
lock: newContents.lock,
root: newContents.root,
gcGen: addr(hash.Hash{}),
nbfVers: newContents.nbfVers,
lock: newContents.lock,
root: newContents.root,
gcGen: addr(hash.Hash{}),
}
fm.contents.specs = make([]tableSpec, len(newContents.specs))
copy(fm.contents.specs, newContents.specs)
@@ -426,12 +426,12 @@ func (fm *fakeManifest) Update(ctx context.Context, lastLock addr, newContents m
func (fm *fakeManifest) set(version string, lock addr, root hash.Hash, specs, appendix []tableSpec) {
fm.contents = manifestContents{
manifestVers: StorageVersion,
nbfVers: version,
lock: lock,
root: root,
gcGen: addr(hash.Hash{}),
specs: specs,
appendix: appendix,
nbfVers: version,
lock: lock,
root: root,
gcGen: addr(hash.Hash{}),
specs: specs,
appendix: appendix,
}
}