Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the JSON format of the VTGate query plans #447

Merged
merged 1 commit into from
Sep 28, 2023
Merged

fix the JSON format of the VTGate query plans #447

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions go/tools/macrobench/vtgate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ type VTGateQueryPlanValue struct {
RowsReturned int // Total number of rows
RowsAffected int // Total number of rows
Errors int // Total number of errors

TablesUsed interface{}
}

type VTGateQueryPlan struct {
Expand Down Expand Up @@ -158,24 +160,22 @@ func getVTGateQueryPlans(port string) (VTGateQueryPlanMap, error) {
}
defer resp.Body.Close()

var response []VTGateQueryPlan
var response map[string]VTGateQueryPlanValue
err = json.NewDecoder(resp.Body).Decode(&response)
if err != nil {
return nil, err
}
planMap := VTGateQueryPlanMap{}
for _, plan := range response {
for key, plan := range response {
// keeping only select statements
if strings.HasPrefix(plan.Key, "select") {
jsonPlan, err := json.MarshalIndent(plan.Value.Instructions, "", "\t")
if strings.HasPrefix(key, "select") {
jsonPlan, err := json.MarshalIndent(plan.Instructions, "", "\t")
if err != nil {
return nil, err
}
plan.Value.Instructions = string(jsonPlan)
planMap[plan.Key] = plan.Value
plan.Instructions = string(jsonPlan)
}
}
return planMap, nil
return response, nil
}

func getVTGatesQueryPlans(ports []string) (VTGateQueryPlanMap, error) {
Expand Down Expand Up @@ -230,7 +230,7 @@ func GetVTGateSelectQueryPlansWithFilter(gitRef string, macroType Type, planner
case []byte:
plan.Value.Instructions = string(p)
}

// Remove all comments from the query
// This prevents the query from not match across two versions
// of Vitess where we changed query hints and added comments
Expand Down