Skip to content

performance: use maps in conn.bind to avoid nested loops #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pquerna wants to merge 2 commits into
base: master
Choose a base branch
from
Open

performance: use maps in conn.bind to avoid nested loops #180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da8a72f
conn.bind: use indexes by ordinal or name when finding args
pquerna Dec 18, 2024
e558987
minimize allocations
pquerna Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 55 additions & 30 deletions sqlite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,38 @@ func (c *conn) bind(pstmt uintptr, n int, args []driver.NamedValue) (allocs []ui
allocs = nil
}()

var ordinalIndex map[int]int
byOrdinal := func(n int) (driver.NamedValue, bool) {
if ordinalIndex == nil {
ordinalIndex = make(map[int]int, len(args))
for i, v := range args {
ordinalIndex[v.Ordinal] = i
}
}
i, ok := ordinalIndex[n]
if !ok {
return driver.NamedValue{}, false
}
return args[i], true
}

var namedIndex map[string]int
byName := func(name string) (driver.NamedValue, bool) {
if namedIndex == nil {
namedIndex = make(map[string]int, len(args))
for i, v := range args {
if v.Name != "" {
namedIndex[v.Name] = i
}
}
}
i, ok := namedIndex[name]
if !ok {
return driver.NamedValue{}, false
}
return args[i], true
}

for i := 1; i <= n; i++ {
name, err := c.bindParameterName(pstmt, i)
if err != nil {
Expand All @@ -1069,41 +1101,34 @@ func (c *conn) bind(pstmt uintptr, n int, args []driver.NamedValue) (allocs []ui

var found bool
var v driver.NamedValue
for _, v = range args {
if name != "" {
// For ?NNN and $NNN params, match if NNN == v.Ordinal.
//
// Supporting this for $NNN is a special case that makes eg
// `select $1, $2, $3 ...` work without needing to use
// sql.Named.
if (name[0] == '?' || name[0] == '$') && name[1:] == strconv.Itoa(v.Ordinal) {
found = true
break
}

// sqlite supports '$', '@' and ':' prefixes for string
// identifiers and '?' for numeric, so we cannot
// combine different prefixes with the same name
// because `database/sql` requires variable names
// to start with a letter
if name[1:] == v.Name[:] {
found = true
break
}
} else {
if v.Ordinal == i {
found = true
break
if name == "" {
v, found = byOrdinal(i)
if !found {
return allocs, fmt.Errorf("missing argument with index %d", i)
}
} else {
// For ?NNN and $NNN params, match if NNN == v.Ordinal.
//
// Supporting this for $NNN is a special case that makes eg
// `select $1, $2, $3 ...` work without needing to use
// sql.Named.
if name[0] == '?' || name[0] == '$' && len(name) > 1 {
ordinal, err := strconv.ParseInt(name[1:], 10, 32)
if err == nil {
v, found = byOrdinal(int(ordinal))
if !found {
return allocs, fmt.Errorf("missing named numeric argument %q", name[1:])
}
}
}
}

if !found {
if name != "" {
return allocs, fmt.Errorf("missing named argument %q", name[1:])
if !found {
v, found = byName(name[1:])
if !found {
return allocs, fmt.Errorf("missing named argument %q", name)
}
}

return allocs, fmt.Errorf("missing argument with index %d", i)
}

var p uintptr
Expand Down
Loading