From 2bd689acea4769efedf975da49d64f9d66379843 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 21 May 2018 01:20:45 -0700 Subject: [PATCH] etcdserver/api/snap: rename internal package Signed-off-by: Gyuho Lee --- {raftsnap => etcdserver/api/snap}/db.go | 2 +- {raftsnap => etcdserver/api/snap}/doc.go | 4 ++-- {raftsnap => etcdserver/api/snap}/message.go | 2 +- {raftsnap => etcdserver/api/snap}/metrics.go | 2 +- {raftsnap => etcdserver/api/snap}/snappb/snap.pb.go | 0 {raftsnap => etcdserver/api/snap}/snappb/snap.proto | 0 {raftsnap => etcdserver/api/snap}/snapshotter.go | 4 ++-- {raftsnap => etcdserver/api/snap}/snapshotter_test.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename {raftsnap => etcdserver/api/snap}/db.go (99%) rename {raftsnap => etcdserver/api/snap}/doc.go (89%) rename {raftsnap => etcdserver/api/snap}/message.go (99%) rename {raftsnap => etcdserver/api/snap}/metrics.go (98%) rename {raftsnap => etcdserver/api/snap}/snappb/snap.pb.go (100%) rename {raftsnap => etcdserver/api/snap}/snappb/snap.proto (100%) rename {raftsnap => etcdserver/api/snap}/snapshotter.go (99%) rename {raftsnap => etcdserver/api/snap}/snapshotter_test.go (99%) diff --git a/raftsnap/db.go b/etcdserver/api/snap/db.go similarity index 99% rename from raftsnap/db.go rename to etcdserver/api/snap/db.go index a512ead8e..7cb7cfb01 100644 --- a/raftsnap/db.go +++ b/etcdserver/api/snap/db.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package raftsnap +package snap import ( "errors" diff --git a/raftsnap/doc.go b/etcdserver/api/snap/doc.go similarity index 89% rename from raftsnap/doc.go rename to etcdserver/api/snap/doc.go index 68026689e..dcc5db579 100644 --- a/raftsnap/doc.go +++ b/etcdserver/api/snap/doc.go @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package raftsnap handles Raft nodes' states with snapshots. +// Package snap handles Raft nodes' states with snapshots. // The snapshot logic is internal to etcd server and raft package. -package raftsnap +package snap diff --git a/raftsnap/message.go b/etcdserver/api/snap/message.go similarity index 99% rename from raftsnap/message.go rename to etcdserver/api/snap/message.go index 3826b2cb2..d73713ff1 100644 --- a/raftsnap/message.go +++ b/etcdserver/api/snap/message.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package raftsnap +package snap import ( "io" diff --git a/raftsnap/metrics.go b/etcdserver/api/snap/metrics.go similarity index 98% rename from raftsnap/metrics.go rename to etcdserver/api/snap/metrics.go index 9ed7fa871..433ef09d4 100644 --- a/raftsnap/metrics.go +++ b/etcdserver/api/snap/metrics.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package raftsnap +package snap import "github.com/prometheus/client_golang/prometheus" diff --git a/raftsnap/snappb/snap.pb.go b/etcdserver/api/snap/snappb/snap.pb.go similarity index 100% rename from raftsnap/snappb/snap.pb.go rename to etcdserver/api/snap/snappb/snap.pb.go diff --git a/raftsnap/snappb/snap.proto b/etcdserver/api/snap/snappb/snap.proto similarity index 100% rename from raftsnap/snappb/snap.proto rename to etcdserver/api/snap/snappb/snap.proto diff --git a/raftsnap/snapshotter.go b/etcdserver/api/snap/snapshotter.go similarity index 99% rename from raftsnap/snapshotter.go rename to etcdserver/api/snap/snapshotter.go index 9d9639822..c129919a5 100644 --- a/raftsnap/snapshotter.go +++ b/etcdserver/api/snap/snapshotter.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package raftsnap +package snap import ( "errors" @@ -25,11 +25,11 @@ import ( "strings" "time" + "github.com/coreos/etcd/etcdserver/api/snap/snappb" pioutil "github.com/coreos/etcd/pkg/ioutil" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap/snappb" "github.com/coreos/pkg/capnslog" "go.uber.org/zap" diff --git a/raftsnap/snapshotter_test.go b/etcdserver/api/snap/snapshotter_test.go similarity index 99% rename from raftsnap/snapshotter_test.go rename to etcdserver/api/snap/snapshotter_test.go index 841866c6c..fea99449b 100644 --- a/raftsnap/snapshotter_test.go +++ b/etcdserver/api/snap/snapshotter_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package raftsnap +package snap import ( "fmt"