Skip to content

Commit 5959360

Browse files
charlieviethcharlievieth
committed
reduce allocations when binding string/time args
This commit reduces the number of allocations required to bind args by eliminating string to byte slice conversions for string and time.Time types and by only checking for bind parameters if any of the driver.NamedValue args are named. ``` goos: darwin goarch: arm64 pkg: github.com/charlievieth/go-sqlite3 cpu: Apple M4 Pro │ x1.txt │ x2.txt │ │ sec/op │ sec/op vs base │ Suite/BenchmarkExec/Params-14 720.8n ± 1% 675.1n ± 1% -6.33% (p=0.000 n=10) Suite/BenchmarkExec/NoParams-14 493.0n ± 1% 467.5n ± 1% -5.18% (p=0.000 n=10) Suite/BenchmarkExecContext/Params-14 1.601µ ± 4% 1.538µ ± 1% -3.97% (p=0.000 n=10) Suite/BenchmarkExecContext/NoParams-14 1.416µ ± 1% 1.417µ ± 2% ~ (p=0.566 n=10) Suite/BenchmarkExecStep-14 421.0µ ± 1% 415.1µ ± 1% -1.39% (p=0.004 n=10) Suite/BenchmarkExecContextStep-14 421.6µ ± 1% 415.7µ ± 1% -1.41% (p=0.009 n=10) Suite/BenchmarkExecTx-14 1.537µ ± 1% 1.535µ ± 3% ~ (p=0.342 n=10) Suite/BenchmarkQuery-14 1.837µ ± 1% 1.826µ ± 1% ~ (p=0.093 n=10) Suite/BenchmarkQuerySimple-14 1.127µ ± 1% 1.115µ ± 0% -1.15% (p=0.000 n=10) Suite/BenchmarkQueryContext/Background-14 2.349µ ± 1% 2.323µ ± 1% ~ (p=0.052 n=10) Suite/BenchmarkQueryContext/WithCancel-14 8.796µ ± 5% 8.624µ ± 5% ~ (p=0.912 n=10) Suite/BenchmarkParams-14 2.043µ ± 2% 1.989µ ± 1% -2.64% (p=0.000 n=10) Suite/BenchmarkStmt-14 1.383µ ± 1% 1.368µ ± 0% -1.12% (p=0.000 n=10) Suite/BenchmarkRows-14 57.55µ ± 1% 56.86µ ± 1% ~ (p=0.052 n=10) Suite/BenchmarkStmtRows-14 56.57µ ± 1% 56.89µ ± 2% ~ (p=0.739 n=10) Suite/BenchmarkStmt10Cols-14 4.230µ ± 1% 4.222µ ± 1% ~ (p=0.109 n=10) geomean 5.281µ 5.189µ -1.75% │ x1.txt │ x2.txt │ │ B/op │ B/op vs base │ Suite/BenchmarkExec/Params-14 240.0 ± 0% 216.0 ± 0% -10.00% (p=0.000 n=10) Suite/BenchmarkExec/NoParams-14 64.00 ± 0% 64.00 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkExecContext/Params-14 399.0 ± 0% 375.0 ± 0% -6.02% (p=0.000 n=10) Suite/BenchmarkExecContext/NoParams-14 208.0 ± 0% 208.0 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkExecStep-14 64.00 ± 0% 64.00 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkExecContextStep-14 208.0 ± 0% 208.0 ± 0% ~ (p=0.737 n=10) Suite/BenchmarkExecTx-14 520.0 ± 0% 520.0 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkQuery-14 656.0 ± 0% 656.0 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkQuerySimple-14 456.0 ± 0% 456.0 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkQueryContext/Background-14 396.0 ± 0% 396.0 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkQueryContext/WithCancel-14 1.273Ki ± 0% 1.273Ki ± 0% ~ (p=0.211 n=10) Suite/BenchmarkParams-14 904.0 ± 0% 800.0 ± 0% -11.50% (p=0.000 n=10) Suite/BenchmarkStmt-14 888.0 ± 0% 784.0 ± 0% -11.71% (p=0.000 n=10) Suite/BenchmarkRows-14 9.188Ki ± 0% 9.188Ki ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkStmtRows-14 9.180Ki ± 0% 9.180Ki ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkStmt10Cols-14 712.0 ± 0% 712.0 ± 0% ~ (p=1.000 n=10) ¹ geomean 549.4 535.4 -2.56% ¹ all samples are equal │ x1.txt │ x2.txt │ │ allocs/op │ allocs/op vs base │ Suite/BenchmarkExec/Params-14 9.000 ± 0% 8.000 ± 0% -11.11% (p=0.000 n=10) Suite/BenchmarkExec/NoParams-14 4.000 ± 0% 4.000 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkExecContext/Params-14 11.00 ± 0% 10.00 ± 0% -9.09% (p=0.000 n=10) Suite/BenchmarkExecContext/NoParams-14 6.000 ± 0% 6.000 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkExecStep-14 4.000 ± 0% 4.000 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkExecContextStep-14 6.000 ± 0% 6.000 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkExecTx-14 18.00 ± 0% 18.00 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkQuery-14 22.00 ± 0% 22.00 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkQuerySimple-14 13.00 ± 0% 13.00 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkQueryContext/Background-14 10.00 ± 0% 10.00 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkQueryContext/WithCancel-14 26.00 ± 0% 26.00 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkParams-14 25.00 ± 0% 23.00 ± 0% -8.00% (p=0.000 n=10) Suite/BenchmarkStmt-14 25.00 ± 0% 23.00 ± 0% -8.00% (p=0.000 n=10) Suite/BenchmarkRows-14 518.0 ± 0% 518.0 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkStmtRows-14 518.0 ± 0% 518.0 ± 0% ~ (p=1.000 n=10) ¹ Suite/BenchmarkStmt10Cols-14 19.00 ± 0% 19.00 ± 0% ~ (p=1.000 n=10) ¹ geomean 18.80 18.36 -2.35% ¹ all samples are equal ```
1 parent 8ba2e97 commit 5959360

