diff --git a/store/localstore/kv.go b/store/localstore/kv.go index e67e9a9e00..5e1d7d6596 100644 --- a/store/localstore/kv.go +++ b/store/localstore/kv.go @@ -46,14 +46,14 @@ type storeCache struct { } var ( - globalID int64 - globalVerProvider kv.VersionProvider - mc storeCache + globalID int64 + globalVersionProvider kv.VersionProvider + mc storeCache ) func init() { mc.cache = make(map[string]*dbStore) - globalVerProvider = &LocalVersioProvider{} + globalVersionProvider = &LocalVersionProvider{} } // Driver implements kv.Driver interface. @@ -105,7 +105,7 @@ func (s *dbStore) Begin() (kv.Transaction, error) { return nil, err } - beginVer, err := globalVerProvider.CurrentVersion() + beginVer, err := globalVersionProvider.CurrentVersion() if err != nil { return nil, err } diff --git a/store/localstore/local_version_provider.go b/store/localstore/local_version_provider.go index 769f854a24..f63b29939e 100644 --- a/store/localstore/local_version_provider.go +++ b/store/localstore/local_version_provider.go @@ -13,8 +13,8 @@ import ( // may conflict. var ErrOverflow = errors.New("overflow when allocating new version") -// LocalVersioProvider uses local timestamp for version. -type LocalVersioProvider struct { +// LocalVersionProvider uses local timestamp for version. +type LocalVersionProvider struct { mu sync.Mutex lastTimeStampTs uint64 n uint64 @@ -25,7 +25,7 @@ const ( ) // CurrentVersion implements the VersionProvider's GetCurrentVer interface. -func (l *LocalVersioProvider) CurrentVersion() (kv.Version, error) { +func (l *LocalVersionProvider) CurrentVersion() (kv.Version, error) { l.mu.Lock() defer l.mu.Unlock() var ts uint64 diff --git a/store/localstore/txn.go b/store/localstore/txn.go index 9fed0fcd0d..059a96b3bc 100644 --- a/store/localstore/txn.go +++ b/store/localstore/txn.go @@ -191,7 +191,7 @@ func (txn *dbTxn) doCommit() error { } // Check dirty store - curVer, err := globalVerProvider.CurrentVersion() + curVer, err := globalVersionProvider.CurrentVersion() if err != nil { return errors.Trace(err) }