From 7a92bbfed2853339803fe161ee35969648739efc Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 14 May 2018 12:49:49 -0700 Subject: [PATCH] etcdserver/*: move internal v2 packages Signed-off-by: Gyuho Lee --- CHANGELOG-3.4.md | 9 +++++---- contrib/raftexample/raft.go | 2 +- etcdctl/ctlv3/command/migrate_command.go | 4 ++-- etcdserver/api/etcdhttp/base.go | 2 +- etcdserver/{ => api}/v2auth/auth.go | 2 +- etcdserver/{ => api}/v2auth/auth_requests.go | 2 +- etcdserver/{ => api}/v2auth/auth_test.go | 4 ++-- etcdserver/{ => api}/v2error/error.go | 0 etcdserver/{ => api}/v2error/error_test.go | 0 etcdserver/api/v2http/client.go | 8 ++++---- etcdserver/api/v2http/client_auth.go | 2 +- etcdserver/api/v2http/client_auth_test.go | 2 +- etcdserver/api/v2http/client_test.go | 4 ++-- etcdserver/api/v2http/http.go | 2 +- etcdserver/api/v2http/http_test.go | 2 +- etcdserver/api/v2http/metrics.go | 2 +- etcdserver/{stats => api/v2stats}/leader.go | 2 +- etcdserver/{stats => api/v2stats}/queue.go | 2 +- etcdserver/{stats => api/v2stats}/server.go | 2 +- etcdserver/{stats => api/v2stats}/stats.go | 8 +++----- etcdserver/{ => api}/v2store/doc.go | 0 etcdserver/{ => api}/v2store/event.go | 0 etcdserver/{ => api}/v2store/event_history.go | 2 +- etcdserver/{ => api}/v2store/event_queue.go | 0 etcdserver/{ => api}/v2store/event_test.go | 2 +- etcdserver/{ => api}/v2store/heap_test.go | 0 etcdserver/{ => api}/v2store/metrics.go | 0 etcdserver/{ => api}/v2store/node.go | 2 +- etcdserver/{ => api}/v2store/node_extern.go | 0 etcdserver/{ => api}/v2store/node_extern_test.go | 0 etcdserver/{ => api}/v2store/node_test.go | 0 etcdserver/{ => api}/v2store/stats.go | 0 etcdserver/{ => api}/v2store/stats_test.go | 0 etcdserver/{ => api}/v2store/store.go | 2 +- etcdserver/{ => api}/v2store/store_bench_test.go | 0 etcdserver/{ => api}/v2store/store_test.go | 4 ++-- etcdserver/{ => api}/v2store/store_ttl_test.go | 2 +- etcdserver/{ => api}/v2store/store_v2_test.go | 2 +- etcdserver/{ => api}/v2store/store_v2v3_test.go | 2 +- etcdserver/{ => api}/v2store/ttl_key_heap.go | 0 etcdserver/{ => api}/v2store/watcher.go | 0 etcdserver/{ => api}/v2store/watcher_hub.go | 2 +- etcdserver/{ => api}/v2store/watcher_hub_test.go | 0 etcdserver/{ => api}/v2store/watcher_test.go | 0 etcdserver/api/v2v3/store.go | 4 ++-- etcdserver/api/v2v3/watcher.go | 4 ++-- etcdserver/apply_v2.go | 2 +- etcdserver/membership/cluster.go | 2 +- etcdserver/membership/cluster_test.go | 2 +- etcdserver/membership/errors.go | 2 +- etcdserver/membership/store.go | 2 +- etcdserver/server.go | 4 ++-- etcdserver/server_test.go | 2 +- etcdserver/v2_server.go | 2 +- pkg/mock/mockstore/store_recorder.go | 2 +- rafthttp/functional_test.go | 2 +- rafthttp/msgappv2_codec.go | 2 +- rafthttp/msgappv2_codec_test.go | 2 +- rafthttp/peer.go | 2 +- rafthttp/pipeline.go | 2 +- rafthttp/pipeline_test.go | 6 +++--- rafthttp/stream.go | 2 +- rafthttp/stream_test.go | 2 +- rafthttp/transport.go | 2 +- rafthttp/transport_bench_test.go | 2 +- rafthttp/transport_test.go | 3 ++- snapshot/v3_snapshot.go | 2 +- 67 files changed, 69 insertions(+), 69 deletions(-) rename etcdserver/{ => api}/v2auth/auth.go (99%) rename etcdserver/{ => api}/v2auth/auth_requests.go (98%) rename etcdserver/{ => api}/v2auth/auth_test.go (99%) rename etcdserver/{ => api}/v2error/error.go (100%) rename etcdserver/{ => api}/v2error/error_test.go (100%) rename etcdserver/{stats => api/v2stats}/leader.go (99%) rename etcdserver/{stats => api/v2stats}/queue.go (99%) rename etcdserver/{stats => api/v2stats}/server.go (99%) rename etcdserver/{stats => api/v2stats}/stats.go (84%) rename etcdserver/{ => api}/v2store/doc.go (100%) rename etcdserver/{ => api}/v2store/event.go (100%) rename etcdserver/{ => api}/v2store/event_history.go (98%) rename etcdserver/{ => api}/v2store/event_queue.go (100%) rename etcdserver/{ => api}/v2store/event_test.go (98%) rename etcdserver/{ => api}/v2store/heap_test.go (100%) rename etcdserver/{ => api}/v2store/metrics.go (100%) rename etcdserver/{ => api}/v2store/node.go (99%) rename etcdserver/{ => api}/v2store/node_extern.go (100%) rename etcdserver/{ => api}/v2store/node_extern_test.go (100%) rename etcdserver/{ => api}/v2store/node_test.go (100%) rename etcdserver/{ => api}/v2store/stats.go (100%) rename etcdserver/{ => api}/v2store/stats_test.go (100%) rename etcdserver/{ => api}/v2store/store.go (99%) rename etcdserver/{ => api}/v2store/store_bench_test.go (100%) rename etcdserver/{ => api}/v2store/store_test.go (99%) rename etcdserver/{ => api}/v2store/store_ttl_test.go (99%) rename etcdserver/{ => api}/v2store/store_v2_test.go (97%) rename etcdserver/{ => api}/v2store/store_v2v3_test.go (96%) rename etcdserver/{ => api}/v2store/ttl_key_heap.go (100%) rename etcdserver/{ => api}/v2store/watcher.go (100%) rename etcdserver/{ => api}/v2store/watcher_hub.go (99%) rename etcdserver/{ => api}/v2store/watcher_hub_test.go (100%) rename etcdserver/{ => api}/v2store/watcher_test.go (100%) diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index b7876aaa1..ccff34a0a 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -84,11 +84,12 @@ See [code changes](https://github.com/coreos/etcd/compare/v3.3.0...v3.4.0) and [ - Previously, `Repair(dirpath string) bool`, now `Repair(lg *zap.Logger, dirpath string) bool`. - Previously, `Create(dirpath string, metadata []byte) (*WAL, error)`, now `Create(lg *zap.Logger, dirpath string, metadata []byte) (*WAL, error)`. - Remove [`pkg/cors` package](https://github.com/coreos/etcd/pull/9490). +- Change [`--experimental-enable-v2v3`](TODO) flag to `--enable-v2v3`; v2 storage emulation is now stable. - Move internal package `"github.com/coreos/etcd/snap"` to [`"github.com/coreos/etcd/raftsnap"`](https://github.com/coreos/etcd/pull/9211). -- Move internal package `"github.com/coreos/etcd/etcdserver/auth"` to [`"github.com/coreos/etcd/etcdserver/v2auth"`](https://github.com/coreos/etcd/pull/9275). -- Move internal package `"github.com/coreos/etcd/error"` to [`"github.com/coreos/etcd/etcdserver/v2error"`](https://github.com/coreos/etcd/pull/9274). -- Move internal package `"github.com/coreos/etcd/store"` to [`"github.com/coreos/etcd/etcdserver/v2store"`](https://github.com/coreos/etcd/pull/9274). -- [`--experimental-enable-v2v3`](TODO) has been deprecated, `--enable-v2v3` flag is now stable. +- Move internal package `"github.com/coreos/etcd/etcdserver/auth"` to `"github.com/coreos/etcd/etcdserver/api/v2auth"`. +- Move internal package `"github.com/coreos/etcd/etcdserver/stats"` to `"github.com/coreos/etcd/etcdserver/api/v2stats"`. +- Move internal package `"github.com/coreos/etcd/error"` to `"github.com/coreos/etcd/etcdserver/api/v2error"`. +- Move internal package `"github.com/coreos/etcd/store"` to `"github.com/coreos/etcd/etcdserver/api/v2store"`. ### Dependency diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index 5b762aa29..0774ceed7 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -24,7 +24,7 @@ import ( "strconv" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index 0a03bba34..739ec4bfa 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -27,10 +27,10 @@ import ( "github.com/coreos/etcd/client" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api" + "github.com/coreos/etcd/etcdserver/api/v2error" + "github.com/coreos/etcd/etcdserver/api/v2store" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/etcdserver/v2error" - "github.com/coreos/etcd/etcdserver/v2store" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go index f6489c971..eb179c9f0 100644 --- a/etcdserver/api/etcdhttp/base.go +++ b/etcdserver/api/etcdhttp/base.go @@ -23,8 +23,8 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/etcdserver/v2error" "github.com/coreos/etcd/pkg/logutil" "github.com/coreos/etcd/version" diff --git a/etcdserver/v2auth/auth.go b/etcdserver/api/v2auth/auth.go similarity index 99% rename from etcdserver/v2auth/auth.go rename to etcdserver/api/v2auth/auth.go index 685d8b696..70a74e1b1 100644 --- a/etcdserver/v2auth/auth.go +++ b/etcdserver/api/v2auth/auth.go @@ -27,8 +27,8 @@ import ( "time" "github.com/coreos/etcd/etcdserver" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/v2error" "github.com/coreos/etcd/pkg/types" "github.com/coreos/pkg/capnslog" diff --git a/etcdserver/v2auth/auth_requests.go b/etcdserver/api/v2auth/auth_requests.go similarity index 98% rename from etcdserver/v2auth/auth_requests.go rename to etcdserver/api/v2auth/auth_requests.go index 2127bdb2f..fb47866b7 100644 --- a/etcdserver/v2auth/auth_requests.go +++ b/etcdserver/api/v2auth/auth_requests.go @@ -20,8 +20,8 @@ import ( "path" "github.com/coreos/etcd/etcdserver" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/v2error" "go.uber.org/zap" ) diff --git a/etcdserver/v2auth/auth_test.go b/etcdserver/api/v2auth/auth_test.go similarity index 99% rename from etcdserver/v2auth/auth_test.go rename to etcdserver/api/v2auth/auth_test.go index 58f8401d7..2171bda8a 100644 --- a/etcdserver/v2auth/auth_test.go +++ b/etcdserver/api/v2auth/auth_test.go @@ -21,9 +21,9 @@ import ( "time" "github.com/coreos/etcd/etcdserver" + "github.com/coreos/etcd/etcdserver/api/v2error" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/v2error" - "github.com/coreos/etcd/etcdserver/v2store" "go.uber.org/zap" ) diff --git a/etcdserver/v2error/error.go b/etcdserver/api/v2error/error.go similarity index 100% rename from etcdserver/v2error/error.go rename to etcdserver/api/v2error/error.go diff --git a/etcdserver/v2error/error_test.go b/etcdserver/api/v2error/error_test.go similarity index 100% rename from etcdserver/v2error/error_test.go rename to etcdserver/api/v2error/error_test.go diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go index 153c6415f..a3b85ade1 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -30,13 +30,13 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api" "github.com/coreos/etcd/etcdserver/api/etcdhttp" + "github.com/coreos/etcd/etcdserver/api/v2auth" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/etcdserver/v2auth" - "github.com/coreos/etcd/etcdserver/v2error" - "github.com/coreos/etcd/etcdserver/v2store" "github.com/coreos/etcd/pkg/types" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2http/client_auth.go b/etcdserver/api/v2http/client_auth.go index edf4c9ebb..539e91ce4 100644 --- a/etcdserver/api/v2http/client_auth.go +++ b/etcdserver/api/v2http/client_auth.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/coreos/etcd/etcdserver/api" + "github.com/coreos/etcd/etcdserver/api/v2auth" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/etcdserver/v2auth" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_auth_test.go b/etcdserver/api/v2http/client_auth_test.go index 695155702..f4fc2fbdf 100644 --- a/etcdserver/api/v2http/client_auth_test.go +++ b/etcdserver/api/v2http/client_auth_test.go @@ -31,7 +31,7 @@ import ( "testing" "github.com/coreos/etcd/etcdserver/api" - "github.com/coreos/etcd/etcdserver/v2auth" + "github.com/coreos/etcd/etcdserver/api/v2auth" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index 78fcdcbf4..78625b552 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -31,11 +31,11 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/etcdserver/v2error" - "github.com/coreos/etcd/etcdserver/v2store" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go index fc1f5894a..892d202ba 100644 --- a/etcdserver/api/v2http/http.go +++ b/etcdserver/api/v2http/http.go @@ -21,8 +21,8 @@ import ( "time" "github.com/coreos/etcd/etcdserver/api/etcdhttp" + "github.com/coreos/etcd/etcdserver/api/v2auth" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/etcdserver/v2auth" "github.com/coreos/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go index 30e1945f7..e9fce30f7 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/coreos/etcd/etcdserver" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/etcdserver/v2error" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" diff --git a/etcdserver/api/v2http/metrics.go b/etcdserver/api/v2http/metrics.go index f8fa2b30b..39d2d043e 100644 --- a/etcdserver/api/v2http/metrics.go +++ b/etcdserver/api/v2http/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/v2error" "github.com/prometheus/client_golang/prometheus" ) diff --git a/etcdserver/stats/leader.go b/etcdserver/api/v2stats/leader.go similarity index 99% rename from etcdserver/stats/leader.go rename to etcdserver/api/v2stats/leader.go index 8f6a54ff7..ca47f0f37 100644 --- a/etcdserver/stats/leader.go +++ b/etcdserver/api/v2stats/leader.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package stats +package v2stats import ( "encoding/json" diff --git a/etcdserver/stats/queue.go b/etcdserver/api/v2stats/queue.go similarity index 99% rename from etcdserver/stats/queue.go rename to etcdserver/api/v2stats/queue.go index 635074c48..2c3dff3d0 100644 --- a/etcdserver/stats/queue.go +++ b/etcdserver/api/v2stats/queue.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package stats +package v2stats import ( "sync" diff --git a/etcdserver/stats/server.go b/etcdserver/api/v2stats/server.go similarity index 99% rename from etcdserver/stats/server.go rename to etcdserver/api/v2stats/server.go index b026e4480..f80136907 100644 --- a/etcdserver/stats/server.go +++ b/etcdserver/api/v2stats/server.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package stats +package v2stats import ( "encoding/json" diff --git a/etcdserver/stats/stats.go b/etcdserver/api/v2stats/stats.go similarity index 84% rename from etcdserver/stats/stats.go rename to etcdserver/api/v2stats/stats.go index 2b5f7071a..326f03e87 100644 --- a/etcdserver/stats/stats.go +++ b/etcdserver/api/v2stats/stats.go @@ -12,14 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package stats defines a standard interface for etcd cluster statistics. -package stats +// Package v2stats defines a standard interface for etcd cluster statistics. +package v2stats import "github.com/coreos/pkg/capnslog" -var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/stats") -) +var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/stats") type Stats interface { // SelfStats returns the struct representing statistics of this server diff --git a/etcdserver/v2store/doc.go b/etcdserver/api/v2store/doc.go similarity index 100% rename from etcdserver/v2store/doc.go rename to etcdserver/api/v2store/doc.go diff --git a/etcdserver/v2store/event.go b/etcdserver/api/v2store/event.go similarity index 100% rename from etcdserver/v2store/event.go rename to etcdserver/api/v2store/event.go diff --git a/etcdserver/v2store/event_history.go b/etcdserver/api/v2store/event_history.go similarity index 98% rename from etcdserver/v2store/event_history.go rename to etcdserver/api/v2store/event_history.go index a3c600683..6948233d6 100644 --- a/etcdserver/v2store/event_history.go +++ b/etcdserver/api/v2store/event_history.go @@ -20,7 +20,7 @@ import ( "strings" "sync" - "github.com/coreos/etcd/etcdserver/v2error" + "github.com/coreos/etcd/etcdserver/api/v2error" ) type EventHistory struct { diff --git a/etcdserver/v2store/event_queue.go b/etcdserver/api/v2store/event_queue.go similarity index 100% rename from etcdserver/v2store/event_queue.go rename to etcdserver/api/v2store/event_queue.go diff --git a/etcdserver/v2store/event_test.go b/etcdserver/api/v2store/event_test.go similarity index 98% rename from etcdserver/v2store/event_test.go rename to etcdserver/api/v2store/event_test.go index 0b3592394..e9c3ceb71 100644 --- a/etcdserver/v2store/event_test.go +++ b/etcdserver/api/v2store/event_test.go @@ -17,7 +17,7 @@ package v2store import ( "testing" - "github.com/coreos/etcd/etcdserver/v2error" + "github.com/coreos/etcd/etcdserver/api/v2error" ) // TestEventQueue tests a queue with capacity = 100 diff --git a/etcdserver/v2store/heap_test.go b/etcdserver/api/v2store/heap_test.go similarity index 100% rename from etcdserver/v2store/heap_test.go rename to etcdserver/api/v2store/heap_test.go diff --git a/etcdserver/v2store/metrics.go b/etcdserver/api/v2store/metrics.go similarity index 100% rename from etcdserver/v2store/metrics.go rename to etcdserver/api/v2store/metrics.go diff --git a/etcdserver/v2store/node.go b/etcdserver/api/v2store/node.go similarity index 99% rename from etcdserver/v2store/node.go rename to etcdserver/api/v2store/node.go index c6aadbfa2..490564404 100644 --- a/etcdserver/v2store/node.go +++ b/etcdserver/api/v2store/node.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "github.com/coreos/etcd/etcdserver/v2error" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/v2store/node_extern.go b/etcdserver/api/v2store/node_extern.go similarity index 100% rename from etcdserver/v2store/node_extern.go rename to etcdserver/api/v2store/node_extern.go diff --git a/etcdserver/v2store/node_extern_test.go b/etcdserver/api/v2store/node_extern_test.go similarity index 100% rename from etcdserver/v2store/node_extern_test.go rename to etcdserver/api/v2store/node_extern_test.go diff --git a/etcdserver/v2store/node_test.go b/etcdserver/api/v2store/node_test.go similarity index 100% rename from etcdserver/v2store/node_test.go rename to etcdserver/api/v2store/node_test.go diff --git a/etcdserver/v2store/stats.go b/etcdserver/api/v2store/stats.go similarity index 100% rename from etcdserver/v2store/stats.go rename to etcdserver/api/v2store/stats.go diff --git a/etcdserver/v2store/stats_test.go b/etcdserver/api/v2store/stats_test.go similarity index 100% rename from etcdserver/v2store/stats_test.go rename to etcdserver/api/v2store/stats_test.go diff --git a/etcdserver/v2store/store.go b/etcdserver/api/v2store/store.go similarity index 99% rename from etcdserver/v2store/store.go rename to etcdserver/api/v2store/store.go index ff03d9a7b..e6d0f32d0 100644 --- a/etcdserver/v2store/store.go +++ b/etcdserver/api/v2store/store.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/v2error" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/pkg/types" "github.com/jonboulle/clockwork" diff --git a/etcdserver/v2store/store_bench_test.go b/etcdserver/api/v2store/store_bench_test.go similarity index 100% rename from etcdserver/v2store/store_bench_test.go rename to etcdserver/api/v2store/store_bench_test.go diff --git a/etcdserver/v2store/store_test.go b/etcdserver/api/v2store/store_test.go similarity index 99% rename from etcdserver/v2store/store_test.go rename to etcdserver/api/v2store/store_test.go index 58b5bf1d5..b8de68615 100644 --- a/etcdserver/v2store/store_test.go +++ b/etcdserver/api/v2store/store_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/v2error" - "github.com/coreos/etcd/etcdserver/v2store" + "github.com/coreos/etcd/etcdserver/api/v2error" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/pkg/testutil" ) diff --git a/etcdserver/v2store/store_ttl_test.go b/etcdserver/api/v2store/store_ttl_test.go similarity index 99% rename from etcdserver/v2store/store_ttl_test.go rename to etcdserver/api/v2store/store_ttl_test.go index 4f7201979..45c0e3648 100644 --- a/etcdserver/v2store/store_ttl_test.go +++ b/etcdserver/api/v2store/store_ttl_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/v2error" + "github.com/coreos/etcd/etcdserver/api/v2error" "github.com/coreos/etcd/pkg/testutil" "github.com/jonboulle/clockwork" diff --git a/etcdserver/v2store/store_v2_test.go b/etcdserver/api/v2store/store_v2_test.go similarity index 97% rename from etcdserver/v2store/store_v2_test.go rename to etcdserver/api/v2store/store_v2_test.go index 39e0745ff..18d598acf 100644 --- a/etcdserver/v2store/store_v2_test.go +++ b/etcdserver/api/v2store/store_v2_test.go @@ -19,7 +19,7 @@ package v2store_test import ( "testing" - "github.com/coreos/etcd/etcdserver/v2store" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/pkg/testutil" ) diff --git a/etcdserver/v2store/store_v2v3_test.go b/etcdserver/api/v2store/store_v2v3_test.go similarity index 96% rename from etcdserver/v2store/store_v2v3_test.go rename to etcdserver/api/v2store/store_v2v3_test.go index 4d2703c40..12ad2b2c9 100644 --- a/etcdserver/v2store/store_v2v3_test.go +++ b/etcdserver/api/v2store/store_v2v3_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/coreos/etcd/clientv3" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/etcdserver/api/v2v3" - "github.com/coreos/etcd/etcdserver/v2store" "github.com/coreos/etcd/integration" "google.golang.org/grpc/grpclog" diff --git a/etcdserver/v2store/ttl_key_heap.go b/etcdserver/api/v2store/ttl_key_heap.go similarity index 100% rename from etcdserver/v2store/ttl_key_heap.go rename to etcdserver/api/v2store/ttl_key_heap.go diff --git a/etcdserver/v2store/watcher.go b/etcdserver/api/v2store/watcher.go similarity index 100% rename from etcdserver/v2store/watcher.go rename to etcdserver/api/v2store/watcher.go diff --git a/etcdserver/v2store/watcher_hub.go b/etcdserver/api/v2store/watcher_hub.go similarity index 99% rename from etcdserver/v2store/watcher_hub.go rename to etcdserver/api/v2store/watcher_hub.go index 9da652d5f..aa4088016 100644 --- a/etcdserver/v2store/watcher_hub.go +++ b/etcdserver/api/v2store/watcher_hub.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/coreos/etcd/etcdserver/v2error" + "github.com/coreos/etcd/etcdserver/api/v2error" ) // A watcherHub contains all subscribed watchers diff --git a/etcdserver/v2store/watcher_hub_test.go b/etcdserver/api/v2store/watcher_hub_test.go similarity index 100% rename from etcdserver/v2store/watcher_hub_test.go rename to etcdserver/api/v2store/watcher_hub_test.go diff --git a/etcdserver/v2store/watcher_test.go b/etcdserver/api/v2store/watcher_test.go similarity index 100% rename from etcdserver/v2store/watcher_test.go rename to etcdserver/api/v2store/watcher_test.go diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index 9efd1dc37..3d78e7b90 100644 --- a/etcdserver/api/v2v3/store.go +++ b/etcdserver/api/v2v3/store.go @@ -24,8 +24,8 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/v2error" - "github.com/coreos/etcd/etcdserver/v2store" + "github.com/coreos/etcd/etcdserver/api/v2error" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/mvcc/mvccpb" ) diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go index 39b848683..c8858e84f 100644 --- a/etcdserver/api/v2v3/watcher.go +++ b/etcdserver/api/v2v3/watcher.go @@ -19,8 +19,8 @@ import ( "strings" "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/v2error" - "github.com/coreos/etcd/etcdserver/v2store" + "github.com/coreos/etcd/etcdserver/api/v2error" + "github.com/coreos/etcd/etcdserver/api/v2store" ) func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (v2store.Watcher, error) { diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go index 1a710e56c..c750f80f2 100644 --- a/etcdserver/apply_v2.go +++ b/etcdserver/apply_v2.go @@ -20,8 +20,8 @@ import ( "time" "github.com/coreos/etcd/etcdserver/api" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/etcdserver/v2store" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/membership/cluster.go b/etcdserver/membership/cluster.go index 978d2a545..a0b6be412 100644 --- a/etcdserver/membership/cluster.go +++ b/etcdserver/membership/cluster.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/v2store" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/pkg/netutil" "github.com/coreos/etcd/pkg/types" diff --git a/etcdserver/membership/cluster_test.go b/etcdserver/membership/cluster_test.go index e5c2333c9..f8ddc243d 100644 --- a/etcdserver/membership/cluster_test.go +++ b/etcdserver/membership/cluster_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/etcdserver/v2store" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/pkg/mock/mockstore" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" diff --git a/etcdserver/membership/errors.go b/etcdserver/membership/errors.go index c0a4acc56..9bdfa1b68 100644 --- a/etcdserver/membership/errors.go +++ b/etcdserver/membership/errors.go @@ -17,7 +17,7 @@ package membership import ( "errors" - "github.com/coreos/etcd/etcdserver/v2error" + "github.com/coreos/etcd/etcdserver/api/v2error" ) var ( diff --git a/etcdserver/membership/store.go b/etcdserver/membership/store.go index 3106aca37..c023c920f 100644 --- a/etcdserver/membership/store.go +++ b/etcdserver/membership/store.go @@ -19,7 +19,7 @@ import ( "fmt" "path" - "github.com/coreos/etcd/etcdserver/v2store" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/pkg/types" diff --git a/etcdserver/server.go b/etcdserver/server.go index c27716e41..12682b29b 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -35,10 +35,10 @@ import ( "github.com/coreos/etcd/discovery" "github.com/coreos/etcd/etcdserver/api" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" + "github.com/coreos/etcd/etcdserver/api/v2store" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/etcdserver/v2store" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/mvcc" diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 5e30aa8a6..0ef6cfb93 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -29,9 +29,9 @@ import ( "go.uber.org/zap" + "github.com/coreos/etcd/etcdserver/api/v2store" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/etcdserver/v2store" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" diff --git a/etcdserver/v2_server.go b/etcdserver/v2_server.go index 1be5650f6..3a6468cd8 100644 --- a/etcdserver/v2_server.go +++ b/etcdserver/v2_server.go @@ -18,8 +18,8 @@ import ( "context" "time" + "github.com/coreos/etcd/etcdserver/api/v2store" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/v2store" ) type RequestV2 pb.Request diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go index cccd95423..031f31c0c 100644 --- a/pkg/mock/mockstore/store_recorder.go +++ b/pkg/mock/mockstore/store_recorder.go @@ -17,7 +17,7 @@ package mockstore import ( "time" - "github.com/coreos/etcd/etcdserver/v2store" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/pkg/testutil" ) diff --git a/rafthttp/functional_test.go b/rafthttp/functional_test.go index 2a04a91cd..87ac5f042 100644 --- a/rafthttp/functional_test.go +++ b/rafthttp/functional_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" diff --git a/rafthttp/msgappv2_codec.go b/rafthttp/msgappv2_codec.go index 7f78b35b0..18ff16b70 100644 --- a/rafthttp/msgappv2_codec.go +++ b/rafthttp/msgappv2_codec.go @@ -20,7 +20,7 @@ import ( "io" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" diff --git a/rafthttp/msgappv2_codec_test.go b/rafthttp/msgappv2_codec_test.go index 394c63f09..dff412b04 100644 --- a/rafthttp/msgappv2_codec_test.go +++ b/rafthttp/msgappv2_codec_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" ) diff --git a/rafthttp/peer.go b/rafthttp/peer.go index 258e6f03a..ffaa2a7bc 100644 --- a/rafthttp/peer.go +++ b/rafthttp/peer.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" diff --git a/rafthttp/pipeline.go b/rafthttp/pipeline.go index afbe9d306..6e6704f58 100644 --- a/rafthttp/pipeline.go +++ b/rafthttp/pipeline.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" diff --git a/rafthttp/pipeline_test.go b/rafthttp/pipeline_test.go index c3b65a3e1..201427e21 100644 --- a/rafthttp/pipeline_test.go +++ b/rafthttp/pipeline_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "go.uber.org/zap" - - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/version" + + "go.uber.org/zap" ) // TestPipelineSend tests that pipeline could send data using roundtripper diff --git a/rafthttp/stream.go b/rafthttp/stream.go index 190504057..f6cda71a3 100644 --- a/rafthttp/stream.go +++ b/rafthttp/stream.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/httputil" "github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/types" diff --git a/rafthttp/stream_test.go b/rafthttp/stream_test.go index 411791abe..535dcfa11 100644 --- a/rafthttp/stream_test.go +++ b/rafthttp/stream_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" diff --git a/rafthttp/transport.go b/rafthttp/transport.go index f0b587451..27d37a12e 100644 --- a/rafthttp/transport.go +++ b/rafthttp/transport.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/logutil" "github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/types" diff --git a/rafthttp/transport_bench_test.go b/rafthttp/transport_bench_test.go index cd586461f..f34e72465 100644 --- a/rafthttp/transport_bench_test.go +++ b/rafthttp/transport_bench_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" diff --git a/rafthttp/transport_test.go b/rafthttp/transport_test.go index e4cf37154..a59e97cdc 100644 --- a/rafthttp/transport_test.go +++ b/rafthttp/transport_test.go @@ -20,10 +20,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/stats" + stats "github.com/coreos/etcd/etcdserver/api/v2stats" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" + "github.com/xiang90/probing" ) diff --git a/snapshot/v3_snapshot.go b/snapshot/v3_snapshot.go index df8c35716..e900a2d7b 100644 --- a/snapshot/v3_snapshot.go +++ b/snapshot/v3_snapshot.go @@ -29,9 +29,9 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/etcdserver" + "github.com/coreos/etcd/etcdserver/api/v2store" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/etcdserver/v2store" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend"