From 8b9f622ddcd43691ed81f9c880d8974da16614f6 Mon Sep 17 00:00:00 2001 From: adeyemi Date: Thu, 23 Jan 2025 12:33:16 -0800 Subject: [PATCH] Use disable-ext-line, and prevent duplicate type in member name Signed-off-by: adeyemi --- server/storage/mvcc/kvstore.go | 4 +--- server/storage/schema/schema.go | 2 +- server/storage/wal/version.go | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server/storage/mvcc/kvstore.go b/server/storage/mvcc/kvstore.go index b7917c09a1e2..77c50226257c 100644 --- a/server/storage/mvcc/kvstore.go +++ b/server/storage/mvcc/kvstore.go @@ -82,7 +82,7 @@ type store struct { // NewStore returns a new store. It is useful to create a store inside // mvcc pkg. It should only be used for testing externally. -// revive:disable:unexported-return this is used internally in the mvcc pkg +// revive:disable-next-line:unexported-return this is used internally in the mvcc pkg func NewStore(lg *zap.Logger, b backend.Backend, le lease.Lessor, cfg StoreConfig) *store { if lg == nil { lg = zap.NewNop() @@ -133,8 +133,6 @@ func NewStore(lg *zap.Logger, b backend.Backend, le lease.Lessor, cfg StoreConfi return s } -// revive:enable:unexported-return - func (s *store) compactBarrier(ctx context.Context, ch chan struct{}) { if ctx == nil || ctx.Err() != nil { select { diff --git a/server/storage/schema/schema.go b/server/storage/schema/schema.go index f6cb3fe7375b..7c64ef3ae0be 100644 --- a/server/storage/schema/schema.go +++ b/server/storage/schema/schema.go @@ -48,7 +48,7 @@ func localBinaryVersion() semver.Version { return semver.Version{Major: v.Major, Minor: v.Minor} } -type WALVersion = wal.WALVersion +type WALVersion = wal.Version // Migrate updates storage schema to provided target version. // Downgrading requires that provided WAL doesn't contain unsupported entries. diff --git a/server/storage/wal/version.go b/server/storage/wal/version.go index fbdf36000298..7fc316d07c34 100644 --- a/server/storage/wal/version.go +++ b/server/storage/wal/version.go @@ -29,14 +29,15 @@ import ( "go.etcd.io/raft/v3/raftpb" ) -type WALVersion interface { +// Version defines the wal version interface. +type Version interface { // MinimalEtcdVersion returns minimal etcd version able to interpret WAL log. MinimalEtcdVersion() *semver.Version } // ReadWALVersion reads remaining entries from opened WAL and returns struct // that implements schema.WAL interface. -func ReadWALVersion(w *WAL) (WALVersion, error) { +func ReadWALVersion(w *WAL) (Version, error) { _, _, ents, err := w.ReadAll() if err != nil { return nil, err