From 68c2fae46a51ef649e06be4b4ac7871812aa4846 Mon Sep 17 00:00:00 2001 From: huangzw Date: Fri, 21 Feb 2025 15:50:11 +0800 Subject: [PATCH 1/3] chore: remove unused and deprecated func `GetEffectiveNodeIdsFromWalEntries` Signed-off-by: huangzw --- server/storage/util.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/server/storage/util.go b/server/storage/util.go index 0dc7f1c6d305..ebc83d44745e 100644 --- a/server/storage/util.go +++ b/server/storage/util.go @@ -21,12 +21,13 @@ import ( "go.uber.org/zap" + "go.etcd.io/raft/v3/raftpb" + "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" - "go.etcd.io/raft/v3/raftpb" ) // AssertNoV2StoreContent -> depending on the deprecation stage, warns or report an error @@ -109,16 +110,6 @@ func CreateConfigChangeEnts(lg *zap.Logger, ids []uint64, self uint64, term, ind return ents } -// GetEffectiveNodeIdsFromWalEntries returns an ordered set of IDs included in the given snapshot and -// the entries. -// -// Deprecated: use GetEffectiveNodeIDsFromWALEntries instead. -// -//revive:disable-next-line:var-naming -func GetEffectiveNodeIdsFromWalEntries(lg *zap.Logger, snap *raftpb.Snapshot, ents []raftpb.Entry) []uint64 { - return GetEffectiveNodeIDsFromWALEntries(lg, snap, ents) -} - // GetEffectiveNodeIDsFromWALEntries returns an ordered set of IDs included in the given snapshot and // the entries. The given snapshot/entries can contain three kinds of // ID-related entry: From 1c7f0062fc75ed8f8a461f79f758df068c903230 Mon Sep 17 00:00:00 2001 From: huangzw Date: Fri, 21 Feb 2025 15:52:48 +0800 Subject: [PATCH 2/3] chore: adjust import order Signed-off-by: huangzw --- server/storage/util.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/storage/util.go b/server/storage/util.go index ebc83d44745e..fc3f00058b4c 100644 --- a/server/storage/util.go +++ b/server/storage/util.go @@ -19,9 +19,8 @@ import ( "fmt" "sort" - "go.uber.org/zap" - "go.etcd.io/raft/v3/raftpb" + "go.uber.org/zap" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" From 8ce740cb26fd331d0991f86feeb2b5ea72851c8d Mon Sep 17 00:00:00 2001 From: huangzw Date: Fri, 21 Feb 2025 17:07:17 +0800 Subject: [PATCH 3/3] chore: adjust import order Signed-off-by: huangzw --- server/storage/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/storage/util.go b/server/storage/util.go index fc3f00058b4c..8ea2b9b9ba35 100644 --- a/server/storage/util.go +++ b/server/storage/util.go @@ -19,7 +19,6 @@ import ( "fmt" "sort" - "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" "go.etcd.io/etcd/client/pkg/v3/types" @@ -27,6 +26,7 @@ import ( "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/raft/v3/raftpb" ) // AssertNoV2StoreContent -> depending on the deprecation stage, warns or report an error