benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicated code

Browse Source
This commit is contained in:
mcrakhman 2022-12-05 19:11:16 +01:00
parent a8507d8120
commit f9a064e9aa
No known key found for this signature in database
GPG Key ID: DED12CFEF5B8396B
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common/commonspace/synctree/synctree.go
View File

@ -100,13 +100,7 @@ func DeriveSyncTree(ctx context.Context, deps CreateDeps) (t SyncTree, err error
t = syncTree t = syncTree
syncTree.Lock() syncTree.Lock()
defer syncTree.Unlock() defer syncTree.Unlock()
if syncTree.listener != nil { syncTree.afterBuild()
syncTree.listener.Rebuild(syncTree)
}
syncTree.treeUsage.Add(1)
if syncTree.notifiable != nil {
syncTree.notifiable.UpdateHeads(objTree.ID(), objTree.Heads())
}
headUpdate := syncClient.CreateHeadUpdate(t, nil) headUpdate := syncClient.CreateHeadUpdate(t, nil)
err = syncClient.BroadcastAsync(headUpdate) err = syncClient.BroadcastAsync(headUpdate)
@ -136,13 +130,7 @@ func CreateSyncTree(ctx context.Context, deps CreateDeps) (t SyncTree, err error
syncTree.Lock() syncTree.Lock()
defer syncTree.Unlock() defer syncTree.Unlock()
// TODO: refactor here because the code is duplicated, when we create a tree we should only create a storage and then build a tree // TODO: refactor here because the code is duplicated, when we create a tree we should only create a storage and then build a tree
if syncTree.listener != nil { syncTree.afterBuild()
syncTree.listener.Rebuild(syncTree)
}
syncTree.treeUsage.Add(1)
if syncTree.notifiable != nil {
syncTree.notifiable.UpdateHeads(objTree.ID(), objTree.Heads())
}
headUpdate := syncClient.CreateHeadUpdate(t, nil) headUpdate := syncClient.CreateHeadUpdate(t, nil)
err = syncClient.BroadcastAsync(headUpdate) err = syncClient.BroadcastAsync(headUpdate)
@ -240,10 +228,7 @@ func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t Sy
t = syncTree t = syncTree
syncTree.Lock() syncTree.Lock()
defer syncTree.Unlock() defer syncTree.Unlock()
if syncTree.listener != nil { syncTree.afterBuild()
syncTree.listener.Rebuild(syncTree)
}
syncTree.treeUsage.Add(1)
headUpdate := syncTree.syncClient.CreateHeadUpdate(t, nil) headUpdate := syncTree.syncClient.CreateHeadUpdate(t, nil)
// here we will have different behaviour based on who is sending this update // here we will have different behaviour based on who is sending this update
@ -353,3 +338,13 @@ func (s *syncTree) Ping() (err error) {
headUpdate := s.syncClient.CreateHeadUpdate(s, nil) headUpdate := s.syncClient.CreateHeadUpdate(s, nil)
return s.syncClient.BroadcastAsyncOrSendResponsible(headUpdate) return s.syncClient.BroadcastAsyncOrSendResponsible(headUpdate)
} }
func (s *syncTree) afterBuild() {
if s.listener != nil {
s.listener.Rebuild(s)
}
s.treeUsage.Add(1)
if s.notifiable != nil {
s.notifiable.UpdateHeads(s.ID(), s.Heads())
}
}