use smaller degree btree to reduce memory allocations

yihuang · yihuang · commit 856d82fdbb3e · 2024-03-19T12:05:50.000+08:00
diff --git a/btree.go b/btree.go
@@ -12,10 +12,11 @@ type BTree[T any] struct {
 }
 
 // NewBTree returns a new BTree.
-func NewBTree[T any](less func(a, b T) bool) *BTree[T] {
-	tree := btree.NewBTreeGOptions[T](less, btree.Options{
+func NewBTree[T any](less func(a, b T) bool, degree int) *BTree[T] {
+	tree := btree.NewBTreeGOptions(less, btree.Options{
 		NoLocks:  true,
 		ReadOnly: true,
+		Degree:   degree,
 	})
 	t := &BTree[T]{}
 	t.Store(tree)
diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/cometbft/cometbft v0.38.2
 	github.com/test-go/testify v1.1.4
 	github.com/tidwall/btree v1.7.0
-	golang.org/x/sync v0.4.0
 )
 
 require (
@@ -71,4 +70,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/tidwall/btree => github.com/yihuang/btree v0.0.0-20240215071918-6726a9b22e40
+replace github.com/tidwall/btree => github.com/yihuang/btree v0.0.0-20240318010431-d365682df9a7
diff --git a/go.sum b/go.sum
@@ -233,8 +233,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJ
 github.com/test-go/testify v1.1.4 h1:Tf9lntrKUMHiXQ07qBScBTSA0dhYQlu83hswqelv1iE=
 github.com/test-go/testify v1.1.4/go.mod h1:rH7cfJo/47vWGdi4GPj16x3/t1xGOj2YxzmNQzk2ghU=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/yihuang/btree v0.0.0-20240215071918-6726a9b22e40 h1:FPcNbZSQgK2d/Oj5tD4TwJM8ealdG4DLYvETLV9D5EE=
-github.com/yihuang/btree v0.0.0-20240215071918-6726a9b22e40/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
+github.com/yihuang/btree v0.0.0-20240318010431-d365682df9a7 h1:TgWa3HbVnYmB4cYKvT+bY/6r6yqZZLCd6T1RMLi6qeg=
+github.com/yihuang/btree v0.0.0-20240318010431-d365682df9a7/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -338,9 +338,12 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
 gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/mvdata.go b/mvdata.go
@@ -4,12 +4,18 @@ import (
 	"bytes"
 )
 
+const (
+	// Since we do copy-on-write a lot, smaller degree means smaller allocations
+	OuterBTreeDegree = 4
+	InnerBTreeDegree = 4
+)
+
 type MVData struct {
 	BTree[dataItem]
 }
 
 func NewMVData() *MVData {
-	return &MVData{*NewBTree[dataItem](KeyItemLess)}
+	return &MVData{*NewBTree(KeyItemLess[dataItem], OuterBTreeDegree)}
 }
 
 // getTree returns `nil` if not found
@@ -22,7 +28,7 @@ func (d *MVData) getTree(key Key) *BTree[secondaryDataItem] {
 func (d *MVData) getTreeOrDefault(key Key) *BTree[secondaryDataItem] {
 	return d.GetOrDefault(dataItem{Key: key}, func(item *dataItem) {
 		if item.Tree == nil {
-			item.Tree = NewBTree(secondaryDataItemLess)
+			item.Tree = NewBTree(secondaryLesser, InnerBTreeDegree)
 		}
 	}).Tree
 }
@@ -146,7 +152,7 @@ type secondaryDataItem struct {
 	Estimate    bool
 }
 
-func secondaryDataItemLess(a, b secondaryDataItem) bool {
+func secondaryLesser(a, b secondaryDataItem) bool {
 	// reverse the order
 	return a.Index > b.Index
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ require (`
`7`	`7`	`github.com/cometbft/cometbft v0.38.2`
`8`	`8`	`github.com/test-go/testify v1.1.4`
`9`	`9`	`github.com/tidwall/btree v1.7.0`
`10`		`- golang.org/x/sync v0.4.0`
`11`	`10`	`)`
`12`	`11`
`13`	`12`	`require (`
`@@ -71,4 +70,4 @@ require (`
`71`	`70`	`gopkg.in/yaml.v3 v3.0.1 // indirect`
`72`	`71`	`)`
`73`	`72`
`74`		`-replace github.com/tidwall/btree => github.com/yihuang/btree v0.0.0-20240215071918-6726a9b22e40`
	`73`	`+replace github.com/tidwall/btree => github.com/yihuang/btree v0.0.0-20240318010431-d365682df9a7`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,18 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`)`
`6`	`6`
	`7`	`+const (`
	`8`	`+ // Since we do copy-on-write a lot, smaller degree means smaller allocations`
	`9`	`+ OuterBTreeDegree = 4`
	`10`	`+ InnerBTreeDegree = 4`
	`11`	`+)`
	`12`	`+`
`7`	`13`	`type MVData struct {`
`8`	`14`	`BTree[dataItem]`
`9`	`15`	`}`
`10`	`16`
`11`	`17`	`func NewMVData() *MVData {`
`12`		`- return &MVData{*NewBTree[dataItem](KeyItemLess)}`
	`18`	`+ return &MVData{*NewBTree(KeyItemLess[dataItem], OuterBTreeDegree)}`
`13`	`19`	`}`
`14`	`20`
`15`	`21`	// getTree returns `nil` if not found
`@@ -22,7 +28,7 @@ func (d MVData) getTree(key Key) BTree[secondaryDataItem] {`
`22`	`28`	`func (d MVData) getTreeOrDefault(key Key) BTree[secondaryDataItem] {`
`23`	`29`	`return d.GetOrDefault(dataItem{Key: key}, func(item *dataItem) {`
`24`	`30`	`if item.Tree == nil {`
`25`		`- item.Tree = NewBTree(secondaryDataItemLess)`
	`31`	`+ item.Tree = NewBTree(secondaryLesser, InnerBTreeDegree)`
`26`	`32`	`}`
`27`	`33`	`}).Tree`
`28`	`34`	`}`
`@@ -146,7 +152,7 @@ type secondaryDataItem struct {`
`146`	`152`	`Estimate bool`
`147`	`153`	`}`
`148`	`154`
`149`		`-func secondaryDataItemLess(a, b secondaryDataItem) bool {`
	`155`	`+func secondaryLesser(a, b secondaryDataItem) bool {`
`150`	`156`	`// reverse the order`
`151`	`157`	`return a.Index > b.Index`
`152`	`158`	`}`