Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor to use the new flags system in script
Use the new pflag-based system for specifying flags for script commands. Signed-off-by: Jussi Maki <[email protected]>
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,6 @@ package statedb | |
| import ( | ||
| "bytes" | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "iter" | ||
|
|
@@ -19,6 +18,7 @@ import ( | |
| "github.com/cilium/hive" | ||
|
Check failure on line 18 in script.go
|
||
| "github.com/cilium/hive/script" | ||
|
Check failure on line 19 in script.go
|
||
| "github.com/liggitt/tabwriter" | ||
| "github.com/spf13/pflag" | ||
| "golang.org/x/time/rate" | ||
| "gopkg.in/yaml.v3" | ||
| ) | ||
|
|
@@ -90,17 +90,14 @@ func DBCmd(db *DB) script.Cmd { | |
| ) | ||
| } | ||
|
|
||
| func InitializedCmd(db *DB) script.Cmd { | ||
| return script.Command( | ||
| script.CmdUsage{ | ||
| Summary: "Wait until all or specific tables have been initialized", | ||
| Args: "table...", | ||
| Flags: func(fs *pflag.FlagSet) { | ||
| fs.Duration("timeout", 5*time.Second, "Maximum amount of time to wait for the table contents to match") | ||
| }, | ||
| Detail: []string{ | ||
| "Waits until all or specific tables have been marked", | ||
| "initialized. The default timeout is 5 seconds.", | ||
|
|
@@ -111,15 +108,13 @@ func InitializedCmd(db *DB) script.Cmd { | |
| }, | ||
| }, | ||
| func(s *script.State, args ...string) (script.WaitFunc, error) { | ||
| timeout, err := s.Flags.GetDuration("timeout") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| txn := db.ReadTxn() | ||
| timeoutChan := time.After(timeout) | ||
| allTbls := db.GetTables(txn) | ||
| tbls := allTbls | ||
|
|
||
|
|
@@ -166,7 +161,12 @@ func ShowCmd(db *DB) script.Cmd { | |
| return script.Command( | ||
| script.CmdUsage{ | ||
| Summary: "Show the contents of a table", | ||
| Args: "table", | ||
| Flags: func(fs *pflag.FlagSet) { | ||
| fs.StringP("out", "o", "", "File to write to instead of stdout") | ||
| fs.StringSlice("columns", nil, "Columns to write") | ||
| fs.StringP("format", "f", "table", "Format to write in (table, yaml or json)") | ||
| }, | ||
| Detail: []string{ | ||
| "Show the contents of a table.", | ||
| "", | ||
|
|
@@ -182,33 +182,32 @@ func ShowCmd(db *DB) script.Cmd { | |
| }, | ||
| }, | ||
| func(s *script.State, args ...string) (script.WaitFunc, error) { | ||
| file, err := s.Flags.GetString("out") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| columns, err := s.Flags.GetStringSlice("columns") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| format, err := s.Flags.GetString("format") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if len(args) < 1 { | ||
| return nil, fmt.Errorf("missing table name") | ||
| } | ||
| tableName := args[0] | ||
| return func(*script.State) (stdout, stderr string, err error) { | ||
| var buf strings.Builder | ||
| var w io.Writer | ||
| if file == "" { | ||
| w = &buf | ||
| } else { | ||
| f, err := os.OpenFile(s.Path(file), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) | ||
| if err != nil { | ||
| return "", "", fmt.Errorf("OpenFile(%s): %w", file, err) | ||
| } | ||
| defer f.Close() | ||
| w = f | ||
|
|
@@ -217,7 +216,7 @@ func ShowCmd(db *DB) script.Cmd { | |
| if err != nil { | ||
| return "", "", err | ||
| } | ||
| err = writeObjects(tbl, tbl.All(txn), w, columns, format) | ||
| return buf.String(), "", err | ||
| }, nil | ||
| }) | ||
|
|
@@ -227,7 +226,11 @@ func CompareCmd(db *DB) script.Cmd { | |
| return script.Command( | ||
| script.CmdUsage{ | ||
| Summary: "Compare table", | ||
| Args: "table file", | ||
| Flags: func(fs *pflag.FlagSet) { | ||
| fs.Duration("timeout", 5*time.Second, "Maximum amount of time to wait for the table contents to match") | ||
| fs.String("grep", "", "Grep the result rows and only compare matching ones") | ||
| }, | ||
| Detail: []string{ | ||
| "Compare the contents of a table against a file.", | ||
| "The comparison is retried until a timeout (1s default).", | ||
|
|
@@ -243,21 +246,22 @@ func CompareCmd(db *DB) script.Cmd { | |
| }, | ||
| }, | ||
| func(s *script.State, args ...string) (script.WaitFunc, error) { | ||
| timeout, err := s.Flags.GetDuration("timeout") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| grep, err := s.Flags.GetString("grep") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if len(args) != 2 { | ||
| return nil, fmt.Errorf("expected table and filename") | ||
| } | ||
|
|
||
| var grepRe *regexp.Regexp | ||
| if grep != "" { | ||
| grepRe, err = regexp.Compile(grep) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("bad grep: %w", err) | ||
| } | ||
|
|
@@ -292,7 +296,7 @@ func CompareCmd(db *DB) script.Cmd { | |
| } | ||
| lines = lines[1:] | ||
| origLines := lines | ||
| timeoutChan := time.After(timeout) | ||
|
|
||
| for { | ||
| lines = origLines | ||
|
|
@@ -485,8 +489,15 @@ func queryCmd(db *DB, query int, summary string, detail []string) script.Cmd { | |
| return script.Command( | ||
| script.CmdUsage{ | ||
| Summary: summary, | ||
| Args: "table key", | ||
| Flags: func(fs *pflag.FlagSet) { | ||
| fs.StringP("out", "o", "", "File to write to instead of stdout") | ||
| fs.StringSlice("columns", nil, "Columns to write") | ||
| fs.StringP("format", "f", "table", "Format to write in (table, yaml or json)") | ||
| fs.StringP("index", "i", "", "Index to query") | ||
| fs.Bool("delete", false, "Delete all matching objects") | ||
| }, | ||
| Detail: detail, | ||
| }, | ||
| func(s *script.State, args ...string) (script.WaitFunc, error) { | ||
| return runQueryCmd(query, db, s, args) | ||
|
|
@@ -495,22 +506,27 @@ func queryCmd(db *DB, query int, summary string, detail []string) script.Cmd { | |
| } | ||
|
|
||
| func runQueryCmd(query int, db *DB, s *script.State, args []string) (script.WaitFunc, error) { | ||
| file, err := s.Flags.GetString("out") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| columns, err := s.Flags.GetStringSlice("columns") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| format, err := s.Flags.GetString("format") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| index, err := s.Flags.GetString("index") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| delete, err := s.Flags.GetBool("delete") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if len(args) < 2 { | ||
| return nil, fmt.Errorf("expected table and key") | ||
| } | ||
|
|
@@ -523,12 +539,12 @@ func runQueryCmd(query int, db *DB, s *script.State, args []string) (script.Wait | |
|
|
||
| var buf strings.Builder | ||
| var w io.Writer | ||
| if file == "" { | ||
| w = &buf | ||
| } else { | ||
| f, err := os.OpenFile(s.Path(file), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) | ||
| if err != nil { | ||
| return "", "", fmt.Errorf("OpenFile(%s): %s", file, err) | ||
| } | ||
| defer f.Close() | ||
| w = f | ||
|
|
@@ -537,13 +553,13 @@ func runQueryCmd(query int, db *DB, s *script.State, args []string) (script.Wait | |
| var it iter.Seq2[any, uint64] | ||
| switch query { | ||
| case queryCmdList: | ||
| it, err = tbl.List(txn, index, args[1]) | ||
| case queryCmdLowerBound: | ||
| it, err = tbl.LowerBound(txn, index, args[1]) | ||
| case queryCmdPrefix: | ||
| it, err = tbl.Prefix(txn, index, args[1]) | ||
| case queryCmdGet: | ||
| it, err = tbl.List(txn, index, args[1]) | ||
| if err == nil { | ||
| it = firstOfSeq2(it) | ||
| } | ||
|
|
@@ -554,12 +570,12 @@ func runQueryCmd(query int, db *DB, s *script.State, args []string) (script.Wait | |
| return "", "", fmt.Errorf("query: %w", err) | ||
| } | ||
|
|
||
| err = writeObjects(tbl, it, w, columns, format) | ||
| if err != nil { | ||
| return "", "", err | ||
| } | ||
|
|
||
| if delete { | ||
| wtxn := db.WriteTxn(tbl.Meta) | ||
| count := 0 | ||
| for obj := range it { | ||
|
|
||
Oops, something went wrong.