lint warnings

5 files changed, 34 insertions, 21 deletions

diff --git a/internal/mapr/client/aggregate.go b/internal/mapr/client/aggregate.go
index 1704d43..2e9b61a 100644
--- a/internal/mapr/client/aggregate.go
+++ b/internal/mapr/client/aggregate.go
@@ -44,7 +44,7 @@ func (a *Aggregate) Aggregate(message string) error {
 	groupKey := parts[0]
 	samples, err := strconv.Atoi(parts[1])
 	if err != nil {
-		return fmt.Errorf("unable to parse sample count '%s': %v", parts[1], err)
+		return fmt.Errorf("unable to parse sample count '%s': %w", parts[1], err)
 	}
 
 	fields := a.makeFields(parts[2:])
diff --git a/internal/mapr/fieldtypes.go b/internal/mapr/fieldtypes.go
index a64efd1..4242407 100644
--- a/internal/mapr/fieldtypes.go
+++ b/internal/mapr/fieldtypes.go
@@ -1,7 +1,5 @@
 package mapr
 
-import "fmt"
-
 type fieldType int
 
 // The possible field types.
@@ -16,14 +14,14 @@ const (
 func (w fieldType) String() string {
 	switch w {
 	case Field:
-		return fmt.Sprintf("Field")
+		return "Field"
 	case String:
-		return fmt.Sprintf("String")
+		return "String"
 	case Float:
-		return fmt.Sprintf("Float")
+		return "Float"
 	case FunctionStack:
-		return fmt.Sprintf("FunctionStack")
+		return "FunctionStack"
 	default:
-		return fmt.Sprintf("UndefFieldType")
+		return "UndefFieldType"
 	}
 }
diff --git a/internal/mapr/groupsetresult.go b/internal/mapr/groupsetresult.go
index d01a3c9..58663b8 100644
--- a/internal/mapr/groupsetresult.go
+++ b/internal/mapr/groupsetresult.go
@@ -169,9 +169,10 @@ func (*GroupSet) writeQueryFile(query *Query) error {
 	}
 	defer fd.Close()
 
-	fd.WriteString(query.RawQuery)
-	os.Rename(tmpQueryFile, queryFile)
-	return nil
+	if _, err := fd.WriteString(query.RawQuery); err != nil {
+		return err
+	}
+	return os.Rename(tmpQueryFile, queryFile)
 }
 
 // WriteResult writes the result to an CSV outfile.
@@ -221,7 +222,9 @@ func (g *GroupSet) resultWriteUnformatted(query *Query, rows []result, fd *os.Fi
 	lastColumn := len(query.Select) - 1
 
 	if writeHeader {
-		g.resultWriteUnformattedHeader(query, fd, lastColumn)
+		if err := g.resultWriteUnformattedHeader(query, fd, lastColumn); err != nil {
+			return err
+		}
 	}
 
 	// And now write the data
@@ -230,13 +233,19 @@ func (g *GroupSet) resultWriteUnformatted(query *Query, rows []result, fd *os.Fi
 			break
 		}
 		for j, value := range r.values {
-			fd.WriteString(value)
+			if _, err := fd.WriteString(value); err != nil {
+				return err
+			}
 			if j == lastColumn {
 				continue
 			}
-			fd.WriteString(protocol.CSVDelimiter)
+			if _, err := fd.WriteString(protocol.CSVDelimiter); err != nil {
+				return err
+			}
+		}
+		if _, err := fd.WriteString("\n"); err != nil {
+			return err
 		}
-		fd.WriteString("\n")
 	}
 
 	if !query.Outfile.AppendMode {
@@ -250,13 +259,18 @@ func (g *GroupSet) resultWriteUnformatted(query *Query, rows []result, fd *os.Fi
 	return nil
 }
 
-func (g *GroupSet) resultWriteUnformattedHeader(query *Query, fd *os.File, lastColumn int) {
+func (g *GroupSet) resultWriteUnformattedHeader(query *Query, fd *os.File, lastColumn int) (err error) {
 	for i, sc := range query.Select {
-		fd.WriteString(sc.FieldStorage)
+		if _, err = fd.WriteString(sc.FieldStorage); err != nil {
+			return
+		}
 		if i == lastColumn {
 			continue
 		}
-		fd.WriteString(protocol.CSVDelimiter)
+		if _, err = fd.WriteString(protocol.CSVDelimiter); err != nil {
+			return
+		}
 	}
-	fd.WriteString("\n")
+	_, err = fd.WriteString("\n")
+	return
 }
diff --git a/internal/mapr/query.go b/internal/mapr/query.go
index ddcbc90..139f04c 100644
--- a/internal/mapr/query.go
+++ b/internal/mapr/query.go
@@ -133,7 +133,7 @@ func (q *Query) parseTokens(tokens []token) ([]token, error) {
 	var err error
 	var found []token
 
-	for tokens != nil && len(tokens) > 0 {
+	for len(tokens) > 0 {
 		switch strings.ToLower(tokens[0].str) {
 		case "select":
 			tokens, found = tokensConsume(tokens[1:])
diff --git a/internal/mapr/token.go b/internal/mapr/token.go
index 48d1192..77362f7 100644
--- a/internal/mapr/token.go
+++ b/internal/mapr/token.go
@@ -99,7 +99,8 @@ func tokensConsumeOptional(tokens []token, optional string) []token {
 	if len(tokens) < 1 {
 		return tokens
 	}
-	if strings.ToLower(tokens[0].str) == strings.ToLower(optional) {
+	//if strings.ToLower(tokens[0].str) == strings.ToLower(optional) {
+	if strings.EqualFold(tokens[0].str, optional) {
 		return tokens[1:]
 	}
 	return tokens