Merge pull request #6 from zuoyebang/dev

add cache debug info

bitpage/bitpage.go

@@ -241,6 +241,9 @@ func (b *Bitpage) SetPage(pn PageNum, p *page) {
 }
 
 func (b *Bitpage) GetCacheMetrics() string {
+	if b.cache == nil {
+		return ""
+	}
 	return b.cache.MetricsInfo()
 }
 

bitree/bitree.go

@@ -401,6 +401,10 @@ func (t *Bitree) BitreeDebugInfo(dataType string) string {
 		)
 	}
 
+	if t.opts.UseBlockCompress {
+		fmt.Fprintf(buf, "%s-bitpage%d-blockCache: %s\n", dataType, t.index, t.bpage.GetCacheMetrics())
+	}
+
 	return buf.String()
 }
 

db.go

@@ -481,7 +481,7 @@ func (d *DB) Close() error {
 		err = utils.FirstError(err, d.walDir.Close())
 	}
 
-	d.readState.val.unrefLocked()
+	d.readState.val.unref()
 
 	for _, mem := range d.mu.mem.queue {
 		mem.readerUnref()

read_state.go

@@ -35,15 +35,6 @@ func (s *readState) unref() {
 	}
 }
 
-func (s *readState) unrefLocked() {
-	if atomic.AddInt32(&s.refcnt, -1) != 0 {
-		return
-	}
-	for _, mem := range s.memtables {
-		mem.readerUnref()
-	}
-}
-
 func (d *DB) loadReadState() *readState {
 	d.readState.RLock()
 	state := d.readState.val
@@ -69,6 +60,6 @@ func (d *DB) updateReadStateLocked() {
 	d.readState.Unlock()
 
 	if old != nil {
-		old.unrefLocked()
+		old.unref()
 	}
 }