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

Merge pull request #481 from arv/counter

Browse Source 
Don't read the current commit from the datastore
This commit is contained in:
Erik Arvidsson
2015-10-26 16:38:32 -04:00
parent caf24a962e 8702743875
commit 11799dc957
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
datas/datastore_common.go
+5 -7
View File
@@ -70,7 +70,7 @@ func (ds *dataStoreCommon) doCommit(datasetID string, commit Commit) bool {
if commitRef.Equals(currentHeadRef) {
return true
}
if !descendsFrom(commitRef, currentHeadRef, ds) {
if !descendsFrom(commit, currentHeadRef, ds) {
return false
}
}
@@ -83,9 +83,9 @@ func (ds *dataStoreCommon) doCommit(datasetID string, commit Commit) bool {
return ds.UpdateRoot(newRootRef, currentRootRef)
}
func descendsFrom(commitRef, currentHeadRef RefOfCommit, cs chunks.ChunkSource) bool {
func descendsFrom(commit Commit, currentHeadRef RefOfCommit, cs chunks.ChunkSource) bool {
// BFS because the common case is that the ancestor is only a step or two away
ancestors := NewSetOfRefOfCommit().Insert(commitRef)
ancestors := commit.Parents()
for !ancestors.Has(currentHeadRef) {
if ancestors.Empty() {
return false
@@ -97,11 +97,9 @@ func descendsFrom(commitRef, currentHeadRef RefOfCommit, cs chunks.ChunkSource)
func getAncestors(commits SetOfRefOfCommit, cs chunks.ChunkSource) SetOfRefOfCommit {
ancestors := NewSetOfRefOfCommit()
commits.Iter(func(r RefOfCommit) (stop bool) {
commits.IterAll(func(r RefOfCommit) {
c := r.TargetValue(cs)
ancestors =
ancestors.Union(c.Parents())
return
ancestors = ancestors.Union(c.Parents())
})
return ancestors
}