feat: bs list dir +flag & fix go.mod replace & list dir cmd

Author: Sindweller

tools-v2/go.mod

@@ -2,6 +2,8 @@ module github.com/opencurve/curve/tools-v2
 
 go 1.19
 
+replace github.com/optiopay/kafka => github.com/cilium/kafka v0.0.0-20180809090225-01ce283b732b
+
 require (
 	github.com/cilium/cilium v1.12.1
 	github.com/deckarep/golang-set/v2 v2.1.0

tools-v2/internal/utils/row.go

@@ -40,6 +40,8 @@ const (
 	ROW_EXPLAIN         = "explain"
 	ROW_EXTERNAL_ADDR   = "externalAddr"
 	ROW_FILE_SIZE       = "fileSize"
+	ROW_FILE_TYPE       = "fileType"
+	ROW_FILE_NAME       = "fileName"
 	ROW_FS_ID           = "fsId"
 	ROW_FS_NAME         = "fsName"
 	ROW_FS_TYPE         = "fsType"
@@ -64,6 +66,7 @@ const (
 	ROW_ORIGINAL_PATH   = "originalPath"
 	ROW_OWNER           = "owner"
 	ROW_PARENT          = "parent"
+	ROW_PARENT_ID       = "parentId"
 	ROW_PARTITION_ID    = "partitionId"
 	ROW_PEER_ADDR       = "peerAddr"
 	ROW_PEER_ID         = "peerId"

tools-v2/pkg/cli/command/curvebs/list/dir/dir.go

@@ -0,0 +1,162 @@
+/*
+ *  Copyright (c) 2022 NetEase Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*
+ * Project: CurveCli
+ * Created Date: 2022-11-17
+ * Author: Sindweller
+ */
+
+package dir
+
+import (
+	"context"
+	cmderror "github.com/opencurve/curve/tools-v2/internal/error"
+	cobrautil "github.com/opencurve/curve/tools-v2/internal/utils"
+	basecmd "github.com/opencurve/curve/tools-v2/pkg/cli/command"
+	"github.com/opencurve/curve/tools-v2/pkg/config"
+	"github.com/opencurve/curve/tools-v2/pkg/output"
+	"github.com/opencurve/curve/tools-v2/proto/proto/nameserver2"
+	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
+)
+
+const (
+	dirExample = `$ curve bs list dir -fileName=/test`
+)
+
+type ListDirRpc struct {
+	Info          *basecmd.Rpc
+	Request       *nameserver2.ListDirRequest
+	curveFSClient nameserver2.CurveFSServiceClient
+}
+
+var _ basecmd.RpcFunc = (*ListDirRpc)(nil) // check interface
+
+type DirCommand struct {
+	basecmd.FinalCurveCmd
+	Rpc []*ListDirRpc
+}
+
+var _ basecmd.FinalCurveCmdFunc = (*DirCommand)(nil) // check interface
+
+func (lRpc *ListDirRpc) NewRpcClient(cc grpc.ClientConnInterface) {
+	lRpc.curveFSClient = nameserver2.NewCurveFSServiceClient(cc)
+}
+
+func (lRpc *ListDirRpc) Stub_Func(ctx context.Context) (interface{}, error) {
+	return lRpc.curveFSClient.ListDir(ctx, lRpc.Request)
+}
+
+func NewDirCommand() *cobra.Command {
+	return NewListDirCommand().Cmd
+}
+
+func NewListDirCommand() *DirCommand {
+	lsCmd := &DirCommand{
+		FinalCurveCmd: basecmd.FinalCurveCmd{
+			Use:     "dir",
+			Short:   "list dir information in curvebs",
+			Example: dirExample,
+		},
+	}
+
+	basecmd.NewFinalCurveCli(&lsCmd.FinalCurveCmd, lsCmd)
+	return lsCmd
+}
+
+// AddFlags implements basecmd.FinalCurveCmdFunc
+func (pCmd *DirCommand) AddFlags() {
+	config.AddBsMdsFlagOption(pCmd.Cmd)
+	config.AddRpcRetryTimesFlag(pCmd.Cmd)
+	config.AddRpcTimeoutFlag(pCmd.Cmd)
+	config.AddBsFileNameOptionFlag(pCmd.Cmd)
+}
+
+// Init implements basecmd.FinalCurveCmdFunc
+func (pCmd *DirCommand) Init(cmd *cobra.Command, args []string) error {
+	mdsAddrs, err := config.GetBsMdsAddrSlice(pCmd.Cmd)
+	if err.TypeCode() != cmderror.CODE_SUCCESS {
+		return err.ToError()
+	}
+
+	timeout := config.GetFlagDuration(pCmd.Cmd, config.RPCTIMEOUT)
+	retrytimes := config.GetFlagInt32(pCmd.Cmd, config.RPCRETRYTIMES)
+	fileName := config.GetBsFlagString(pCmd.Cmd, config.CURVEBS_FILENAME)
+
+	rpc := &ListDirRpc{
+		Request: &nameserver2.ListDirRequest{
+			FileName: &fileName,
+		},
+		Info: basecmd.NewRpc(mdsAddrs, timeout, retrytimes, "ListDir"),
+	}
+	pCmd.Rpc = append(pCmd.Rpc, rpc)
+
+	header := []string{cobrautil.ROW_IP, cobrautil.ROW_PORT}
+	pCmd.SetHeader(header)
+	pCmd.TableNew.SetAutoMergeCellsByColumnIndex(cobrautil.GetIndexSlice(
+		pCmd.Header, header,
+	))
+	return nil
+}
+
+// Print implements basecmd.FinalCurveCmdFunc
+func (pCmd *DirCommand) Print(cmd *cobra.Command, args []string) error {
+	return output.FinalCmdOutput(&pCmd.FinalCurveCmd, pCmd)
+}
+
+// RunCommand implements basecmd.FinalCurveCmdFunc
+func (pCmd *DirCommand) RunCommand(cmd *cobra.Command, args []string) error {
+	var infos []*basecmd.Rpc
+	var funcs []basecmd.RpcFunc
+	for _, rpc := range pCmd.Rpc {
+		infos = append(infos, rpc.Info)
+		funcs = append(funcs, rpc)
+	}
+	results, errs := basecmd.GetRpcListResponse(infos, funcs)
+	if len(errs) == len(infos) {
+		mergeErr := cmderror.MergeCmdErrorExceptSuccess(errs)
+		return mergeErr.ToError()
+	}
+	var errors []*cmderror.CmdError
+	rows := make([]map[string]string, 0)
+	for _, res := range results {
+		infos := res.(*nameserver2.ListDirResponse).GetFileInfo()
+		for _, info := range infos {
+			row := make(map[string]string)
+			row[cobrautil.ROW_FILE_NAME] = info.GetFileName()
+			row[cobrautil.ROW_PARENT_ID] = string(info.GetParentId())
+			// TODO 修改计算size的方式
+			row[cobrautil.ROW_FILE_TYPE] = string(info.GetFileType())
+			row[cobrautil.ROW_OWNER] = info.GetOwner()
+			row[cobrautil.ROW_CTIME] = string(info.GetCtime())
+			rows = append(rows, row)
+		}
+	}
+	list := cobrautil.ListMap2ListSortByKeys(rows, pCmd.Header, []string{
+		cobrautil.ROW_FS_NAME,
+	})
+	pCmd.TableNew.AppendBulk(list)
+	errRet := cmderror.MergeCmdError(errors)
+	pCmd.Error = &errRet
+	pCmd.Result = results
+	return nil
+}
+
+// ResultPlainOutput implements basecmd.FinalCurveCmdFunc
+func (pCmd *DirCommand) ResultPlainOutput() error {
+	return output.FinalCmdOutputPlain(&pCmd.FinalCurveCmd)
+}

tools-v2/pkg/cli/command/curvebs/list/list.go

@@ -25,6 +25,7 @@ package list
 import (
 	basecmd "github.com/opencurve/curve/tools-v2/pkg/cli/command"
 	"github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/list/client"
+	"github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/list/dir"
 	logicalpool "github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/list/logicalPool"
 	"github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/list/server"
 	"github.com/spf13/cobra"
@@ -41,6 +42,7 @@ func (listCmd *ListCommand) AddSubCommands() {
 		logicalpool.NewLogicalPoolCommand(),
 		server.NewServerCommand(),
 		client.NewClientCommand(),
+		dir.NewDirCommand(),
 	)
 }
 

tools-v2/pkg/config/bs.go

@@ -47,6 +47,7 @@ const (
 	CURVEBS_PASSWORD           = "password"
 	VIPER_CURVEBS_PASSWORD     = "curvebs.root.password"
 	CURVEBS_DEFAULT_PASSWORD   = "root_password"
+	CURVEBS_FILENAME           = "fileName"
 )
 
 var (
@@ -126,6 +127,11 @@ func AddBsPasswordOptionFlag(cmd *cobra.Command) {
 	AddBsStringOptionFlag(cmd, CURVEBS_PASSWORD, "user password")
 }
 
+// fileName
+func AddBsFileNameOptionFlag(cmd *cobra.Command) {
+	AddBsStringOptionFlag(cmd, CURVEBS_FILENAME, "file name")
+}
+
 // etcd
 func AddBsEtcdAddrFlag(cmd *cobra.Command) {
 	AddBsStringOptionFlag(cmd, CURVEBS_ETCDADDR, "etcd address, should be like 127.0.0.1:8700,127.0.0.1:8701,127.0.0.1:8702")