fix(repo.WalkRepoDatasets): remove data race

qri-io · Nov 17, 2017 · 56862e2 · 56862e2
1 parent c3be454
commit 56862e2
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/repo/graph.go b/repo/graph.go
@@ -225,8 +225,19 @@ func WalkRepoDatasets(r Repo, visit func(depth int, ref *DatasetRef, err error)
  }
 
  pageSize := count / pll
- pll++
  done := make(chan error, pll)
+ for i := 0; i < pll; i++ {
+ go doSection(i, pageSize, done)
+ }
+
+ for i := 0; i < pll; i++ {
+ err := <-done
+ if err != nil {
+ return err
+ }
+ }
+
+ // TODO - make properly parallel
  go func() {
  refs, err := r.GetQueryLogs(1000, 0)
  if err != nil {
@@ -254,16 +265,5 @@ func WalkRepoDatasets(r Repo, visit func(depth int, ref *DatasetRef, err error)
  done <- nil
  }()
 
- for i := 0; i < pll; i++ {
- go doSection(i, pageSize, done)
- }
-
- for i := 0; i < pll; i++ {
- err := <-done
- if err != nil {
- return err
- }
- }
-
- return nil
+ return <-done
 }