Skip to content

Commit 5de0332

Browse files
committed
feat: remove printing of failed queries
Signed-off-by: Andres Taylor <[email protected]>
1 parent e53f3e1 commit 5de0332

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

go/data/query_log_parse.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ func (s *mysqlLogReaderState) Next() (Query, bool) {
7777
break
7878
}
7979

80-
s.lineNumber++
81-
8280
if len(line) == 0 {
8381
continue
8482
}
@@ -113,6 +111,7 @@ func (s *mysqlLogReaderState) Next() (Query, bool) {
113111
}
114112

115113
func (s *logReaderState) readLine() (string, bool, error) {
114+
s.lineNumber++
116115
line, isPrefix, err := s.reader.ReadLine()
117116
if err == io.EOF {
118117
return "", true, nil

go/data/slow_query_log_loader.go

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ func (s *slowQueryLogReaderState) Next() (Query, bool) {
6161
if done {
6262
break
6363
}
64-
s.lineNumber++
6564
line = strings.TrimSpace(line)
6665

6766
result, done, err := s.processLine(line, state)

go/data/vtgate_log_parse.go

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ func (s *vtgateLogReaderState) Next() (Query, bool) {
8383
if done {
8484
break
8585
}
86-
s.lineNumber++
8786

8887
if len(line) == 0 {
8988
continue

go/keys/keys.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package keys
1818

1919
import (
2020
"encoding/json"
21+
"errors"
2122
"fmt"
2223
"io"
2324
"os"
@@ -74,11 +75,10 @@ func run(out io.Writer, cfg Config) error {
7475
}
7576
}
7677

77-
if err := loader.Close(); err != nil {
78-
return err
79-
}
78+
closeErr := loader.Close()
79+
jsonWriteErr := ql.writeJSONTo(out)
8080

81-
return ql.writeJSONTo(out)
81+
return errors.Join(closeErr, jsonWriteErr)
8282
}
8383

8484
func process(q data.Query, si *schemaInfo, ql *queryList) {
@@ -240,7 +240,7 @@ type QueryAnalysisResult struct {
240240
}
241241

242242
type QueryFailedResult struct {
243-
Query string `json:"query"`
243+
Query string
244244
LineNumbers []int `json:"lineNumbers"`
245245
Error string `json:"error"`
246246
}

go/summarize/summarize-keys.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ type (
5555
}
5656

5757
FailuresSummary struct {
58-
Query string
5958
Error string
6059
Count int
6160
}
@@ -299,10 +298,10 @@ func renderFailures(md *markdown.MarkDown, failures []FailuresSummary) {
299298
}
300299
md.PrintHeader("Failures", 2)
301300

302-
headers := []string{"Query", "Error", "Count"}
301+
headers := []string{"Error", "Count"}
303302
var rows [][]string
304303
for _, failure := range failures {
305-
rows = append(rows, []string{failure.Query, failure.Error, strconv.Itoa(failure.Count)})
304+
rows = append(rows, []string{failure.Error, strconv.Itoa(failure.Count)})
306305
}
307306
md.PrintTable(headers, rows)
308307
}
@@ -369,7 +368,6 @@ func summarizeKeysQueries(queries *keys.Output) ([]TableSummary, []FailuresSumma
369368
var failures []FailuresSummary
370369
for _, query := range queries.Failed {
371370
failures = append(failures, FailuresSummary{
372-
Query: query.Query,
373371
Error: query.Error,
374372
Count: len(query.LineNumbers),
375373
})

0 commit comments

Comments
 (0)