should use strings.Contains() instead of strings.Index() (pingcap#4447)

hongyuanw · Sep 6, 2017 · 9a2fa13 · 9a2fa13
1 parent a8af813
commit 9a2fa13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/distsql/xeval/eval_compare_ops.go b/distsql/xeval/eval_compare_ops.go
@@ -180,7 +180,7 @@ func (e *Evaluator) evalLike(expr *tipb.Expr) (types.Datum, error) {
 	case matchSuffix:
 		matched = strings.HasSuffix(targetStr, trimmedPattern)
 	case matchMiddle:
-		matched = strings.Index(targetStr, trimmedPattern) != -1
+		matched = strings.Contains(targetStr, trimmedPattern)
 	}
 	if matched {
 		return types.NewIntDatum(1), nil

diff --git a/expression/builtin_time.go b/expression/builtin_time.go
@@ -1288,7 +1288,7 @@ func (c *strToDateFunctionClass) getRetTp(arg Expression, ctx context.Context) (
 	} else if !isDuration && isDate {
 		tp = mysql.TypeDate
 	}
-	if strings.Index(format, "%f") >= 0 {
+	if strings.Contains(format, "%f") {
 		fsp = types.MaxFsp
 	}
 	return