simplify parse config and delete error.go (pingcap#174)

* simplify main.go

* delete error.go

* address comment

dumpling/cmd/dumpling/main.go

@@ -19,13 +19,7 @@ import (
 	"fmt"
 	_ "net/http/pprof"
 	"os"
-	"strconv"
-	"strings"
-	"time"
 
-	"github.com/docker/go-units"
-	"github.com/pingcap/br/pkg/storage"
-	filter "github.com/pingcap/tidb-tools/pkg/table-filter"
 	"github.com/spf13/pflag"
 	"go.uber.org/zap"
 
@@ -34,195 +28,28 @@ import (
 	"github.com/pingcap/dumpling/v4/log"
 )
 
-var (
-	databases               []string
-	tablesList              []string
-	host                    string
-	user                    string
-	port                    int
-	password                string
-	allowCleartextPasswords bool
-	threads                 int
-	outputDir               string
-	fileSizeStr             string
-	statementSize           uint64
-	logLevel                string
-	logFile                 string
-	logFormat               string
-	consistency             string
-	snapshot                string
-	noViews                 bool
-	statusAddr              string
-	rows                    uint64
-	where                   string
-	fileType                string
-	noHeader                bool
-	noSchemas               bool
-	noData                  bool
-	csvNullValue            string
-	sql                     string
-	filters                 []string
-	caseSensitive           bool
-	caPath                  string
-	certPath                string
-	keyPath                 string
-	csvSeparator            string
-	csvDelimiter            string
-	sessionParams           map[string]string
-
-	completeInsert       bool
-	dumpEmptyDatabase    bool
-	escapeBackslash      bool
-	tidbMemQuotaQuery    uint64
-	outputFilenameFormat string
-)
-
-var defaultOutputDir = timestampDirName()
-
-func timestampDirName() string {
-	return fmt.Sprintf("./export-%s", time.Now().Format(time.RFC3339))
-}
-
 func main() {
 	pflag.Usage = func() {
 		fmt.Fprint(os.Stderr, "Dumpling is a CLI tool that helps you dump MySQL/TiDB data\n\nUsage:\n  dumpling [flags]\n\nFlags:\n")
 		pflag.PrintDefaults()
 	}
 	pflag.ErrHelp = errors.New("")
 
-	pflag.StringSliceVarP(&databases, "database", "B", nil, "Databases to dump")
-	pflag.StringSliceVarP(&tablesList, "tables-list", "T", nil, "Comma delimited table list to dump; must be qualified table names")
-	pflag.StringVarP(&host, "host", "h", "127.0.0.1", "The host to connect to")
-	pflag.StringVarP(&user, "user", "u", "root", "Username with privileges to run the dump")
-	pflag.IntVarP(&port, "port", "P", 4000, "TCP/IP port to connect to")
-	pflag.StringVarP(&password, "password", "p", "", "User password")
-	pflag.BoolVar(&allowCleartextPasswords, "allow-cleartext-passwords", false, "Allow passwords to be sent in cleartext (warning: don't use without TLS)")
-	pflag.IntVarP(&threads, "threads", "t", 4, "Number of goroutines to use, default 4")
-	pflag.StringVarP(&fileSizeStr, "filesize", "F", "", "The approximate size of output file")
-	pflag.Uint64VarP(&statementSize, "statement-size", "s", export.DefaultStatementSize, "Attempted size of INSERT statement in bytes")
-	pflag.StringVarP(&outputDir, "output", "o", defaultOutputDir, "Output directory")
-	pflag.StringVar(&logLevel, "loglevel", "info", "Log level: {debug|info|warn|error|dpanic|panic|fatal}")
-	pflag.StringVarP(&logFile, "logfile", "L", "", "Log file `path`, leave empty to write to console")
-	pflag.StringVar(&logFormat, "logfmt", "text", "Log `format`: {text|json}")
-	pflag.StringVar(&consistency, "consistency", "auto", "Consistency level during dumping: {auto|none|flush|lock|snapshot}")
-	pflag.StringVar(&snapshot, "snapshot", "", "Snapshot position (uint64 from pd timestamp for TiDB). Valid only when consistency=snapshot")
-	pflag.BoolVarP(&noViews, "no-views", "W", true, "Do not dump views")
-	pflag.StringVar(&statusAddr, "status-addr", ":8281", "dumpling API server and pprof addr")
-	pflag.Uint64VarP(&rows, "rows", "r", export.UnspecifiedSize, "Split table into chunks of this many rows, default unlimited")
-	pflag.StringVar(&where, "where", "", "Dump only selected records")
-	pflag.BoolVar(&escapeBackslash, "escape-backslash", true, "use backslash to escape special characters")
-	pflag.StringVar(&fileType, "filetype", "sql", "The type of export file (sql/csv)")
-	pflag.BoolVar(&noHeader, "no-header", false, "whether not to dump CSV table header")
-	pflag.BoolVarP(&noSchemas, "no-schemas", "m", false, "Do not dump table schemas with the data")
-	pflag.BoolVarP(&noData, "no-data", "d", false, "Do not dump table data")
-	pflag.StringVar(&csvNullValue, "csv-null-value", "\\N", "The null value used when export to csv")
-	pflag.StringVarP(&sql, "sql", "S", "", "Dump data with given sql. This argument doesn't support concurrent dump")
-	pflag.StringArrayVarP(&filters, "filter", "f", []string{"*.*"}, "filter to select which tables to dump")
-	pflag.BoolVar(&caseSensitive, "case-sensitive", false, "whether the filter should be case-sensitive")
-	pflag.BoolVar(&dumpEmptyDatabase, "dump-empty-database", true, "whether to dump empty database")
-	pflag.Uint64Var(&tidbMemQuotaQuery, "tidb-mem-quota-query", export.DefaultTiDBMemQuotaQuery, "The maximum memory limit for a single SQL statement, in bytes. Default: 32GB")
-	pflag.StringVar(&caPath, "ca", "", "The path name to the certificate authority file for TLS connection")
-	pflag.StringVar(&certPath, "cert", "", "The path name to the client certificate file for TLS connection")
-	pflag.StringVar(&keyPath, "key", "", "The path name to the client private key file for TLS connection")
-	pflag.StringVar(&csvSeparator, "csv-separator", ",", "The separator for csv files, default ','")
-	pflag.StringVar(&csvDelimiter, "csv-delimiter", "\"", "The delimiter for values in csv files, default '\"'")
-	pflag.StringVar(&outputFilenameFormat, "output-filename-template", "", "The output filename template (without file extension)")
-	pflag.BoolVar(&completeInsert, "complete-insert", false, "Use complete INSERT statements that include column names")
-	pflag.StringToStringVar(&sessionParams, "params", nil, `Extra session variables used while dumping, accepted format: --params "character_set_client=latin1,character_set_connection=latin1"`)
-
-	storage.DefineFlags(pflag.CommandLine)
-
 	printVersion := pflag.BoolP("version", "V", false, "Print Dumpling version")
 
-	pflag.Parse()
+	conf := export.DefaultConfig()
+	conf.DefineFlags(pflag.CommandLine)
 
+	pflag.Parse()
 	println(cli.LongVersion())
-
 	if *printVersion {
 		return
 	}
 
-	tableFilter, err := parseTableFilter()
+	err := conf.ParseFromFlags(pflag.CommandLine)
 	if err != nil {
-		fmt.Printf("failed to parse filter: %s\n", err)
-		os.Exit(2)
-	}
-	if !caseSensitive {
-		tableFilter = filter.CaseInsensitive(tableFilter)
-	}
-
-	var fileSize uint64
-	if len(fileSizeStr) == 0 {
-		fileSize = export.UnspecifiedSize
-	} else if fileSizeMB, err := strconv.ParseUint(fileSizeStr, 10, 64); err == nil {
-		fmt.Printf("Warning: -F without unit is not recommended, try using `-F '%dMiB'` in the future\n", fileSizeMB)
-		fileSize = fileSizeMB * units.MiB
-	} else if size, err := units.RAMInBytes(fileSizeStr); err == nil {
-		fileSize = uint64(size)
-	} else {
-		fmt.Printf("failed to parse filesize (-F '%s')\n", fileSizeStr)
-		os.Exit(2)
-	}
-
-	if outputFilenameFormat == "" && sql != "" {
-		outputFilenameFormat = export.DefaultAnonymousOutputFileTemplateText
-	}
-	tmpl, err := export.ParseOutputFileTemplate(outputFilenameFormat)
-	if err != nil {
-		fmt.Printf("failed to parse output filename template (--output-filename-template '%s')\n", outputFilenameFormat)
-		os.Exit(2)
-	}
-
-	if threads <= 0 {
-		fmt.Printf("--threads is set to %d. It should be greater than 0\n", threads)
-		os.Exit(2)
-	}
-
-	conf := export.DefaultConfig()
-	for k, v := range sessionParams {
-		conf.SessionParams[k] = v
-	}
-	conf.Databases = databases
-	conf.Host = host
-	conf.User = user
-	conf.Port = port
-	conf.Password = password
-	conf.AllowCleartextPasswords = allowCleartextPasswords
-	conf.Threads = threads
-	conf.FileSize = fileSize
-	conf.StatementSize = statementSize
-	conf.OutputDirPath = outputDir
-	conf.Consistency = consistency
-	conf.NoViews = noViews
-	conf.StatusAddr = statusAddr
-	conf.Rows = rows
-	conf.Where = where
-	conf.EscapeBackslash = escapeBackslash
-	conf.DumpEmptyDatabase = dumpEmptyDatabase
-	conf.LogLevel = logLevel
-	conf.LogFile = logFile
-	conf.LogFormat = logFormat
-	conf.FileType = fileType
-	conf.NoHeader = noHeader
-	conf.NoSchemas = noSchemas
-	conf.NoData = noData
-	conf.Snapshot = snapshot
-	conf.CsvNullValue = csvNullValue
-	conf.Sql = sql
-	conf.TableFilter = tableFilter
-	conf.Security.CAPath = caPath
-	conf.Security.CertPath = certPath
-	conf.Security.KeyPath = keyPath
-	conf.SessionParams[export.TiDBMemQuotaQueryName] = tidbMemQuotaQuery
-	conf.CsvSeparator = csvSeparator
-	conf.CsvDelimiter = csvDelimiter
-	conf.OutputFileTemplate = tmpl
-	conf.CompleteInsert = completeInsert
-
-	err = conf.ParseFromFlags(pflag.CommandLine)
-	if err != nil {
-		fmt.Println(err.Error())
-		os.Exit(2)
+		fmt.Printf("\nparse arguments failed: %+v\n", err)
+		os.Exit(1)
 	}
 
 	err = export.Dump(context.Background(), conf)
@@ -234,25 +61,3 @@ func main() {
 		log.Info("dump data successfully, dumpling will exit now")
 	}
 }
-
-func parseTableFilter() (filter.Filter, error) {
-	if len(tablesList) == 0 {
-		return filter.Parse(filters)
-	}
-
-	// only parse -T when -f is default value. otherwise bail out.
-	if len(filters) != 1 || filters[0] != "*.*" {
-		return nil, errors.New("cannot pass --tables-list and --filter together")
-	}
-
-	tableNames := make([]filter.Table, 0, len(tablesList))
-	for _, table := range tablesList {
-		parts := strings.SplitN(table, ".", 2)
-		if len(parts) < 2 {
-			return nil, fmt.Errorf("--tables-list only accepts qualified table names, but `%s` lacks a dot", table)
-		}
-		tableNames = append(tableNames, filter.Table{Schema: parts[0], Name: parts[1]})
-	}
-
-	return filter.NewTablesFilter(tableNames...), nil
-}

dumpling/go.mod

@@ -15,7 +15,6 @@ require (
 	github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce
 	github.com/pingcap/log v0.0.0-20200828042413-fce0951f1463
 	github.com/pingcap/tidb-tools v4.0.8-0.20200927084250-e47e0e12c7f3+incompatible
-	github.com/pkg/errors v0.9.1
 	github.com/soheilhy/cmux v0.1.4
 	github.com/spf13/pflag v1.0.5
 	github.com/tikv/pd v1.1.0-beta.0.20200910042021-254d1345be09