GOMODULES
/
bbolt
mirror of https://github.com/etcd-io/bbolt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #721 from ivanvc/fix-read-benchmark-metrics-overhead 

bench: aggregate adding completed ops for reads
pull/735/head
Benjamin Wang 2024-04-21 13:00:06 +01:00 committed by GitHub
parent f5447f026e 43c669db88
commit ed61ba6e2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
cmd/bbolt/main.go
View File

@ -1302,13 +1302,22 @@ func (cmd *benchCommand) runReadsSequential(db *bolt.DB, options *BenchOptions,
for {
numReads := int64(0)
c := tx.Bucket(benchBucketName).Cursor()
for k, v := c.First(); k != nil; k, v = c.Next() {
numReads++
results.AddCompletedOps(1)
if v == nil {
return ErrInvalidValue
err := func() error {
defer func() { results.AddCompletedOps(numReads) }()
c := tx.Bucket(benchBucketName).Cursor()
for k, v := c.First(); k != nil; k, v = c.Next() {
numReads++
if v == nil {
return ErrInvalidValue
}
}
return nil
}()
if err != nil {
return err
}
if options.WriteMode == "seq" && numReads != options.Iterations {
@ -1331,14 +1340,23 @@ func (cmd *benchCommand) runReadsRandom(db *bolt.DB, options *BenchOptions, keys
for {
numReads := int64(0)
b := tx.Bucket(benchBucketName)
for _, key := range keys {
v := b.Get(key.key)
numReads++
results.AddCompletedOps(1)
if v == nil {
return ErrInvalidValue
err := func() error {
defer func() { results.AddCompletedOps(numReads) }()
b := tx.Bucket(benchBucketName)
for _, key := range keys {
v := b.Get(key.key)
numReads++
if v == nil {
return ErrInvalidValue
}
}
return nil
}()
if err != nil {
return err
}
if options.WriteMode == "seq" && numReads != options.Iterations {
@ -1363,11 +1381,11 @@ func (cmd *benchCommand) runReadsSequentialNested(db *bolt.DB, options *BenchOpt
numReads := int64(0)
var top = tx.Bucket(benchBucketName)
if err := top.ForEach(func(name, _ []byte) error {
defer func() { results.AddCompletedOps(numReads) }()
if b := top.Bucket(name); b != nil {
c := b.Cursor()
for k, v := c.First(); k != nil; k, v = c.Next() {
numReads++
results.AddCompletedOps(1)
if v == nil {
return ErrInvalidValue
}
@ -1398,16 +1416,25 @@ func (cmd *benchCommand) runReadsRandomNested(db *bolt.DB, options *BenchOptions
for {
numReads := int64(0)
var top = tx.Bucket(benchBucketName)
for _, nestedKey := range nestedKeys {
if b := top.Bucket(nestedKey.bucket); b != nil {
v := b.Get(nestedKey.key)
numReads++
results.AddCompletedOps(1)
if v == nil {
return ErrInvalidValue
err := func() error {
defer func() { results.AddCompletedOps(numReads) }()
var top = tx.Bucket(benchBucketName)
for _, nestedKey := range nestedKeys {
if b := top.Bucket(nestedKey.bucket); b != nil {
v := b.Get(nestedKey.key)
numReads++
if v == nil {
return ErrInvalidValue
}
}
}
return nil
}()
if err != nil {
return err
}
if options.WriteMode == "seq-nest" && numReads != options.Iterations {