fix linter warnings (#12286)

* fix linter warnings Signed-off-by: Andres Taylor <[email protected]> * add the same checks in CI as pre-commit Signed-off-by: Andres Taylor <[email protected]> * ci: disable revive by default Signed-off-by: Vicent Marti <[email protected]> --------- Signed-off-by: Andres Taylor <[email protected]> Signed-off-by: Vicent Marti <[email protected]> Co-authored-by: Vicent Marti <[email protected]>
vitessio · Feb 9, 2023 · 07c85db · 07c85db
1 parent d208d36
commit 07c85db
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/go/vt/vtgate/evalengine/api_arithmetic.go b/go/vt/vtgate/evalengine/api_arithmetic.go
@@ -71,7 +71,7 @@ func Add(v1, v2 sqltypes.Value) (sqltypes.Value, error) {
 	if err != nil {
 		return sqltypes.NULL, err
 	}
-	return evalToSqlValue(r), nil
+	return evalToSQLValue(r), nil
 }
 
 // Subtract takes two values and subtracts them
@@ -91,7 +91,7 @@ func Subtract(v1, v2 sqltypes.Value) (sqltypes.Value, error) {
 	if err != nil {
 		return sqltypes.NULL, err
 	}
-	return evalToSqlValue(r), nil
+	return evalToSQLValue(r), nil
 }
 
 // Multiply takes two values and multiplies it together
@@ -111,7 +111,7 @@ func Multiply(v1, v2 sqltypes.Value) (sqltypes.Value, error) {
 	if err != nil {
 		return sqltypes.NULL, err
 	}
-	return evalToSqlValue(r), nil
+	return evalToSQLValue(r), nil
 }
 
 // Divide (Float) for MySQL. Replicates behavior of "/" operator
@@ -131,7 +131,7 @@ func Divide(v1, v2 sqltypes.Value) (sqltypes.Value, error) {
 	if err != nil {
 		return sqltypes.NULL, err
 	}
-	return evalToSqlValue(r), nil
+	return evalToSQLValue(r), nil
 }
 
 // NullSafeAdd adds two Values in a null-safe manner. A null value

diff --git a/go/vt/vtgate/evalengine/api_arithmetic_test.go b/go/vt/vtgate/evalengine/api_arithmetic_test.go
@@ -271,7 +271,7 @@ func TestArithmetics(t *testing.T) {
 		operator: "/",
 		f:        Divide,
 		cases: []tcase{{
-			//All Nulls
+			// All Nulls
 			v1:  NULL,
 			v2:  NULL,
 			out: NULL,
@@ -355,7 +355,7 @@ func TestArithmetics(t *testing.T) {
 		operator: "*",
 		f:        Multiply,
 		cases: []tcase{{
-			//All Nulls
+			// All Nulls
 			v1:  NULL,
 			v2:  NULL,
 			out: NULL,
@@ -424,7 +424,7 @@ func TestArithmetics(t *testing.T) {
 			v2:  NewUint64(1),
 			out: NewUint64(math.MaxUint64),
 		}, {
-			//Checking whether maxInt value can be passed as uint value
+			// Checking whether maxInt value can be passed as uint value
 			v1:  NewUint64(math.MaxInt64),
 			v2:  NewInt64(3),
 			err: dataOutOfRangeError(math.MaxInt64, 3, "BIGINT UNSIGNED", "*").Error(),
@@ -984,10 +984,10 @@ func TestPrioritize(t *testing.T) {
 		out2: ival,
 	}}
 	for _, tcase := range tcases {
-		t.Run(fmt.Sprintf("%s - %s", evalToSqlValue(tcase.v1), evalToSqlValue(tcase.v2)), func(t *testing.T) {
+		t.Run(fmt.Sprintf("%s - %s", evalToSQLValue(tcase.v1), evalToSQLValue(tcase.v2)), func(t *testing.T) {
 			got1, got2 := makeNumericAndPrioritize(tcase.v1, tcase.v2)
-			utils.MustMatch(t, evalToSqlValue(tcase.out1), evalToSqlValue(got1), "makeNumericAndPrioritize")
-			utils.MustMatch(t, evalToSqlValue(tcase.out2), evalToSqlValue(got2), "makeNumericAndPrioritize")
+			utils.MustMatch(t, evalToSQLValue(tcase.out1), evalToSQLValue(got1), "makeNumericAndPrioritize")
+			utils.MustMatch(t, evalToSQLValue(tcase.out2), evalToSQLValue(got2), "makeNumericAndPrioritize")
 		})
 	}
 }
@@ -1089,7 +1089,7 @@ func TestCompareNumeric(t *testing.T) {
 
 	for aIdx, aVal := range values {
 		for bIdx, bVal := range values {
-			t.Run(fmt.Sprintf("[%d/%d] %s %s", aIdx, bIdx, evalToSqlValue(aVal), evalToSqlValue(bVal)), func(t *testing.T) {
+			t.Run(fmt.Sprintf("[%d/%d] %s %s", aIdx, bIdx, evalToSQLValue(aVal), evalToSQLValue(bVal)), func(t *testing.T) {
 				result, err := compareNumeric(aVal, bVal)
 				require.NoError(t, err)
 				assert.Equal(t, cmpResults[aIdx][bIdx], result)

diff --git a/go/vt/vtgate/evalengine/api_types.go b/go/vt/vtgate/evalengine/api_types.go
@@ -147,7 +147,7 @@ func LiteralToValue(literal *sqlparser.Literal) (sqltypes.Value, error) {
 	if err != nil {
 		return sqltypes.Value{}, err
 	}
-	return evalToSqlValue(lit.inner), nil
+	return evalToSQLValue(lit.inner), nil
 }
 
 // ToNative converts Value to a native go type.

diff --git a/go/vt/vtgate/evalengine/arithmetic.go b/go/vt/vtgate/evalengine/arithmetic.go
@@ -48,7 +48,7 @@ func addNumericWithError(left, right eval) (eval, error) {
 	case *evalFloat:
 		return floatPlusAny(v1.f, v2)
 	}
-	return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "invalid arithmetic between: %s %s", evalToSqlValue(v1), evalToSqlValue(v2))
+	return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "invalid arithmetic between: %s %s", evalToSQLValue(v1), evalToSQLValue(v2))
 }
 
 func subtractNumericWithError(left, right eval) (eval, error) {
@@ -87,7 +87,7 @@ func subtractNumericWithError(left, right eval) (eval, error) {
 			return decimalMinusAny(v1, v2)
 		}
 	}
-	return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "invalid arithmetic between: %s %s", evalToSqlValue(v1), evalToSqlValue(v2))
+	return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "invalid arithmetic between: %s %s", evalToSQLValue(v1), evalToSQLValue(v2))
 }
 
 func multiplyNumericWithError(left, right eval) (eval, error) {
@@ -107,7 +107,7 @@ func multiplyNumericWithError(left, right eval) (eval, error) {
 	case *evalDecimal:
 		return decimalTimesAny(v1, v2)
 	}
-	return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "invalid arithmetic between: %s %s", evalToSqlValue(v1), evalToSqlValue(v2))
+	return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "invalid arithmetic between: %s %s", evalToSQLValue(v1), evalToSQLValue(v2))
 }
 
 func divideNumericWithError(left, right eval, precise bool) (eval, error) {

diff --git a/go/vt/vtgate/evalengine/casting_test.go b/go/vt/vtgate/evalengine/casting_test.go
@@ -41,23 +41,23 @@ func TestEvalResultToBooleanStrict(t *testing.T) {
 	}
 
 	for _, res := range trueValues {
-		name := evalToSqlValue(res).String()
+		name := evalToSQLValue(res).String()
 		t.Run(fmt.Sprintf("ToBooleanStrict() %s expected true (success)", name), func(t *testing.T) {
 			result, err := (&EvalResult{res}).ToBooleanStrict()
 			require.NoError(t, err, name)
 			require.Equal(t, true, result, name)
 		})
 	}
 	for _, res := range falseValues {
-		name := evalToSqlValue(res).String()
+		name := evalToSQLValue(res).String()
 		t.Run(fmt.Sprintf("ToBooleanStrict() %s expected false (success)", name), func(t *testing.T) {
 			result, err := (&EvalResult{res}).ToBooleanStrict()
 			require.NoError(t, err, name)
 			require.Equal(t, false, result, name)
 		})
 	}
 	for _, res := range invalid {
-		name := evalToSqlValue(res).String()
+		name := evalToSQLValue(res).String()
 		t.Run(fmt.Sprintf("ToBooleanStrict() %s  expected fail", name), func(t *testing.T) {
 			_, err := (&EvalResult{res}).ToBooleanStrict()
 			require.Error(t, err)

diff --git a/go/vt/vtgate/evalengine/eval.go b/go/vt/vtgate/evalengine/eval.go
@@ -60,7 +60,7 @@ type eval interface {
 	hash() (HashCode, error)
 }
 
-func evalToSqlValue(e eval) sqltypes.Value {
+func evalToSQLValue(e eval) sqltypes.Value {
 	if e == nil {
 		return sqltypes.NULL
 	}

diff --git a/go/vt/vtgate/evalengine/eval_numeric.go b/go/vt/vtgate/evalengine/eval_numeric.go
@@ -303,8 +303,8 @@ func (e *evalDecimal) toUint64() *evalUint64 {
 	if dec.Sign() < 0 {
 		i, _ := dec.Int64()
 		return newEvalUint64(uint64(i))
-	} else {
-		u, _ := dec.Uint64()
-		return newEvalUint64(u)
 	}
+
+	u, _ := dec.Uint64()
+	return newEvalUint64(u)
 }
diff --git a/go/vt/vtgate/evalengine/eval_result.go b/go/vt/vtgate/evalengine/eval_result.go
@@ -31,7 +31,7 @@ type EvalResult struct {
 
 // Value allows for retrieval of the value we expose for public consumption
 func (er EvalResult) Value() sqltypes.Value {
-	return evalToSqlValue(er.v)
+	return evalToSQLValue(er.v)
 }
 
 func (er EvalResult) Collation() collations.ID {
@@ -48,7 +48,7 @@ func (er EvalResult) TupleValues() []sqltypes.Value {
 	case *evalTuple:
 		result := make([]sqltypes.Value, 0, len(v.t))
 		for _, val := range v.t {
-			result = append(result, evalToSqlValue(val))
+			result = append(result, evalToSQLValue(val))
 		}
 		return result
 	default:

diff --git a/go/vt/vtgate/evalengine/format.go b/go/vt/vtgate/evalengine/format.go
@@ -58,12 +58,12 @@ func (l *Literal) format(w *formatter, depth int) {
 			if i > 0 {
 				w.WriteString(", ")
 			}
-			w.WriteString(evalToSqlValue(val).String())
+			w.WriteString(evalToSQLValue(val).String())
 		}
 		w.WriteByte(')')
 
 	default:
-		w.WriteString(evalToSqlValue(l.inner).String())
+		w.WriteString(evalToSQLValue(l.inner).String())
 	}
 }
 

diff --git a/misc/git/hooks/golangci-lint b/misc/git/hooks/golangci-lint
@@ -27,4 +27,4 @@ fi
 gopackages=$(echo "$gofiles" | xargs -n1 dirname | sort -u | paste -sd ' ' -)
 
 echo "Linting $gopackages"
-golangci-lint run -E revive $gopackages
+golangci-lint run $gopackages