highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-08-30 07:35:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

channeldb: slightly refactor the [Fetch|Put]Meta methods

Browse Source 
This commit performs a slight refactoring of the internals (and API) of
the [Fetch|Put]Meta methods. The changes are rather minor and simply
eliminate the conditional branching structure with usage of an internal
function. This new form is much easier to follow.
This commit is contained in:
Olaoluwa Osuntokun
2016-11-27 18:44:14 -08:00
parent 5b2f9a5b69
commit 7454b7df95
3 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
channeldb/meta.go
View File

@@ -21,27 +21,13 @@ type Meta struct {
}
// FetchMeta fetches the meta data from boltdb and returns filled meta
// structure. If transaction object is specified then it will be used rather
// than initiation creation of new one.
// structure.
func (d *DB) FetchMeta(tx *bolt.Tx) (*Meta, error) {
meta := &Meta{}
fetchMeta := func(tx *bolt.Tx) error {
if metaBucket := tx.Bucket(metaBucket); metaBucket != nil {
fetchDbVersion(metaBucket, meta)
return nil
} else {
return ErrMetaNotFound
}
}
var err error
if tx == nil {
err = d.store.View(fetchMeta)
} else {
err = fetchMeta(tx)
}
err := d.View(func(tx *bolt.Tx) error {
return fetchMeta(meta, tx)
})
if err != nil {
return nil, err
}
@@ -49,28 +35,42 @@ func (d *DB) FetchMeta(tx *bolt.Tx) (*Meta, error) {
return meta, nil
}
// PutMeta gets as input meta structure and put it into boltdb. If transaction
// object is specified then it will be used rather than initiation creation of
// new one.
func (d *DB) PutMeta(meta *Meta, tx *bolt.Tx) error {
putMeta := func(tx *bolt.Tx) error {
metaBucket := tx.Bucket(metaBucket)
if metaBucket == nil {
return ErrMetaNotFound
}
if err := putDbVersion(metaBucket, meta); err != nil {
return err
}
return nil
// fetchMeta is an internal helper function used in order to allow callers to
// re-use a database transaction. See the publicly exported FetchMeta method
// for more information.
func fetchMeta(meta *Meta, tx *bolt.Tx) error {
metaBucket := tx.Bucket(metaBucket)
if metaBucket == nil {
return ErrMetaNotFound
}
if tx == nil {
return d.store.Update(putMeta)
data := metaBucket.Get(dbVersionKey)
if data == nil {
meta.DbVersionNumber = getLatestDBVersion(dbVersions)
} else {
return putMeta(tx)
meta.DbVersionNumber = byteOrder.Uint32(data)
}
return nil
}
// PutMeta writes the passed instance of the database met-data struct to disk.
func (d *DB) PutMeta(meta *Meta) error {
return d.Update(func(tx *bolt.Tx) error {
return putMeta(meta, tx)
})
}
// putMeta is an internal helper function used in order to allow callers to
// re-use a database transaction. See the publicly exported PutMeta method for
// more information.
func putMeta(meta *Meta, tx *bolt.Tx) error {
metaBucket, err := tx.CreateBucketIfNotExists(metaBucket)
if err != nil {
return err
}
return putDbVersion(metaBucket, meta)
}
func putDbVersion(metaBucket *bolt.Bucket, meta *Meta) error {
@@ -81,11 +81,3 @@ func putDbVersion(metaBucket *bolt.Bucket, meta *Meta) error {
}
return nil
}
func fetchDbVersion(metaBucket *bolt.Bucket, meta *Meta) {
if data := metaBucket.Get(dbVersionKey); data != nil {
meta.DbVersionNumber = byteOrder.Uint32(data)
} else {
meta.DbVersionNumber = getLatestDBVersion(dbVersions)
}
}