[db] better fix for concurrent mapwrite by removing LRU cache from boltDB (iotexproject#2123)

Author: dustinxie

db/counting_index.go

@@ -74,13 +74,7 @@ func NewCountingIndexNX(kv KVStore, name []byte) (CountingIndex, error) {
 		}
 		total = ZeroIndex
 	}
-	if kvFillPercent, ok := kv.(KVStoreWithBucketFillPercent); ok {
-		if err := kvFillPercent.SetBucketFillPercent(bucket, 1.0); err != nil {
-			// set an aggressive fill percent
-			// b/c counting index only appends, further inserts to the bucket would never split the page
-			return nil, err
-		}
-	}
+
 	return &countingIndex{
 		kvStore: kvRange,
 		bucket:  bucket,
@@ -123,7 +117,7 @@ func (c *countingIndex) Add(value []byte, inBatch bool) error {
 	b := batch.NewBatch()
 	b.Put(c.bucket, byteutil.Uint64ToBytesBigEndian(c.size), value, "failed to add %d-th item", c.size+1)
 	b.Put(c.bucket, CountKey, byteutil.Uint64ToBytesBigEndian(c.size+1), "failed to update size = %d", c.size+1)
-	if err := c.kvStore.WriteBatch(b); err != nil {
+	if err := c.commit(b); err != nil {
 		return err
 	}
 	c.size++
@@ -170,7 +164,7 @@ func (c *countingIndex) Revert(count uint64) error {
 		b.Delete(c.bucket, byteutil.Uint64ToBytesBigEndian(start+i), "failed to delete %d-th item", start+i)
 	}
 	b.Put(c.bucket, CountKey, byteutil.Uint64ToBytesBigEndian(start), "failed to update size = %d", start)
-	if err := c.kvStore.WriteBatch(b); err != nil {
+	if err := c.commit(b); err != nil {
 		return err
 	}
 	c.size = start
@@ -190,9 +184,18 @@ func (c *countingIndex) Commit() error {
 		return nil
 	}
 	c.batch.Put(c.bucket, CountKey, byteutil.Uint64ToBytesBigEndian(c.size), "failed to update size = %d", c.size)
-	if err := c.kvStore.WriteBatch(c.batch); err != nil {
+	if err := c.commit(c.batch); err != nil {
 		return err
 	}
 	c.batch = nil
 	return nil
 }
+
+func (c *countingIndex) commit(b batch.KVStoreBatch) error {
+	if kvFillPercent, ok := c.kvStore.(KVStoreWithBucketFillPercent); ok {
+		// set an aggressive fill percent
+		// b/c counting index only appends, further inserts to the bucket would never split the page
+		return kvFillPercent.WriteBatchWithFillPercent(b, 1.0)
+	}
+	return c.kvStore.WriteBatch(b)
+}

db/db_bolt.go

@@ -10,7 +10,6 @@ import (
 	"bytes"
 	"context"
 
-	"github.com/iotexproject/go-pkgs/cache"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 
@@ -23,19 +22,17 @@ const fileMode = 0600
 
 // boltDB is KVStore implementation based bolt DB
 type boltDB struct {
-	db          *bolt.DB
-	path        string
-	config      config.DB
-	fillPercent *cache.ThreadSafeLruCache // specific fill percent for certain buckets (for example, 1.0 for append-only)
+	db     *bolt.DB
+	path   string
+	config config.DB
 }
 
 // NewBoltDB instantiates an BoltDB with implements KVStore
 func NewBoltDB(cfg config.DB) KVStoreWithBucketFillPercent {
 	return &boltDB{
-		db:          nil,
-		path:        cfg.DbPath,
-		config:      cfg,
-		fillPercent: cache.NewThreadSafeLruCache(256),
+		db:     nil,
+		path:   cfg.DbPath,
+		config: cfg,
 	}
 }
 
@@ -67,9 +64,6 @@ func (b *boltDB) Put(namespace string, key, value []byte) (err error) {
 			if err != nil {
 				return err
 			}
-			if p, ok := b.getBucketFillPercent(namespace); ok {
-				bucket.FillPercent = p
-			}
 			return bucket.Put(key, value)
 		}); err == nil {
 			break
@@ -257,6 +251,15 @@ func (b *boltDB) Delete(namespace string, key []byte) (err error) {
 
 // WriteBatch commits a batch
 func (b *boltDB) WriteBatch(kvsb batch.KVStoreBatch) (err error) {
+	return b.writeBatch(kvsb, 0.0)
+}
+
+// WriteBatchWithFillPercent commits a batch with specified fill percent
+func (b *boltDB) WriteBatchWithFillPercent(kvsb batch.KVStoreBatch, percent float64) (err error) {
+	return b.writeBatch(kvsb, percent)
+}
+
+func (b *boltDB) writeBatch(kvsb batch.KVStoreBatch, percent float64) (err error) {
 	succeed := true
 	kvsb.Lock()
 	defer func() {
@@ -283,8 +286,8 @@ func (b *boltDB) WriteBatch(kvsb batch.KVStoreBatch) (err error) {
 					if e != nil {
 						return errors.Wrapf(e, errFmt, errArgs)
 					}
-					if p, ok := b.getBucketFillPercent(ns); ok {
-						bucket.FillPercent = p
+					if percent != 0.0 {
+						bucket.FillPercent = percent
 					}
 					if e := bucket.Put(write.Key(), write.Value()); e != nil {
 						return errors.Wrapf(e, errFmt, errArgs)
@@ -312,19 +315,6 @@ func (b *boltDB) WriteBatch(kvsb batch.KVStoreBatch) (err error) {
 	return err
 }
 
-// SetBucketFillPercent sets specified fill percent for a bucket
-func (b *boltDB) SetBucketFillPercent(namespace string, percent float64) error {
-	b.fillPercent.Add(namespace, percent)
-	return nil
-}
-
-func (b *boltDB) getBucketFillPercent(namespace string) (float64, bool) {
-	if p, hit := b.fillPercent.Get(namespace); hit {
-		return p.(float64), true
-	}
-	return 0, false
-}
-
 // ======================================
 // below functions used by RangeIndex
 // ======================================

db/kvstore.go

@@ -47,8 +47,8 @@ type (
 	// KVStoreWithBucketFillPercent is KVStore with option to set bucket fill percent
 	KVStoreWithBucketFillPercent interface {
 		KVStore
-		// SetBucketFillPercent sets specified fill percent for a bucket
-		SetBucketFillPercent(string, float64) error
+		// WriteBatchWithFillPercent
+		WriteBatchWithFillPercent(batch.KVStoreBatch, float64) error
 	}
 
 	// KVStoreForRangeIndex is KVStore for range index