From 880835c02c2106a0084f18ab7720f21193371a9e Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 26 Jan 2018 11:06:22 -0800 Subject: [PATCH] *: move "store" to "internal/store" Signed-off-by: Gyuho Lee --- etcdctl/ctlv3/command/migrate_command.go | 2 +- etcdserver/api/v2http/client.go | 2 +- etcdserver/api/v2http/client_test.go | 2 +- etcdserver/api/v2v3/store.go | 2 +- etcdserver/api/v2v3/watcher.go | 2 +- etcdserver/apply_v2.go | 2 +- etcdserver/auth/auth_test.go | 2 +- etcdserver/membership/cluster.go | 2 +- etcdserver/membership/cluster_test.go | 2 +- etcdserver/membership/store.go | 2 +- etcdserver/server.go | 2 +- etcdserver/server_test.go | 2 +- etcdserver/v2_server.go | 2 +- {store => internal/store}/doc.go | 0 {store => internal/store}/event.go | 0 {store => internal/store}/event_history.go | 0 {store => internal/store}/event_queue.go | 0 {store => internal/store}/event_test.go | 0 {store => internal/store}/heap_test.go | 0 {store => internal/store}/metrics.go | 0 {store => internal/store}/node.go | 0 {store => internal/store}/node_extern.go | 0 {store => internal/store}/node_extern_test.go | 0 {store => internal/store}/node_test.go | 0 {store => internal/store}/stats.go | 0 {store => internal/store}/stats_test.go | 0 {store => internal/store}/store.go | 0 {store => internal/store}/store_bench_test.go | 0 {store => internal/store}/store_test.go | 2 +- {store => internal/store}/store_ttl_test.go | 0 {store => internal/store}/store_v2_test.go | 2 +- {store => internal/store}/store_v2v3_test.go | 2 +- {store => internal/store}/ttl_key_heap.go | 0 {store => internal/store}/watcher.go | 0 {store => internal/store}/watcher_hub.go | 0 {store => internal/store}/watcher_hub_test.go | 0 {store => internal/store}/watcher_test.go | 0 pkg/mock/mockstore/store_recorder.go | 2 +- snapshot/v3_snapshot.go | 2 +- 39 files changed, 18 insertions(+), 18 deletions(-) rename {store => internal/store}/doc.go (100%) rename {store => internal/store}/event.go (100%) rename {store => internal/store}/event_history.go (100%) rename {store => internal/store}/event_queue.go (100%) rename {store => internal/store}/event_test.go (100%) rename {store => internal/store}/heap_test.go (100%) rename {store => internal/store}/metrics.go (100%) rename {store => internal/store}/node.go (100%) rename {store => internal/store}/node_extern.go (100%) rename {store => internal/store}/node_extern_test.go (100%) rename {store => internal/store}/node_test.go (100%) rename {store => internal/store}/stats.go (100%) rename {store => internal/store}/stats_test.go (100%) rename {store => internal/store}/store.go (100%) rename {store => internal/store}/store_bench_test.go (100%) rename {store => internal/store}/store_test.go (99%) rename {store => internal/store}/store_ttl_test.go (100%) rename {store => internal/store}/store_v2_test.go (97%) rename {store => internal/store}/store_v2v3_test.go (97%) rename {store => internal/store}/ttl_key_heap.go (100%) rename {store => internal/store}/watcher.go (100%) rename {store => internal/store}/watcher_hub.go (100%) rename {store => internal/store}/watcher_hub_test.go (100%) rename {store => internal/store}/watcher_test.go (100%) diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index f9e28ebad..f7db0beac 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -31,13 +31,13 @@ import ( pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/internal/raftsnap" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/store" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" "github.com/gogo/protobuf/proto" diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go index 6aaf3db36..f40c410f6 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -36,8 +36,8 @@ import ( "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/stats" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/store" "github.com/jonboulle/clockwork" ) diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index 44448d0bf..fa6c2d3df 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -35,10 +35,10 @@ import ( "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/store" "github.com/coreos/go-semver/semver" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index 444f93f3a..558506546 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" etcdErr "github.com/coreos/etcd/error" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/store" ) // store implements the Store interface for V2 using diff --git a/etcdserver/api/v2v3/watcher.go b/etcdserver/api/v2v3/watcher.go index 1c2680e74..b421d0c0f 100644 --- a/etcdserver/api/v2v3/watcher.go +++ b/etcdserver/api/v2v3/watcher.go @@ -20,7 +20,7 @@ import ( "github.com/coreos/etcd/clientv3" etcdErr "github.com/coreos/etcd/error" - "github.com/coreos/etcd/store" + "github.com/coreos/etcd/internal/store" ) func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (store.Watcher, error) { diff --git a/etcdserver/apply_v2.go b/etcdserver/apply_v2.go index aefe19d26..4607d09d0 100644 --- a/etcdserver/apply_v2.go +++ b/etcdserver/apply_v2.go @@ -21,8 +21,8 @@ import ( "github.com/coreos/etcd/etcdserver/api" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/store" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/auth/auth_test.go b/etcdserver/auth/auth_test.go index ad32260de..b484cc1c2 100644 --- a/etcdserver/auth/auth_test.go +++ b/etcdserver/auth/auth_test.go @@ -23,7 +23,7 @@ import ( etcderr "github.com/coreos/etcd/error" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/etcdserverpb" - etcdstore "github.com/coreos/etcd/store" + etcdstore "github.com/coreos/etcd/internal/store" ) type fakeDoer struct{} diff --git a/etcdserver/membership/cluster.go b/etcdserver/membership/cluster.go index 4f0b1572e..4aa939675 100644 --- a/etcdserver/membership/cluster.go +++ b/etcdserver/membership/cluster.go @@ -27,12 +27,12 @@ import ( "sync" "time" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/pkg/netutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/store" "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/membership/cluster_test.go b/etcdserver/membership/cluster_test.go index c2ffd25b5..baf55a587 100644 --- a/etcdserver/membership/cluster_test.go +++ b/etcdserver/membership/cluster_test.go @@ -21,11 +21,11 @@ import ( "reflect" "testing" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/pkg/mock/mockstore" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/store" ) func TestClusterMember(t *testing.T) { diff --git a/etcdserver/membership/store.go b/etcdserver/membership/store.go index d3f8f2474..5e878a484 100644 --- a/etcdserver/membership/store.go +++ b/etcdserver/membership/store.go @@ -19,9 +19,9 @@ import ( "fmt" "path" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/store" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/server.go b/etcdserver/server.go index b1f49ebfe..c3ad2d4ba 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -39,6 +39,7 @@ import ( "github.com/coreos/etcd/internal/compactor" "github.com/coreos/etcd/internal/discovery" "github.com/coreos/etcd/internal/raftsnap" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/mvcc" @@ -53,7 +54,6 @@ import ( "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" - "github.com/coreos/etcd/store" "github.com/coreos/etcd/version" "github.com/coreos/etcd/wal" diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 6ae4f6d10..231feccdb 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -29,6 +29,7 @@ import ( pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/internal/raftsnap" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" @@ -44,7 +45,6 @@ import ( "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" - "github.com/coreos/etcd/store" ) // TestDoLocalAction tests requests which do not need to go through raft to be applied, diff --git a/etcdserver/v2_server.go b/etcdserver/v2_server.go index 4b027f18d..986959fe3 100644 --- a/etcdserver/v2_server.go +++ b/etcdserver/v2_server.go @@ -19,7 +19,7 @@ import ( "time" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/store" + "github.com/coreos/etcd/internal/store" ) type RequestV2 pb.Request diff --git a/store/doc.go b/internal/store/doc.go similarity index 100% rename from store/doc.go rename to internal/store/doc.go diff --git a/store/event.go b/internal/store/event.go similarity index 100% rename from store/event.go rename to internal/store/event.go diff --git a/store/event_history.go b/internal/store/event_history.go similarity index 100% rename from store/event_history.go rename to internal/store/event_history.go diff --git a/store/event_queue.go b/internal/store/event_queue.go similarity index 100% rename from store/event_queue.go rename to internal/store/event_queue.go diff --git a/store/event_test.go b/internal/store/event_test.go similarity index 100% rename from store/event_test.go rename to internal/store/event_test.go diff --git a/store/heap_test.go b/internal/store/heap_test.go similarity index 100% rename from store/heap_test.go rename to internal/store/heap_test.go diff --git a/store/metrics.go b/internal/store/metrics.go similarity index 100% rename from store/metrics.go rename to internal/store/metrics.go diff --git a/store/node.go b/internal/store/node.go similarity index 100% rename from store/node.go rename to internal/store/node.go diff --git a/store/node_extern.go b/internal/store/node_extern.go similarity index 100% rename from store/node_extern.go rename to internal/store/node_extern.go diff --git a/store/node_extern_test.go b/internal/store/node_extern_test.go similarity index 100% rename from store/node_extern_test.go rename to internal/store/node_extern_test.go diff --git a/store/node_test.go b/internal/store/node_test.go similarity index 100% rename from store/node_test.go rename to internal/store/node_test.go diff --git a/store/stats.go b/internal/store/stats.go similarity index 100% rename from store/stats.go rename to internal/store/stats.go diff --git a/store/stats_test.go b/internal/store/stats_test.go similarity index 100% rename from store/stats_test.go rename to internal/store/stats_test.go diff --git a/store/store.go b/internal/store/store.go similarity index 100% rename from store/store.go rename to internal/store/store.go diff --git a/store/store_bench_test.go b/internal/store/store_bench_test.go similarity index 100% rename from store/store_bench_test.go rename to internal/store/store_bench_test.go diff --git a/store/store_test.go b/internal/store/store_test.go similarity index 99% rename from store/store_test.go rename to internal/store/store_test.go index 44f72efe4..4e89ee8e6 100644 --- a/store/store_test.go +++ b/internal/store/store_test.go @@ -19,8 +19,8 @@ import ( "time" etcdErr "github.com/coreos/etcd/error" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/store" ) type StoreCloser interface { diff --git a/store/store_ttl_test.go b/internal/store/store_ttl_test.go similarity index 100% rename from store/store_ttl_test.go rename to internal/store/store_ttl_test.go diff --git a/store/store_v2_test.go b/internal/store/store_v2_test.go similarity index 97% rename from store/store_v2_test.go rename to internal/store/store_v2_test.go index 295698177..34984010c 100644 --- a/store/store_v2_test.go +++ b/internal/store/store_v2_test.go @@ -19,8 +19,8 @@ package store_test import ( "testing" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/store" ) type v2TestStore struct { diff --git a/store/store_v2v3_test.go b/internal/store/store_v2v3_test.go similarity index 97% rename from store/store_v2v3_test.go rename to internal/store/store_v2v3_test.go index 323c109d7..ea0dbc34e 100644 --- a/store/store_v2v3_test.go +++ b/internal/store/store_v2v3_test.go @@ -23,7 +23,7 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/etcdserver/api/v2v3" "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/store" + "github.com/coreos/etcd/internal/store" "github.com/coreos/pkg/capnslog" "google.golang.org/grpc/grpclog" diff --git a/store/ttl_key_heap.go b/internal/store/ttl_key_heap.go similarity index 100% rename from store/ttl_key_heap.go rename to internal/store/ttl_key_heap.go diff --git a/store/watcher.go b/internal/store/watcher.go similarity index 100% rename from store/watcher.go rename to internal/store/watcher.go diff --git a/store/watcher_hub.go b/internal/store/watcher_hub.go similarity index 100% rename from store/watcher_hub.go rename to internal/store/watcher_hub.go diff --git a/store/watcher_hub_test.go b/internal/store/watcher_hub_test.go similarity index 100% rename from store/watcher_hub_test.go rename to internal/store/watcher_hub_test.go diff --git a/store/watcher_test.go b/internal/store/watcher_test.go similarity index 100% rename from store/watcher_test.go rename to internal/store/watcher_test.go diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go index 4dad19ee5..f295e5589 100644 --- a/pkg/mock/mockstore/store_recorder.go +++ b/pkg/mock/mockstore/store_recorder.go @@ -17,8 +17,8 @@ package mockstore import ( "time" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/store" ) // StoreRecorder provides a Store interface with a testutil.Recorder diff --git a/snapshot/v3_snapshot.go b/snapshot/v3_snapshot.go index 045f95312..0ed46c70f 100644 --- a/snapshot/v3_snapshot.go +++ b/snapshot/v3_snapshot.go @@ -31,6 +31,7 @@ import ( "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/internal/raftsnap" + "github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" @@ -39,7 +40,6 @@ import ( "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/store" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb"