incorporated review feedback

Signed-off-by: c-r-dev <[email protected]>
vitessio · Jan 27, 2025 · 5acda89 · 5acda89
1 parent 65d7721
commit 5acda89
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/go/vt/vtadmin/api.go b/go/vt/vtadmin/api.go
@@ -2661,7 +2661,7 @@ func (api *API) VExplain(ctx context.Context, req *vtadminpb.VExplainRequest) (*
 		return nil, vterrors.VT09017("Invalid VExplain statement")
 	}
 
-	response, err := c.GetVExplain(ctx, req, stmt.(*sqlparser.VExplainStmt))
+	response, err := c.DB.VExplain(ctx, req.GetSql(), stmt.(*sqlparser.VExplainStmt))
 
 	if err != nil {
 		return nil, err

diff --git a/go/vt/vtadmin/api_test.go b/go/vt/vtadmin/api_test.go
@@ -5309,7 +5309,6 @@ func TestVExplain(t *testing.T) {
 
 					// We don't particularly care to test the contents of the VExplain response,
 					// just that it exists.
-					print(resp.Response)
 					assert.NotEmpty(t, resp.Response)
 				}
 			})

diff --git a/go/vt/vtadmin/cluster/cluster.go b/go/vt/vtadmin/cluster/cluster.go
@@ -38,7 +38,6 @@ import (
 	"vitess.io/vitess/go/vt/callerid"
 	"vitess.io/vitess/go/vt/concurrency"
 	"vitess.io/vitess/go/vt/log"
-	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/topo/topoproto"
 	"vitess.io/vitess/go/vt/vtadmin/cache"
 	"vitess.io/vitess/go/vt/vtadmin/cluster/discovery"
@@ -2506,25 +2505,6 @@ func (c *Cluster) ToggleTabletReplication(ctx context.Context, tablet *vtadminpb
 	return err
 }
 
-// GetVExplain returns the VExplain json message.
-func (c *Cluster) GetVExplain(ctx context.Context, req *vtadminpb.VExplainRequest, vexplainStmt *sqlparser.VExplainStmt) (*vtadminpb.VExplainResponse, error) {
-	span, ctx := trace.NewSpan(ctx, "Cluster.GetVExplain")
-	defer span.Finish()
-
-	AnnotateSpan(c, span)
-	span.Annotate("clusterId", req.ClusterId)
-	span.Annotate("keyspace", req.Keyspace)
-	span.Annotate("sql", req.Sql)
-
-	query := req.GetSql()
-
-	return c.getVExplain(ctx, query, vexplainStmt)
-}
-
-func (c *Cluster) getVExplain(ctx context.Context, query string, vexplainStmt *sqlparser.VExplainStmt) (*vtadminpb.VExplainResponse, error) {
-	return c.DB.VExplain(ctx, query, vexplainStmt)
-}
-
 // Debug returns a map of debug information for a cluster.
 func (c *Cluster) Debug() map[string]any {
 	m := map[string]any{

diff --git a/go/vt/vtadmin/vtsql/vtsql.go b/go/vt/vtadmin/vtsql/vtsql.go
@@ -202,6 +202,7 @@ func (vtgate *VTGateProxy) VExplain(ctx context.Context, query string, vexplainS
 		return nil, nil
 	}
 }
+
 func convertVExplainResultToString(rows *sql.Rows) (*vtadminpb.VExplainResponse, error) {
 	var queryPlan string
 	for rows.Next() {