fix basic parallel benchmark

This commit is contained in:
Steven Normore 2014-04-13 17:57:51 +00:00 committed by Ben Johnson
parent fdde1bcb06
commit 29b7d0a9a4

View File

@ -1,6 +1,9 @@
package bolt package bolt
import ( import (
"errors"
"fmt"
"os"
"sync" "sync"
"testing" "testing"
) )
@ -28,11 +31,16 @@ func (bm *Benchmark) Run(b *testing.B) {
// Open the database. // Open the database.
db, err := Open(bm.InputPath, 0600) db, err := Open(bm.InputPath, 0600)
if err != nil { if err != nil {
panic(err) b.Fatalf("error: %+v", err)
return return
} }
defer db.Close() defer db.Close()
buckets, err := buckets(db, bm.InputPath)
if err != nil {
b.Fatalf("error: %+v", err)
}
b.ResetTimer() b.ResetTimer()
// Keep running a fixed number of parallel reads until we run out of time. // Keep running a fixed number of parallel reads until we run out of time.
@ -41,15 +49,48 @@ func (bm *Benchmark) Run(b *testing.B) {
for j := 0; j < bm.Parallelism; j++ { for j := 0; j < bm.Parallelism; j++ {
wg.Add(1) wg.Add(1)
go func() { go func() {
if bm.TraversalPattern == BenchRandomTraversal { defer wg.Done()
// Perform all reads in random order. if err := bm.runBuckets(b, db, buckets); err != nil {
// indexes := rand.Perm(total) b.Fatalf("error: %+v", err)
} else {
// Perform all reads in sequential order.
} }
wg.Done()
}() }()
} }
wg.Wait() wg.Wait()
} }
} }
// Run benchmark(s) for each of the given buckets.
func (bm *Benchmark) runBuckets(b *testing.B, db *DB, buckets []string) error {
return db.View(func(tx *Tx) error {
bucketsCount := len(buckets)
for _, bucket := range buckets {
c := tx.Bucket([]byte(bucket)).Cursor()
count := 0
for k, _ := c.First(); k != nil; k, _ = c.Next() {
count++
}
if count != bucketsCount {
return errors.New(fmt.Sprintf("wrong count: %d; expected: %d", count, bucketsCount))
}
}
return nil
})
}
func buckets(db *DB, path string) ([]string, error) {
if _, err := os.Stat(path); os.IsNotExist(err) {
return nil, err
}
buckets := []string{}
err := db.View(func(tx *Tx) error {
// Iterate over each bucket.
return tx.ForEach(func(name []byte, _ *Bucket) error {
buckets = append(buckets, string(name))
return nil
})
})
return buckets, err
}