Merge pull request #7590 from planetscale/vtexplain-show-status

Add Show Status query to vtexplain and make asthelpergen/sizegen quiet
vitessio · Mar 3, 2021 · 436188f · 436188f
2 parents 25c1088 + 78cefb0
commit 436188f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/go/mysql/schema.go b/go/mysql/schema.go
@@ -32,6 +32,8 @@ import (
 const (
 	// BaseShowPrimary is the base query for fetching primary key info.
 	BaseShowPrimary = "SELECT table_name, column_name FROM information_schema.key_column_usage WHERE table_schema=database() AND constraint_name='PRIMARY' ORDER BY table_name, ordinal_position"
+	// ShowRowsRead is the query used to find the number of rows read.
+	ShowRowsRead = "show status like 'Innodb_rows_read'"
 )
 
 // BaseShowTablesFields contains the fields returned by a BaseShowTables or a BaseShowTablesForTable command.

diff --git a/go/tools/asthelpergen/asthelpergen.go b/go/tools/asthelpergen/asthelpergen.go
@@ -241,7 +241,6 @@ func VerifyFilesOnDisk(result map[string]*jen.File) (errors []error) {
 func GenerateASTHelpers(packagePatterns []string, rootIface, exceptCloneType string) (map[string]*jen.File, error) {
 	loaded, err := packages.Load(&packages.Config{
 		Mode: packages.NeedName | packages.NeedTypes | packages.NeedTypesSizes | packages.NeedTypesInfo | packages.NeedDeps | packages.NeedImports | packages.NeedModule,
-		Logf: log.Printf,
 	}, packagePatterns...)
 
 	if err != nil {

diff --git a/go/tools/sizegen/sizegen.go b/go/tools/sizegen/sizegen.go
@@ -501,7 +501,6 @@ func VerifyFilesOnDisk(result map[string]*jen.File) (errors []error) {
 func GenerateSizeHelpers(packagePatterns []string, typePatterns []string) (map[string]*jen.File, error) {
 	loaded, err := packages.Load(&packages.Config{
 		Mode: packages.NeedName | packages.NeedTypes | packages.NeedTypesSizes | packages.NeedTypesInfo | packages.NeedDeps | packages.NeedImports | packages.NeedModule,
-		Logf: log.Printf,
 	}, packagePatterns...)
 
 	if err != nil {

diff --git a/go/vt/vtexplain/vtexplain_vttablet.go b/go/vt/vtexplain/vtexplain_vttablet.go
@@ -366,6 +366,13 @@ func initTabletEnvironment(ddls []sqlparser.DDLStatement, opts *Options) error {
 			}},
 			Rows: [][]sqltypes.Value{},
 		},
+		mysql.ShowRowsRead: sqltypes.MakeTestResult(
+			sqltypes.MakeTestFields(
+				"Variable_name|value",
+				"varchar|uint64",
+			),
+			"Innodb_rows|0",
+		),
 	}
 
 	showTableRows := make([][]sqltypes.Value, 0, 4)

diff --git a/go/vt/vttablet/tabletserver/schema/engine.go b/go/vt/vttablet/tabletserver/schema/engine.go
@@ -394,7 +394,7 @@ func (se *Engine) reload(ctx context.Context) error {
 }
 
 func (se *Engine) updateInnoDBRowsRead(ctx context.Context, conn *connpool.DBConn) error {
-	readRowsData, err := conn.Exec(ctx, "show status like 'Innodb_rows_read'", 10, false)
+	readRowsData, err := conn.Exec(ctx, mysql.ShowRowsRead, 10, false)
 	if err != nil {
 		return err
 	}