@@ -15,6 +15,8 @@ import (
1515// MultiTree encapsulates multiple IAVL trees, each with its own "store key" in the context of the Cosmos SDK.
1616// Within IAVL v2 is only used to test the IAVL v2 implementation, and for import/export of IAVL v2 state.
1717type MultiTree struct {
18+ logger Logger
19+
1820 Trees map [string ]* Tree
1921
2022 pool * NodePool
@@ -26,7 +28,7 @@ type MultiTree struct {
2628 errorCh chan error
2729}
2830
29- func NewMultiTree (rootPath string , opts TreeOptions ) * MultiTree {
31+ func NewMultiTree (logger Logger , rootPath string , opts TreeOptions ) * MultiTree {
3032 return & MultiTree {
3133 Trees : make (map [string ]* Tree ),
3234 doneCh : make (chan saveVersionResult , 1000 ),
@@ -37,8 +39,8 @@ func NewMultiTree(rootPath string, opts TreeOptions) *MultiTree {
3739 }
3840}
3941
40- func ImportMultiTree (pool * NodePool , version int64 , path string , treeOpts TreeOptions ) (* MultiTree , error ) {
41- mt := NewMultiTree (path , treeOpts )
42+ func ImportMultiTree (logger Logger , pool * NodePool , version int64 , path string , treeOpts TreeOptions ) (* MultiTree , error ) {
43+ mt := NewMultiTree (logger , path , treeOpts )
4244 paths , err := FindDbsInPath (path )
4345 if err != nil {
4446 return nil , err
@@ -78,7 +80,7 @@ func ImportMultiTree(pool *NodePool, version int64, path string, treeOpts TreeOp
7880 return nil , err
7981 case res := <- done :
8082 prefix := filepath .Base (res .path )
81- log .Info (). Msgf ("imported %s" , prefix )
83+ logger .Info (fmt . Sprintf ("imported %s" , prefix ) )
8284 mt .Trees [prefix ] = res .tree
8385 }
8486 }
@@ -108,7 +110,6 @@ func (mt *MultiTree) MountTrees() error {
108110 prefix := filepath .Base (dbPath )
109111 sqlOpts := defaultSqliteDbOptions (SqliteDbOptions {})
110112 sqlOpts .Path = dbPath
111- log .Info ().Msgf ("mounting %s; opts %v" , prefix , sqlOpts )
112113 sql , err := NewSqliteDb (mt .pool , sqlOpts )
113114 if err != nil {
114115 return err
@@ -173,7 +174,7 @@ func (mt *MultiTree) SaveVersionConcurrently() ([]byte, int64, error) {
173174 for i := 0 ; i < treeCount ; i ++ {
174175 select {
175176 case err := <- mt .errorCh :
176- log . Error (). Err ( err ). Msg ( "failed to save version" )
177+ mt . logger . Error ("failed to save version" , "error" , err )
177178 errs = append (errs , err )
178179 case result := <- mt .doneCh :
179180 if version != - 1 && version != result .version {
@@ -218,7 +219,7 @@ func (mt *MultiTree) SnapshotConcurrently() error {
218219 for i := 0 ; i < treeCount ; i ++ {
219220 select {
220221 case err := <- mt .errorCh :
221- log . Error (). Err ( err ). Msg ( "failed to snapshot" )
222+ mt . logger . Error ("failed to snapshot" , "error" , err )
222223 errs = append (errs , err )
223224 case <- mt .doneCh :
224225 }
@@ -271,7 +272,7 @@ func (mt *MultiTree) WarmLeaves() error {
271272 for i := 0 ; i < cnt ; i ++ {
272273 select {
273274 case err := <- mt .errorCh :
274- log . Error (). Err ( err ). Msg ( "failed to warm leaves" )
275+ mt . logger . Error ("failed to warm leaves" , "error" , err )
275276 return err
276277 case <- mt .doneCh :
277278 }
0 commit comments