From 7fecb3e10849cad3e631ab308b34fc171f0e94b3 Mon Sep 17 00:00:00 2001 From: Florent Poinsard <35779988+frouioui@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:03:52 -0600 Subject: [PATCH 1/2] Update README.md Signed-off-by: Florent Poinsard <35779988+frouioui@users.noreply.github.com> --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 72336e8..2705486 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The `vt` binary encapsulates several utility tools for Vitess, providing a compr You can install `vt` using the following command: ```bash -go install github.com/vitessio/vitess-tester/go/vt@latest +go install github.com/vitessio/vt/go/vt@latest ``` ## Testing Methodology @@ -122,4 +122,4 @@ Vitess Tester started as a fork from [pingcap/mysql-tester](https://github.com/p --- -This version includes an example workflow for `vt keys` and clarifies the role of `vt benchstat`. Let me know if anything else needs adjustment. \ No newline at end of file +This version includes an example workflow for `vt keys` and clarifies the role of `vt benchstat`. Let me know if anything else needs adjustment. From 29124d93bba6854c2a238095c8ea708295b30421 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 8 Oct 2024 12:08:00 -0600 Subject: [PATCH 2/2] Fully rename the repo in vt Signed-off-by: Florent Poinsard --- Makefile | 2 +- go.mod | 2 +- go/benchstat/benchstat.go | 2 +- go/benchstat/reading.go | 2 +- go/cmd/benchstat.go | 2 +- go/cmd/keys.go | 2 +- go/cmd/tester.go | 4 ++-- go/data/data.go | 2 +- go/data/data_test.go | 2 +- go/keys/keys.go | 4 ++-- go/tester/comparing_query_runner.go | 3 ++- go/tester/tester.go | 4 ++-- go/tester/tracer.go | 2 +- go/vt/main.go | 2 +- 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index cf7ddb7..84d1a04 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all build test tidy clean vitess-tester vtbenchstat +.PHONY: all build test tidy clean GO := go REQUIRED_GO_VERSION := 1.23 diff --git a/go.mod b/go.mod index afde9fb..922e5f5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vitessio/vitess-tester +module github.com/vitessio/vt go 1.23.1 diff --git a/go/benchstat/benchstat.go b/go/benchstat/benchstat.go index 253c662..5b0d704 100644 --- a/go/benchstat/benchstat.go +++ b/go/benchstat/benchstat.go @@ -30,7 +30,7 @@ import ( "github.com/olekukonko/tablewriter" "golang.org/x/term" - "github.com/vitessio/vitess-tester/go/keys" + "github.com/vitessio/vt/go/keys" ) type ( diff --git a/go/benchstat/reading.go b/go/benchstat/reading.go index f6e9722..7698524 100644 --- a/go/benchstat/reading.go +++ b/go/benchstat/reading.go @@ -23,7 +23,7 @@ import ( "sort" "strconv" - "github.com/vitessio/vitess-tester/go/keys" + "github.com/vitessio/vt/go/keys" ) func readTraceFile(fileName string) TraceFile { diff --git a/go/cmd/benchstat.go b/go/cmd/benchstat.go index 1f3eda9..5f456a6 100644 --- a/go/cmd/benchstat.go +++ b/go/cmd/benchstat.go @@ -19,7 +19,7 @@ package cmd import ( "github.com/spf13/cobra" - vtbenchstat "github.com/vitessio/vitess-tester/go/benchstat" + vtbenchstat "github.com/vitessio/vt/go/benchstat" ) var benchstat = &cobra.Command{ diff --git a/go/cmd/keys.go b/go/cmd/keys.go index f60251c..35a3b65 100644 --- a/go/cmd/keys.go +++ b/go/cmd/keys.go @@ -19,7 +19,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vitessio/vitess-tester/go/keys" + "github.com/vitessio/vt/go/keys" ) var keysCmd = &cobra.Command{ diff --git a/go/cmd/tester.go b/go/cmd/tester.go index ba01307..05476bb 100644 --- a/go/cmd/tester.go +++ b/go/cmd/tester.go @@ -19,7 +19,7 @@ package cmd import ( "github.com/spf13/cobra" - vttester "github.com/vitessio/vitess-tester/go/tester" + vttester "github.com/vitessio/vt/go/tester" ) func testerCmd() *cobra.Command { @@ -36,7 +36,7 @@ func testerCmd() *cobra.Command { }, } - cmd.Flags().StringVar(&cfg.LogLevel, "log-level", "error", "The log level of vitess-tester: info, warn, error, debug.") + cmd.Flags().StringVar(&cfg.LogLevel, "log-level", "error", "The log level of vt tester: info, warn, error, debug.") cmd.Flags().StringVar(&cfg.TraceFile, "trace-file", "", "Do a vexplain trace on all queries and store the output in the given file.") cmd.Flags().StringVar(&cfg.VschemaFile, "vschema", "", "Disable auto-vschema by providing your own vschema file. This cannot be used with either -vtexplain-vschema or -sharded.") cmd.Flags().StringVar(&cfg.VtExplainVschemaFile, "vtexplain-vschema", "", "Disable auto-vschema by providing your own vtexplain vschema file. This cannot be used with either -vschema or -sharded.") diff --git a/go/data/data.go b/go/data/data.go index 70cadf0..1017413 100644 --- a/go/data/data.go +++ b/go/data/data.go @@ -26,7 +26,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/vitessio/vitess-tester/go/typ" + "github.com/vitessio/vt/go/typ" ) type ( diff --git a/go/data/data_test.go b/go/data/data_test.go index f0eaa35..12730f7 100644 --- a/go/data/data_test.go +++ b/go/data/data_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vitessio/vitess-tester/go/typ" + "github.com/vitessio/vt/go/typ" ) func TestParseQueries(t *testing.T) { diff --git a/go/keys/keys.go b/go/keys/keys.go index 76a4d1b..facb239 100644 --- a/go/keys/keys.go +++ b/go/keys/keys.go @@ -30,8 +30,8 @@ import ( "vitess.io/vitess/go/vt/vtgate/planbuilder/plancontext" "vitess.io/vitess/go/vt/vtgate/semantics" - "github.com/vitessio/vitess-tester/go/data" - "github.com/vitessio/vitess-tester/go/typ" + "github.com/vitessio/vt/go/data" + "github.com/vitessio/vt/go/typ" querypb "vitess.io/vitess/go/vt/proto/query" ) diff --git a/go/tester/comparing_query_runner.go b/go/tester/comparing_query_runner.go index 2cdeb6c..137240f 100644 --- a/go/tester/comparing_query_runner.go +++ b/go/tester/comparing_query_runner.go @@ -18,11 +18,12 @@ package tester import ( "fmt" + log "github.com/sirupsen/logrus" "vitess.io/vitess/go/test/endtoend/utils" "vitess.io/vitess/go/vt/sqlparser" - "github.com/vitessio/vitess-tester/go/data" + "github.com/vitessio/vt/go/data" ) type ( diff --git a/go/tester/tester.go b/go/tester/tester.go index 84ef113..70cb945 100644 --- a/go/tester/tester.go +++ b/go/tester/tester.go @@ -33,8 +33,8 @@ import ( "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vtgate/vindexes" - "github.com/vitessio/vitess-tester/go/data" - "github.com/vitessio/vitess-tester/go/typ" + "github.com/vitessio/vt/go/data" + "github.com/vitessio/vt/go/typ" ) type ( diff --git a/go/tester/tracer.go b/go/tester/tracer.go index 8939455..1372b67 100644 --- a/go/tester/tracer.go +++ b/go/tester/tracer.go @@ -11,7 +11,7 @@ import ( "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vterrors" - "github.com/vitessio/vitess-tester/go/data" + "github.com/vitessio/vt/go/data" ) var _ QueryRunner = (*Tracer)(nil) diff --git a/go/vt/main.go b/go/vt/main.go index c6506fa..31349bf 100644 --- a/go/vt/main.go +++ b/go/vt/main.go @@ -17,7 +17,7 @@ limitations under the License. package main import ( - "github.com/vitessio/vitess-tester/go/cmd" + "github.com/vitessio/vt/go/cmd" ) func main() {