improve write metric

Author: kocubinski

v2/cmd/bench/bench.go

@@ -69,7 +69,7 @@ $ go run ./cmd snapshot --db /tmp/iavl-v2 --version 1
 				treeOpts.MetricsProxy = newPrometheusMetricsProxy()
 			}
 
-			logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{AddSource: true, Level: slog.LevelDebug}))
+			logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug}))
 			var multiTree *iavl.MultiTree
 			if loadSnapshot {
 				var err error

v2/metrics/metrics.go

@@ -79,6 +79,8 @@ func (s *StructMetrics) IncrCounter(val float32, keys ...string) {
 		s.QueryLeafMiss += int64(val)
 	case "db_write_leaf":
 		s.WriteLeaves += int64(val)
+	case "db_write_branch":
+		s.WriteBranch += int64(val)
 	}
 }
 
@@ -118,6 +120,7 @@ type DbMetrics struct {
 	WriteDurations []time.Duration
 	WriteTime      time.Duration
 	WriteLeaves    int64
+	WriteBranch    int64
 
 	QueryDurations   []time.Duration
 	QueryTime        time.Duration
@@ -192,6 +195,7 @@ func (s *StructMetrics) Add(os *StructMetrics) {
 	s.WriteDurations = append(s.WriteDurations, os.WriteDurations...)
 	s.WriteTime += os.WriteTime
 	s.WriteLeaves += os.WriteLeaves
+	s.WriteBranch += os.WriteBranch
 
 	s.QueryDurations = append(s.QueryDurations, os.QueryDurations...)
 	s.QueryTime += os.QueryTime

v2/migrate/go.mod

@@ -1,6 +1,8 @@
 module github.com/cosmos/iavl/v2/migrate
 
-go 1.18
+go 1.21.0
+
+toolchain go1.23.6
 
 require (
 	cosmossdk.io/api v0.7.2
@@ -53,4 +55,4 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
 	google.golang.org/grpc v1.58.3 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
-)
+)

v2/multitree.go

@@ -345,7 +345,7 @@ func (mt *MultiTree) TestBuild(opts *testutil.TreeBuildOptions) (int64, error) {
 		var (
 			workingBytes uint64
 			workingSize  int64
-			writeLeaves  int64
+			writeCount   int64
 			writeTime    time.Duration
 			hashCount    int64
 		)
@@ -356,11 +356,12 @@ func (mt *MultiTree) TestBuild(opts *testutil.TreeBuildOptions) (int64, error) {
 			}
 			workingBytes += tr.workingBytes
 			workingSize += tr.workingSize
-			writeLeaves += sm.WriteLeaves
 			writeTime += sm.WriteTime
+			writeCount += sm.WriteLeaves + sm.WriteBranch
 			hashCount += sm.TreeHash
 			sm.WriteDurations = nil
 			sm.WriteLeaves = 0
+			sm.WriteBranch = 0
 			sm.WriteTime = 0
 			sm.TreeHash = 0
 		}
@@ -376,9 +377,9 @@ func (mt *MultiTree) TestBuild(opts *testutil.TreeBuildOptions) (int64, error) {
 
 		if writeTime > 0 {
 			fmt.Printf("writes: cnt=%s wr/s=%s dur/wr=%s dur=%s hashes=%s\n",
-				humanize.Comma(writeLeaves),
-				humanize.Comma(int64(float64(writeLeaves)/writeTime.Seconds())),
-				time.Duration(int64(writeTime)/writeLeaves),
+				humanize.Comma(writeCount),
+				humanize.Comma(int64(float64(writeCount)/writeTime.Seconds())),
+				time.Duration(int64(writeTime)/writeCount),
 				writeTime.Round(time.Millisecond),
 				humanize.Comma(hashCount),
 			)

v2/sqlite_batch.go

@@ -5,14 +5,16 @@ import (
 	"time"
 
 	"github.com/bvinc/go-sqlite-lite/sqlite3"
+	"github.com/cosmos/iavl/v2/metrics"
 	"github.com/dustin/go-humanize"
 )
 
 type sqliteBatch struct {
-	tree   *Tree
-	sql    *SqliteDb
-	size   int64
-	logger Logger
+	tree    *Tree
+	sql     *SqliteDb
+	size    int64
+	logger  Logger
+	metrics metrics.Proxy
 
 	treeCount int64
 	treeSince time.Time
@@ -147,8 +149,6 @@ func (b *sqliteBatch) treeMaybeCommit(shardID int64) (err error) {
 }
 
 func (b *sqliteBatch) saveLeaves() (int64, error) {
-	var byteCount int64
-
 	err := b.newChangeLogBatch()
 	if err != nil {
 		return 0, err
@@ -169,7 +169,6 @@ func (b *sqliteBatch) saveLeaves() (int64, error) {
 		if err != nil {
 			return 0, err
 		}
-		byteCount += int64(len(bz))
 		if err = b.leafInsert.Exec(leaf.nodeKey.Version(), int(leaf.nodeKey.Sequence()), bz); err != nil {
 			return 0, err
 		}
@@ -225,10 +224,10 @@ func (b *sqliteBatch) saveLeaves() (int64, error) {
 
 	err = tree.sql.leafWrite.Exec("CREATE UNIQUE INDEX IF NOT EXISTS leaf_idx ON leaf (version, sequence)")
 	if err != nil {
-		return byteCount, err
+		return b.leafCount, err
 	}
 
-	return byteCount, nil
+	return b.leafCount, nil
 }
 
 func (b *sqliteBatch) isCheckpoint() bool {

v2/sqlite_writer.go

@@ -456,7 +456,8 @@ func (w *sqlWriter) saveTree(tree *Tree) error {
 	w.leafCh <- saveSig
 	treeResult := <-w.treeResult
 	leafResult := <-w.leafResult
-	tree.metrics.IncrCounter(float32(len(tree.leaves)), metricsNamespace, "db_write_leaf")
+	tree.metrics.IncrCounter(float32(batch.leafCount), metricsNamespace, "db_write_leaf")
+	tree.metrics.IncrCounter(float32(batch.treeCount), metricsNamespace, "db_write_branch")
 
 	err := errors.Join(treeResult.err, leafResult.err)