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

fix inline bucket stats

pull/34/head
Martin Kobetic 2014-05-12 17:29:16 +00:00
parent c4ad027df7
commit deffc06a05
2 changed files with 83 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bucket.go
View File

@ -132,11 +132,6 @@ func (b *Bucket) Bucket(name []byte) *Bucket {
var child = b.openBucket(v) var child = b.openBucket(v)
b.buckets[string(name)] = child b.buckets[string(name)] = child
// Save a reference to the inline page if the bucket is inline.
if child.root == 0 {
child.page = (*page)(unsafe.Pointer(&v[bucketHeaderSize]))
}
return child return child
} }
@ -146,6 +141,12 @@ func (b *Bucket) openBucket(value []byte) *Bucket {
var child = newBucket(b.tx) var child = newBucket(b.tx)
child.bucket = &bucket{} child.bucket = &bucket{}
*child.bucket = *(*bucket)(unsafe.Pointer(&value[0])) *child.bucket = *(*bucket)(unsafe.Pointer(&value[0]))
// Save a reference to the inline page if the bucket is inline.
if child.root == 0 {
child.page = (*page)(unsafe.Pointer(&value[bucketHeaderSize]))
}
return &child return &child
} }
@ -363,8 +364,18 @@ func (b *Bucket) ForEach(fn func(k, v []byte) error) error {
func (b *Bucket) Stats() BucketStats { func (b *Bucket) Stats() BucketStats {
var s, subStats BucketStats var s, subStats BucketStats
pageSize := b.tx.db.pageSize pageSize := b.tx.db.pageSize
s.BucketN += 1
if b.root == 0 {
s.InlineBucketN += 1
}
b.forEachPage(func(p *page, depth int) { b.forEachPage(func(p *page, depth int) {
if (p.flags & leafPageFlag) != 0 { if b.root == 0 { // inline bucket
s.KeyN += int(p.count)
lastElement := p.leafPageElement(p.count - 1)
used := bucketHeaderSize + pageHeaderSize + (leafPageElementSize * int(p.count-1))
used += int(lastElement.pos + lastElement.ksize + lastElement.vsize)
s.InlineBucketInuse += used
} else if (p.flags & leafPageFlag) != 0 {
s.LeafPageN++ s.LeafPageN++
if p.count == 0 { if p.count == 0 {
return return
@ -663,6 +674,11 @@ type BucketStats struct {
BranchInuse int // bytes actually used for branch data BranchInuse int // bytes actually used for branch data
LeafAlloc int // bytes allocated for physical leaf pages LeafAlloc int // bytes allocated for physical leaf pages
LeafInuse int // bytes actually used for leaf data LeafInuse int // bytes actually used for leaf data
// Bucket statistics
BucketN int // total number of buckets including the top bucket
InlineBucketN int // total number on inlined buckets
InlineBucketInuse int // bytes used for inlined buckets (also accounted for in LeafInuse)
} }
func (s *BucketStats) Add(other BucketStats) { func (s *BucketStats) Add(other BucketStats) {
@ -678,6 +694,10 @@ func (s *BucketStats) Add(other BucketStats) {
s.BranchInuse += other.BranchInuse s.BranchInuse += other.BranchInuse
s.LeafAlloc += other.LeafAlloc s.LeafAlloc += other.LeafAlloc
s.LeafInuse += other.LeafInuse s.LeafInuse += other.LeafInuse
s.BucketN += other.BucketN
s.InlineBucketN += other.InlineBucketN
s.InlineBucketInuse += other.InlineBucketInuse
} }
// cloneBytes returns a copy of a given slice. // cloneBytes returns a copy of a given slice.

102
bucket_test.go
View File

@ -576,19 +576,22 @@ func TestBucket_Stats(t *testing.T) {
db.View(func(tx *Tx) error { db.View(func(tx *Tx) error {
b := tx.Bucket([]byte("woojits")) b := tx.Bucket([]byte("woojits"))
stats := b.Stats() stats := b.Stats()
assert.Equal(t, stats.BranchPageN, 1) assert.Equal(t, 1, stats.BranchPageN, "BranchPageN")
assert.Equal(t, stats.BranchOverflowN, 0) assert.Equal(t, 0, stats.BranchOverflowN, "BranchOverflowN")
assert.Equal(t, stats.LeafPageN, 6) assert.Equal(t, 6, stats.LeafPageN, "LeafPageN")
assert.Equal(t, stats.LeafOverflowN, 2) assert.Equal(t, 2, stats.LeafOverflowN, "LeafOverflowN")
assert.Equal(t, stats.KeyN, 501) assert.Equal(t, 501, stats.KeyN, "KeyN")
assert.Equal(t, stats.Depth, 2) assert.Equal(t, 2, stats.Depth, "Depth")
if os.Getpagesize() != 4096 { assert.Equal(t, 125, stats.BranchInuse, "BranchInuse")
assert.Equal(t, 20908, stats.LeafInuse, "LeafInuse")
if os.Getpagesize() == 4096 {
// Incompatible page size // Incompatible page size
assert.Equal(t, stats.BranchInuse, 125) assert.Equal(t, 4096, stats.BranchAlloc, "BranchAlloc")
assert.Equal(t, stats.BranchAlloc, 4096) assert.Equal(t, 32768, stats.LeafAlloc, "LeafAlloc")
assert.Equal(t, stats.LeafInuse, 20908)
assert.Equal(t, stats.LeafAlloc, 32768)
} }
assert.Equal(t, 1, stats.BucketN, "BucketN")
assert.Equal(t, 0, stats.InlineBucketN, "InlineBucketN")
assert.Equal(t, 0, stats.InlineBucketInuse, "InlineBucketInuse")
return nil return nil
}) })
}) })
@ -610,19 +613,22 @@ func TestBucket_Stats_Small(t *testing.T) {
db.View(func(tx *Tx) error { db.View(func(tx *Tx) error {
b := tx.Bucket([]byte("whozawhats")) b := tx.Bucket([]byte("whozawhats"))
stats := b.Stats() stats := b.Stats()
assert.Equal(t, 0, stats.BranchPageN) assert.Equal(t, 0, stats.BranchPageN, "BranchPageN")
assert.Equal(t, 0, stats.BranchOverflowN) assert.Equal(t, 0, stats.BranchOverflowN, "BranchOverflowN")
assert.Equal(t, 1, stats.LeafPageN) assert.Equal(t, 0, stats.LeafPageN, "LeafPageN")
assert.Equal(t, 0, stats.LeafOverflowN) assert.Equal(t, 0, stats.LeafOverflowN, "LeafOverflowN")
assert.Equal(t, 1, stats.KeyN) assert.Equal(t, 1, stats.KeyN, "KeyN")
assert.Equal(t, 1, stats.Depth) assert.Equal(t, 1, stats.Depth, "Depth")
if os.Getpagesize() != 4096 { assert.Equal(t, 0, stats.BranchInuse, "BranchInuse")
assert.Equal(t, 0, stats.LeafInuse, "LeafInuse")
if os.Getpagesize() == 4096 {
// Incompatible page size // Incompatible page size
assert.Equal(t, 0, stats.BranchInuse) assert.Equal(t, 0, stats.BranchAlloc, "BranchAlloc")
assert.Equal(t, 0, stats.BranchAlloc) assert.Equal(t, 0, stats.LeafAlloc, "LeafAlloc")
assert.Equal(t, 38, stats.LeafInuse)
assert.Equal(t, 4096, stats.LeafAlloc)
} }
assert.Equal(t, 1, stats.BucketN, "BucketN")
assert.Equal(t, 1, stats.InlineBucketN, "InlineBucketN")
assert.Equal(t, bucketHeaderSize+pageHeaderSize+leafPageElementSize+6, stats.InlineBucketInuse, "InlineBucketInuse")
return nil return nil
}) })
}) })
@ -643,7 +649,7 @@ func TestBucket_Stats_Nested(t *testing.T) {
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
bar.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))) bar.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i)))
} }
baz, err := b.CreateBucket([]byte("baz")) baz, err := bar.CreateBucket([]byte("baz"))
assert.NoError(t, err) assert.NoError(t, err)
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
baz.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))) baz.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i)))
@ -654,19 +660,22 @@ func TestBucket_Stats_Nested(t *testing.T) {
db.View(func(tx *Tx) error { db.View(func(tx *Tx) error {
b := tx.Bucket([]byte("foo")) b := tx.Bucket([]byte("foo"))
stats := b.Stats() stats := b.Stats()
assert.Equal(t, stats.BranchPageN, 0) assert.Equal(t, 0, stats.BranchPageN, "BranchPageN")
assert.Equal(t, stats.BranchOverflowN, 0) assert.Equal(t, 0, stats.BranchOverflowN, "BranchOverflowN")
assert.Equal(t, stats.LeafPageN, 3) assert.Equal(t, 2, stats.LeafPageN, "LeafPageN")
assert.Equal(t, stats.LeafOverflowN, 0) assert.Equal(t, 0, stats.LeafOverflowN, "LeafOverflowN")
assert.Equal(t, stats.KeyN, 122) assert.Equal(t, 122, stats.KeyN, "KeyN")
assert.Equal(t, stats.Depth, 2) assert.Equal(t, 3, stats.Depth, "Depth")
if os.Getpagesize() != 4096 { assert.Equal(t, 0, stats.BranchInuse, "BranchInuse")
assert.Equal(t, 2474, stats.LeafInuse, "LeafInuse")
if os.Getpagesize() == 4096 {
// Incompatible page size // Incompatible page size
assert.Equal(t, stats.BranchInuse, 0) assert.Equal(t, 0, stats.BranchAlloc, "BranchAlloc")
assert.Equal(t, stats.BranchAlloc, 0) assert.Equal(t, 8192, stats.LeafAlloc, "LeafAlloc")
assert.Equal(t, stats.LeafInuse, 38)
assert.Equal(t, stats.LeafAlloc, 4096)
} }
assert.Equal(t, 3, stats.BucketN, "BucketN")
assert.Equal(t, 1, stats.InlineBucketN, "InlineBucketN")
assert.Equal(t, 212, stats.InlineBucketInuse, "InlineBucketInuse")
return nil return nil
}) })
}) })
@ -696,19 +705,22 @@ func TestBucket_Stats_Large(t *testing.T) {
db.View(func(tx *Tx) error { db.View(func(tx *Tx) error {
b := tx.Bucket([]byte("widgets")) b := tx.Bucket([]byte("widgets"))
stats := b.Stats() stats := b.Stats()
assert.Equal(t, 19, stats.BranchPageN) assert.Equal(t, 19, stats.BranchPageN, "BranchPageN")
assert.Equal(t, 0, stats.BranchOverflowN) assert.Equal(t, 0, stats.BranchOverflowN, "BranchOverflowN")
assert.Equal(t, 1291, stats.LeafPageN) assert.Equal(t, 1291, stats.LeafPageN, "LeafPageN")
assert.Equal(t, 0, stats.LeafOverflowN) assert.Equal(t, 0, stats.LeafOverflowN, "LeafOverflowN")
assert.Equal(t, 100000, stats.KeyN) assert.Equal(t, 100000, stats.KeyN, "KeyN")
assert.Equal(t, 3, stats.Depth) assert.Equal(t, 3, stats.Depth, "Depth")
if os.Getpagesize() != 4096 { assert.Equal(t, 27007, stats.BranchInuse, "BranchInuse")
assert.Equal(t, 2598436, stats.LeafInuse, "LeafInuse")
if os.Getpagesize() == 4096 {
// Incompatible page size // Incompatible page size
assert.Equal(t, 27289, stats.BranchInuse) assert.Equal(t, 77824, stats.BranchAlloc, "BranchAlloc")
assert.Equal(t, 61440, stats.BranchAlloc) assert.Equal(t, 5287936, stats.LeafAlloc, "LeafAlloc")
assert.Equal(t, 2598276, stats.LeafInuse)
assert.Equal(t, 5246976, stats.LeafAlloc)
} }
assert.Equal(t, 1, stats.BucketN, "BucketN")
assert.Equal(t, 0, stats.InlineBucketN, "InlineBucketN")
assert.Equal(t, 0, stats.InlineBucketInuse, "InlineBucketInuse")
return nil return nil
}) })
}) })