feat: remove printing of failed queries

Signed-off-by: Andres Taylor <[email protected]>
planetscale · Nov 18, 2024 · 5de0332 · 5de0332
1 parent e53f3e1
commit 5de0332
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/go/data/query_log_parse.go b/go/data/query_log_parse.go
@@ -77,8 +77,6 @@ func (s *mysqlLogReaderState) Next() (Query, bool) {
 			break
 		}
 
-		s.lineNumber++
-
 		if len(line) == 0 {
 			continue
 		}
@@ -113,6 +111,7 @@ func (s *mysqlLogReaderState) Next() (Query, bool) {
 }
 
 func (s *logReaderState) readLine() (string, bool, error) {
+	s.lineNumber++
 	line, isPrefix, err := s.reader.ReadLine()
 	if err == io.EOF {
 		return "", true, nil

diff --git a/go/data/slow_query_log_loader.go b/go/data/slow_query_log_loader.go
@@ -61,7 +61,6 @@ func (s *slowQueryLogReaderState) Next() (Query, bool) {
 		if done {
 			break
 		}
-		s.lineNumber++
 		line = strings.TrimSpace(line)
 
 		result, done, err := s.processLine(line, state)

diff --git a/go/data/vtgate_log_parse.go b/go/data/vtgate_log_parse.go
@@ -83,7 +83,6 @@ func (s *vtgateLogReaderState) Next() (Query, bool) {
 		if done {
 			break
 		}
-		s.lineNumber++
 
 		if len(line) == 0 {
 			continue

diff --git a/go/keys/keys.go b/go/keys/keys.go
@@ -18,6 +18,7 @@ package keys
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -74,11 +75,10 @@ func run(out io.Writer, cfg Config) error {
 		}
 	}
 
-	if err := loader.Close(); err != nil {
-		return err
-	}
+	closeErr := loader.Close()
+	jsonWriteErr := ql.writeJSONTo(out)
 
-	return ql.writeJSONTo(out)
+	return errors.Join(closeErr, jsonWriteErr)
 }
 
 func process(q data.Query, si *schemaInfo, ql *queryList) {
@@ -240,7 +240,7 @@ type QueryAnalysisResult struct {
 }
 
 type QueryFailedResult struct {
-	Query       string `json:"query"`
+	Query       string
 	LineNumbers []int  `json:"lineNumbers"`
 	Error       string `json:"error"`
 }
diff --git a/go/summarize/summarize-keys.go b/go/summarize/summarize-keys.go
@@ -55,7 +55,6 @@ type (
 	}
 
 	FailuresSummary struct {
-		Query string
 		Error string
 		Count int
 	}
@@ -299,10 +298,10 @@ func renderFailures(md *markdown.MarkDown, failures []FailuresSummary) {
 	}
 	md.PrintHeader("Failures", 2)
 
-	headers := []string{"Query", "Error", "Count"}
+	headers := []string{"Error", "Count"}
 	var rows [][]string
 	for _, failure := range failures {
-		rows = append(rows, []string{failure.Query, failure.Error, strconv.Itoa(failure.Count)})
+		rows = append(rows, []string{failure.Error, strconv.Itoa(failure.Count)})
 	}
 	md.PrintTable(headers, rows)
 }
@@ -369,7 +368,6 @@ func summarizeKeysQueries(queries *keys.Output) ([]TableSummary, []FailuresSumma
 	var failures []FailuresSummary
 	for _, query := range queries.Failed {
 		failures = append(failures, FailuresSummary{
-			Query: query.Query,
 			Error: query.Error,
 			Count: len(query.LineNumbers),
 		})