add list pd command: .pd

Author: c4pt0r

cli/main.go

@@ -54,6 +54,7 @@ var RegisteredCmds = []tcli.Cmd{
 	kvcmds.PrintSysVarsCmd{},
 	kvcmds.SysVarCmd{},
 	opcmds.ListStoresCmd{},
+	opcmds.ListPDCmd{},
 	//opcmds.ConnectCmd{},
 	//opcmds.ConfigEditorCmd{},
 }

client/client.go

@@ -38,7 +38,6 @@ func (kvs KVS) Print() {
 			kvmaps := make([]map[string]interface{}, len(kvs))
 			for i := 0; i < len(kvs); i++ {
 				kvmaps[i] = make(map[string]interface{})
-				//kvmaps[i]["K"], kvmaps[i]["V"] = string(kvs[i].K), string(kvs[i].V)
 				kvmaps[i][string(kvs[i].K)] = string(kvs[i].V)
 			}
 			out, _ := json.MarshalIndent(kvmaps, "", " ")
@@ -105,6 +104,7 @@ type Client interface {
 	GetClientMode() TiKV_MODE
 	GetClusterID() string
 	GetStores() ([]StoreInfo, error)
+	GetPDs() ([]PDInfo, error)
 	GetPDClient() pd.Client
 
 	Put(ctx context.Context, kv KV) error
@@ -145,6 +145,7 @@ type StoreInfo struct {
 	Addr          string
 	State         string
 	StatusAddress string
+	Labels        string
 }
 
 type PDInfo struct {
@@ -153,22 +154,23 @@ type PDInfo struct {
 }
 
 func (StoreInfo) TableTitle() []string {
-	return []string{"Store ID", "Version", "Address", "State", "Status Address"}
+	return []string{"Store ID", "Version", "Address", "State", "Status Address", "Labels"}
 }
 
-func (s *StoreInfo) Flatten() []string {
-	return []string{s.ID, s.Version, s.Addr, s.State, s.StatusAddress}
+func (s StoreInfo) Flatten() []string {
+	return []string{s.ID, s.Version, s.Addr, s.State, s.StatusAddress, s.Labels}
 }
 
 func (s StoreInfo) String() string {
-	return fmt.Sprintf("store_id:\"%s\" version:\"%s\" addr:\"%s\" state:\"%s\" status_addr:\"%s\"", s.ID, s.Version, s.Addr, s.State, s.StatusAddress)
+	return fmt.Sprintf("store_id:\"%s\" version:\"%s\" addr:\"%s\" state:\"%s\" status_addr:\"%s\" labels:\"%s\"",
+		s.ID, s.Version, s.Addr, s.State, s.StatusAddress, s.Labels)
 }
 
 func (p PDInfo) TableTitle() []string {
 	return []string{"Name", "Client URLs"}
 }
 
-func (p *PDInfo) Flatten() []string {
+func (p PDInfo) Flatten() []string {
 	return []string{p.Name, strings.Join(p.ClientURLs, ",")}
 }
 

client/rawkv_client.go

@@ -47,12 +47,15 @@ func (c *rawkvClient) GetClusterID() string {
 }
 
 func (c *rawkvClient) GetStores() ([]StoreInfo, error) {
-	return nil, errors.New("rawkvClient does not support GetStores()")
+	panic("rawkvClient does not support GetStores()")
+}
+
+func (c *rawkvClient) GetPDs() ([]PDInfo, error) {
+	panic("rawkvClient does not support GetPDs()")
 }
 
 func (c *rawkvClient) GetPDClient() pd.Client {
-	log.Fatal("rawkvClient does not support GetPDClient()")
-	return nil
+	panic("rawkvClient does not support GetPDClient()")
 }
 
 func (c *rawkvClient) Put(ctx context.Context, kv KV) error {
@@ -89,6 +92,7 @@ func (c *rawkvClient) Scan(ctx context.Context, prefix []byte) (KVS, int, error)
 	// count only mode will ignore this
 	limit := scanOpts.GetInt(tcli.ScanOptLimit, 100)
 	if countOnly {
+		// BUG, TODO
 		limit = MaxRawKVScanLimit
 	}
 

client/txnkv_client.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/c4pt0r/tcli/utils"
 
@@ -51,12 +52,18 @@ func (c *txnkvClient) GetStores() ([]StoreInfo, error) {
 		return nil, err
 	}
 	for _, store := range stores {
+		labels := store.GetLabels()
+		var strLabels []string
+		for _, label := range labels {
+			strLabels = append(strLabels, fmt.Sprintf("%s=%s", label.Key, label.Value))
+		}
 		ret = append(ret, StoreInfo{
 			ID:            fmt.Sprintf("%d", store.GetId()),
 			Version:       store.GetVersion(),
 			Addr:          store.GetAddress(),
 			State:         store.GetState().String(),
 			StatusAddress: store.GetStatusAddress(),
+			Labels:        strings.Join(strLabels, ","),
 		})
 	}
 	return ret, nil
@@ -227,3 +234,15 @@ func (c *txnkvClient) BatchDelete(ctx context.Context, kvs []KV) error {
 	}
 	return tx.Commit(context.Background())
 }
+
+func (c *txnkvClient) GetPDs() ([]PDInfo, error) {
+	pds, err := c.txnClient.GetPDClient().GetAllMembers(context.TODO())
+	if err != nil {
+		return nil, err
+	}
+	var ret []PDInfo
+	for _, pd := range pds {
+		ret = append(ret, PDInfo{Name: pd.Name, ClientURLs: pd.GetClientUrls()})
+	}
+	return ret, nil
+}

opcmds/cmd_listpd.go

@@ -4,6 +4,8 @@ import (
 	"context"
 
 	"github.com/c4pt0r/tcli"
+	"github.com/c4pt0r/tcli/client"
+	"github.com/c4pt0r/tcli/utils"
 )
 
 type ListPDCmd struct{}
@@ -22,24 +24,20 @@ func (c ListPDCmd) LongHelp() string {
 
 func (c ListPDCmd) Handler() func(ctx context.Context) {
 	return func(ctx context.Context) {
-		/*
-			utils.OutputWithElapse(func() error {
-				pds, err := client.GetTiKVClient().GetPDClient().GetAllMembers(context.TODO())
-				if err != nil {
-					return err
-				}
-
-				var output [][]string = [][]string{
-					(client.PDInfo).TableTitle(client.PDInfo{}),
-				}
-				for _, pd := range pds {
-					//TODO
-					panic("not implemented")
-					//output = append(output, pd.Flatten())
-				}
-				utils.PrintTable(output)
-				return nil
-			})
-		*/
+		utils.OutputWithElapse(func() error {
+			pds, err := client.GetTiKVClient().GetPDs()
+			if err != nil {
+				return err
+			}
+
+			var output [][]string = [][]string{
+				(client.PDInfo).TableTitle(client.PDInfo{}),
+			}
+			for _, pd := range pds {
+				output = append(output, pd.Flatten())
+			}
+			utils.PrintTable(output)
+			return nil
+		})
 	}
 }