etcdctl/ctlv3: use "snapshot" package

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
etcd-io · Jan 8, 2018 · 6e82d57 · 6e82d57
1 parent 7ec33ab
commit 6e82d57
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 337 deletions.
diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go
@@ -20,6 +20,7 @@ import (
 	"strings"
 
 	v3 "github.com/coreos/etcd/clientv3"
+	"github.com/coreos/etcd/snapshot"
 	"github.com/dustin/go-humanize"
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
@@ -48,7 +49,7 @@ type printer interface {
 	MoveLeader(leader, target uint64, r v3.MoveLeaderResponse)
 
 	Alarm(v3.AlarmResponse)
-	DBStatus(dbstatus)
+	DBStatus(snapshot.DBStatus)
 
 	RoleAdd(role string, r v3.AuthRoleAddResponse)
 	RoleGet(role string, r v3.AuthRoleGetResponse)
@@ -148,9 +149,9 @@ func newPrinterUnsupported(n string) printer {
 	return &printerUnsupported{printerRPC{nil, f}}
 }
 
-func (p *printerUnsupported) EndpointStatus([]epStatus) { p.p(nil) }
-func (p *printerUnsupported) EndpointHashKV([]epHashKV) { p.p(nil) }
-func (p *printerUnsupported) DBStatus(dbstatus)         { p.p(nil) }
+func (p *printerUnsupported) EndpointStatus([]epStatus)  { p.p(nil) }
+func (p *printerUnsupported) EndpointHashKV([]epHashKV)  { p.p(nil) }
+func (p *printerUnsupported) DBStatus(snapshot.DBStatus) { p.p(nil) }
 
 func (p *printerUnsupported) MoveLeader(leader, target uint64, r v3.MoveLeaderResponse) { p.p(nil) }
 
@@ -199,7 +200,7 @@ func makeEndpointHashKVTable(hashList []epHashKV) (hdr []string, rows [][]string
 	return hdr, rows
 }
 
-func makeDBStatusTable(ds dbstatus) (hdr []string, rows [][]string) {
+func makeDBStatusTable(ds snapshot.DBStatus) (hdr []string, rows [][]string) {
 	hdr = []string{"hash", "revision", "total keys", "total size"}
 	rows = append(rows, []string{
 		fmt.Sprintf("%x", ds.Hash),

diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go
@@ -20,6 +20,7 @@ import (
 	v3 "github.com/coreos/etcd/clientv3"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	spb "github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/snapshot"
 )
 
 type fieldsPrinter struct{ printer }
@@ -171,7 +172,7 @@ func (p *fieldsPrinter) Alarm(r v3.AlarmResponse) {
 	}
 }
 
-func (p *fieldsPrinter) DBStatus(r dbstatus) {
+func (p *fieldsPrinter) DBStatus(r snapshot.DBStatus) {
 	fmt.Println(`"Hash" :`, r.Hash)
 	fmt.Println(`"Revision" :`, r.Revision)
 	fmt.Println(`"Keys" :`, r.TotalKey)

diff --git a/etcdctl/ctlv3/command/printer_json.go b/etcdctl/ctlv3/command/printer_json.go
@@ -18,6 +18,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+
+	"github.com/coreos/etcd/snapshot"
 )
 
 type jsonPrinter struct{ printer }
@@ -28,9 +30,9 @@ func newJSONPrinter() printer {
 	}
 }
 
-func (p *jsonPrinter) EndpointStatus(r []epStatus) { printJSON(r) }
-func (p *jsonPrinter) EndpointHashKV(r []epHashKV) { printJSON(r) }
-func (p *jsonPrinter) DBStatus(r dbstatus)         { printJSON(r) }
+func (p *jsonPrinter) EndpointStatus(r []epStatus)  { printJSON(r) }
+func (p *jsonPrinter) EndpointHashKV(r []epHashKV)  { printJSON(r) }
+func (p *jsonPrinter) DBStatus(r snapshot.DBStatus) { printJSON(r) }
 
 func printJSON(v interface{}) {
 	b, err := json.Marshal(v)

diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go
@@ -21,6 +21,7 @@ import (
 	v3 "github.com/coreos/etcd/clientv3"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/pkg/types"
+	"github.com/coreos/etcd/snapshot"
 )
 
 type simplePrinter struct {
@@ -155,7 +156,7 @@ func (s *simplePrinter) EndpointHashKV(hashList []epHashKV) {
 	}
 }
 
-func (s *simplePrinter) DBStatus(ds dbstatus) {
+func (s *simplePrinter) DBStatus(ds snapshot.DBStatus) {
 	_, rows := makeDBStatusTable(ds)
 	for _, row := range rows {
 		fmt.Println(strings.Join(row, ", "))

diff --git a/etcdctl/ctlv3/command/printer_table.go b/etcdctl/ctlv3/command/printer_table.go
@@ -20,6 +20,7 @@ import (
 	"github.com/olekukonko/tablewriter"
 
 	v3 "github.com/coreos/etcd/clientv3"
+	"github.com/coreos/etcd/snapshot"
 )
 
 type tablePrinter struct{ printer }
@@ -54,7 +55,7 @@ func (tp *tablePrinter) EndpointHashKV(r []epHashKV) {
 	table.SetAlignment(tablewriter.ALIGN_RIGHT)
 	table.Render()
 }
-func (tp *tablePrinter) DBStatus(r dbstatus) {
+func (tp *tablePrinter) DBStatus(r snapshot.DBStatus) {
 	hdr, rows := makeDBStatusTable(r)
 	table := tablewriter.NewWriter(os.Stdout)
 	table.SetHeader(hdr)