Code review

Signed-off-by: Theo Despoudis <[email protected]>

Author: theodesp

sql/expression/function/reverse_repeat_replace.go

@@ -14,7 +14,7 @@ type Reverse struct {
 	expression.UnaryExpression
 }
 
-// NewLower creates a new Lower expression.
+// NewReverse creates a new Reverse expression.
 func NewReverse(e sql.Expression) sql.Expression {
 	return &Reverse{expression.UnaryExpression{Child: e}}
 }
@@ -25,14 +25,10 @@ func (r *Reverse) Eval(
 	row sql.Row,
 ) (interface{}, error) {
 	v, err := r.Child.Eval(ctx, row)
-	if err != nil {
+	if v == nil || err != nil {
 		return nil, err
 	}
 
-	if v == nil {
-		return nil, nil
-	}
-
 	v, err = sql.Text.Convert(v)
 	if err != nil {
 		return nil, err
@@ -43,9 +39,7 @@ func (r *Reverse) Eval(
 
 func reverseString(s string) string {
 	r := []rune(s)
-	l := len(r)
-	l2 := l/2
-	for i, j := 0, l-1; i < l2; i, j = i+1, j-1 {
+	for i, j := 0, len(r) - 1; i < j; i, j = i+1, j-1 {
 		r[i], r[j] = r[j], r[i]
 	}
 	return string(r)
@@ -110,28 +104,20 @@ func (r *Repeat) Eval(
 	row sql.Row,
 ) (interface{}, error) {
 	str, err := r.Left.Eval(ctx, row)
-	if err != nil {
+	if str == nil || err != nil {
 		return nil, err
 	}
 
-	if str == nil {
-		return nil, nil
-	}
-
 	str, err = sql.Text.Convert(str)
 	if err != nil {
 		return nil, err
 	}
 
 	count, err := r.Right.Eval(ctx, row)
-	if err != nil {
+	if count == nil || err != nil {
 		return nil, err
 	}
 
-	if count == nil {
-		return nil, nil
-	}
-
 	count, err = sql.Int32.Convert(count)
 	if err != nil {
 		return nil, err
@@ -204,42 +190,30 @@ func (r *Replace) Eval(
 	row sql.Row,
 ) (interface{}, error) {
 	str, err := r.str.Eval(ctx, row)
-	if err != nil {
+	if str == nil || err != nil {
 		return nil, err
 	}
 
-	if str == nil {
-		return nil, nil
-	}
-
 	str, err = sql.Text.Convert(str)
 	if err != nil {
 		return nil, err
 	}
 
 	fromStr, err := r.fromStr.Eval(ctx, row)
-	if err != nil {
+	if fromStr == nil || err != nil {
 		return nil, err
 	}
 
-	if fromStr == nil {
-		return nil, nil
-	}
-
 	fromStr, err = sql.Text.Convert(fromStr)
 	if err != nil {
 		return nil, err
 	}
 
 	toStr, err := r.toStr.Eval(ctx, row)
-	if err != nil {
+	if toStr == nil || err != nil {
 		return nil, err
 	}
 
-	if toStr == nil {
-		return nil, nil
-	}
-
 	toStr, err = sql.Text.Convert(toStr)
 	if err != nil {
 		return nil, err