Merge pull request jmoiron#287 from nussjustin/perf-in-slice

jmoiron · web-flow · commit a1748a3ecbb7 · 2018-10-16T00:06:28.000-04:00
Use []byte instead of bytes.Buffer in In
diff --git a/bind.go b/bind.go
@@ -145,7 +145,7 @@ func In(query string, args ...interface{}) (string, []interface{}, error) {
 	}
 
 	newArgs := make([]interface{}, 0, flatArgsCount)
-	buf := bytes.NewBuffer(make([]byte, 0, len(query)+len(", ?")*flatArgsCount))
+	buf := make([]byte, 0, len(query)+len(", ?")*flatArgsCount)
 
 	var arg, offset int
 
@@ -171,10 +171,10 @@ func In(query string, args ...interface{}) (string, []interface{}, error) {
 		}
 
 		// write everything up to and including our ? character
-		buf.WriteString(query[:offset+i+1])
+		buf = append(buf, query[:offset+i+1]...)
 
 		for si := 1; si < argMeta.length; si++ {
-			buf.WriteString(", ?")
+			buf = append(buf, ", ?"...)
 		}
 
 		newArgs = appendReflectSlice(newArgs, argMeta.v, argMeta.length)
@@ -185,13 +185,13 @@ func In(query string, args ...interface{}) (string, []interface{}, error) {
 		offset = 0
 	}
 
-	buf.WriteString(query)
+	buf = append(buf, query...)
 
 	if arg < len(meta) {
 		return "", nil, errors.New("number of bindVars less than number arguments")
 	}
 
-	return buf.String(), newArgs, nil
+	return string(buf), newArgs, nil
 }
 
 func appendReflectSlice(args []interface{}, v reflect.Value, vlen int) []interface{} {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func In(query string, args ...interface{}) (string, []interface{}, error) {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`newArgs := make([]interface{}, 0, flatArgsCount)`
`148`		`- buf := bytes.NewBuffer(make([]byte, 0, len(query)+len(", ?")*flatArgsCount))`
	`148`	`+ buf := make([]byte, 0, len(query)+len(", ?")*flatArgsCount)`
`149`	`149`
`150`	`150`	`var arg, offset int`
`151`	`151`
`@@ -171,10 +171,10 @@ func In(query string, args ...interface{}) (string, []interface{}, error) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`// write everything up to and including our ? character`
`174`		`- buf.WriteString(query[:offset+i+1])`
	`174`	`+ buf = append(buf, query[:offset+i+1]...)`
`175`	`175`
`176`	`176`	`for si := 1; si < argMeta.length; si++ {`
`177`		`- buf.WriteString(", ?")`
	`177`	`+ buf = append(buf, ", ?"...)`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`newArgs = appendReflectSlice(newArgs, argMeta.v, argMeta.length)`
`@@ -185,13 +185,13 @@ func In(query string, args ...interface{}) (string, []interface{}, error) {`
`185`	`185`	`offset = 0`
`186`	`186`	`}`
`187`	`187`
`188`		`- buf.WriteString(query)`
	`188`	`+ buf = append(buf, query...)`
`189`	`189`
`190`	`190`	`if arg < len(meta) {`
`191`	`191`	`return "", nil, errors.New("number of bindVars less than number arguments")`
`192`	`192`	`}`
`193`	`193`
`194`		`- return buf.String(), newArgs, nil`
	`194`	`+ return string(buf), newArgs, nil`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`func appendReflectSlice(args []interface{}, v reflect.Value, vlen int) []interface{} {`