File tree

1 file changed

+77
-16
lines changed

1 file changed

+77
-16
lines changed

‎sqlite3.go‎

Lines changed: 77 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2182,26 +2182,90 @@ func (s *SQLiteStmt) NumInput() int {
21822182

21832183
var placeHolder = []byte{0}
21842184

2185+
func hasNamedArgs(args []driver.NamedValue) bool {
2186+
for _, v := range args {
2187+
if v.Name != "" {
2188+
return true
2189+
}
2190+
}
2191+
return false
2192+
}
2193+
21852194
func (s *SQLiteStmt) bind(args []driver.NamedValue) error {
21862195
rv := C.sqlite3_reset(s.s)
21872196
if rv != C.SQLITE_ROW && rv != C.SQLITE_OK && rv != C.SQLITE_DONE {
21882197
return s.c.lastError()
21892198
}
21902199

2200+
if hasNamedArgs(args) {
2201+
return s.bindIndices(args)
2202+
}
2203+
2204+
for _, arg := range args {
2205+
n := C.int(arg.Ordinal)
2206+
switch v := arg.Value.(type) {
2207+
case nil:
2208+
rv = C.sqlite3_bind_null(s.s, n)
2209+
case string:
2210+
p := stringData(v)
2211+
rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(p)), C.int(len(v)))
2212+
case int64:
2213+
rv = C.sqlite3_bind_int64(s.s, n, C.sqlite3_int64(v))
2214+
case bool:
2215+
val := 0
2216+
if v {
2217+
val = 1
2218+
}
2219+
rv = C.sqlite3_bind_int(s.s, n, C.int(val))
2220+
case float64:
2221+
rv = C.sqlite3_bind_double(s.s, n, C.double(v))
2222+
case []byte:
2223+
if v == nil {
2224+
rv = C.sqlite3_bind_null(s.s, n)
2225+
} else {
2226+
ln := len(v)
2227+
if ln == 0 {
2228+
v = placeHolder
2229+
}
2230+
rv = C._sqlite3_bind_blob(s.s, n, unsafe.Pointer(&v[0]), C.int(ln))
2231+
}
2232+
case time.Time:
2233+
ts := v.Format(SQLiteTimestampFormats[0])
2234+
p := stringData(ts)
2235+
rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(p)), C.int(len(ts)))
2236+
}
2237+
if rv != C.SQLITE_OK {
2238+
return s.c.lastError()
2239+
}
2240+
}
2241+
return nil
2242+
}
2243+
2244+
func (s *SQLiteStmt) bindIndices(args []driver.NamedValue) error {
2245+
// Find the longest named parameter name.
2246+
n := 0
2247+
for _, v := range args {
2248+
if m := len(v.Name); m > n {
2249+
n = m
2250+
}
2251+
}
2252+
buf := make([]byte, 0, n+2) // +2 for placeholder and null terminator
2253+
21912254
bindIndices := make([][3]int, len(args))
2192-
prefixes := []string{":", "@", "$"}
21932255
for i, v := range args {
21942256
bindIndices[i][0] = args[i].Ordinal
21952257
if v.Name != "" {
2196-
for j := range prefixes {
2197-
cname := C.CString(prefixes[j] + v.Name)
2198-
bindIndices[i][j] = int(C.sqlite3_bind_parameter_index(s.s, cname))
2199-
C.free(unsafe.Pointer(cname))
2258+
for j, c := range []byte{':', '@', '$'} {
2259+
buf = append(buf[:0], c)
2260+
buf = append(buf, v.Name...)
2261+
buf = append(buf, 0)
2262+
bindIndices[i][j] = int(C.sqlite3_bind_parameter_index(s.s, (*C.char)(unsafe.Pointer(&buf[0]))))
22002263
}
22012264
args[i].Ordinal = bindIndices[i][0]
22022265
}
22032266
}
22042267

2268+
var rv C.int
22052269
for i, arg := range args {
22062270
for j := range bindIndices[i] {
22072271
if bindIndices[i][j] == 0 {
@@ -2212,20 +2276,16 @@ func (s *SQLiteStmt) bind(args []driver.NamedValue) error {
22122276
case nil:
22132277
rv = C.sqlite3_bind_null(s.s, n)
22142278
case string:
2215-
if len(v) == 0 {
2216-
rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&placeHolder[0])), C.int(0))
2217-
} else {
2218-
b := []byte(v)
2219-
rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b)))
2220-
}
2279+
p := stringData(v)
2280+
rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(p)), C.int(len(v)))
22212281
case int64:
22222282
rv = C.sqlite3_bind_int64(s.s, n, C.sqlite3_int64(v))
22232283
case bool:
2284+
val := 0
22242285
if v {
2225-
rv = C.sqlite3_bind_int(s.s, n, 1)
2226-
} else {
2227-
rv = C.sqlite3_bind_int(s.s, n, 0)
2286+
val = 1
22282287
}
2288+
rv = C.sqlite3_bind_int(s.s, n, C.int(val))
22292289
case float64:
22302290
rv = C.sqlite3_bind_double(s.s, n, C.double(v))
22312291
case []byte:
@@ -2239,8 +2299,9 @@ func (s *SQLiteStmt) bind(args []driver.NamedValue) error {
22392299
rv = C._sqlite3_bind_blob(s.s, n, unsafe.Pointer(&v[0]), C.int(ln))
22402300
}
22412301
case time.Time:
2242-
b := []byte(v.Format(SQLiteTimestampFormats[0]))
2243-
rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b)))
2302+
ts := v.Format(SQLiteTimestampFormats[0])
2303+
p := stringData(ts)
2304+
rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(p)), C.int(len(ts)))
22442305
}
22452306
if rv != C.SQLITE_OK {
22462307
return s.c.lastError()

0 commit comments

Comments
 (0)