diff options
| author | Cyrill Schumacher <cyrill@schumacher.fm> | 2017-09-28 10:23:12 +0200 |
|---|---|---|
| committer | Daniel Theophanes <kardianos@gmail.com> | 2017-10-01 16:41:57 +0000 |
| commit | 3487c4e02199b68d71df1868326e1b0a872a89a2 (patch) | |
| tree | a73b9da715cd74845405357ffc93572a8a1df754 /src/database/sql | |
| parent | a82ee9c76d979f8ea713caa13023dcfd747b433a (diff) | |
| download | go-3487c4e02199b68d71df1868326e1b0a872a89a2.tar.xz | |
database/sql: convertAssign string and time.Time into RawBytes
A new switch case for converting the source string type into a
destination RawBytes type avoids the reflection based conversion.
Speed up from old ~61.7ns/op down to ~49ns/op.
A second new switch case allows to convert and assign a source time.Time
type into a destination sql.RawBytes type. This switch case appends
the time to the reset RawBytes slice. This allows the reuse of RawBytes
and avoids allocations.
Fixes #20746
Change-Id: Ib0563fd5c5c7cb6d9d0acaa1d9aa7b2927f1329c
Reviewed-on: https://go-review.googlesource.com/66830
Run-TryBot: Daniel Theophanes <kardianos@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Daniel Theophanes <kardianos@gmail.com>
Diffstat (limited to 'src/database/sql')
| -rw-r--r-- | src/database/sql/convert.go | 12 | ||||
| -rw-r--r-- | src/database/sql/convert_test.go | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/database/sql/convert.go b/src/database/sql/convert.go index 3c387fb25c..c349a96edf 100644 --- a/src/database/sql/convert.go +++ b/src/database/sql/convert.go @@ -234,6 +234,12 @@ func convertAssign(dest, src interface{}) error { } *d = []byte(s) return nil + case *RawBytes: + if d == nil { + return errNilPtr + } + *d = append((*d)[:0], s...) + return nil } case []byte: switch d := dest.(type) { @@ -273,6 +279,12 @@ func convertAssign(dest, src interface{}) error { } *d = []byte(s.Format(time.RFC3339Nano)) return nil + case *RawBytes: + if d == nil { + return errNilPtr + } + *d = s.AppendFormat((*d)[:0], time.RFC3339Nano) + return nil } case nil: switch d := dest.(type) { diff --git a/src/database/sql/convert_test.go b/src/database/sql/convert_test.go index 169ecaed6f..35dbab3339 100644 --- a/src/database/sql/convert_test.go +++ b/src/database/sql/convert_test.go @@ -106,6 +106,7 @@ var conversionTests = []conversionTest{ // To RawBytes {s: nil, d: &scanraw, wantraw: nil}, {s: []byte("byteslice"), d: &scanraw, wantraw: RawBytes("byteslice")}, + {s: "string", d: &scanraw, wantraw: RawBytes("string")}, {s: 123, d: &scanraw, wantraw: RawBytes("123")}, {s: int8(123), d: &scanraw, wantraw: RawBytes("123")}, {s: int64(123), d: &scanraw, wantraw: RawBytes("123")}, @@ -114,6 +115,9 @@ var conversionTests = []conversionTest{ {s: uint32(123), d: &scanraw, wantraw: RawBytes("123")}, {s: uint64(123), d: &scanraw, wantraw: RawBytes("123")}, {s: 1.5, d: &scanraw, wantraw: RawBytes("1.5")}, + // time.Time has been placed here to check that the RawBytes slice gets + // correctly reset when calling time.Time.AppendFormat. + {s: time.Unix(2, 5).UTC(), d: &scanraw, wantraw: RawBytes("1970-01-01T00:00:02.000000005Z")}, // Strings to integers {s: "255", d: &scanuint8, wantuint: 255}, @@ -347,6 +351,7 @@ func TestRawBytesAllocs(t *testing.T) { {"float32", float32(1.5), "1.5"}, {"float64", float64(64), "64"}, {"bool", false, "false"}, + {"time", time.Unix(2, 5).UTC(), "1970-01-01T00:00:02.000000005Z"}, } buf := make(RawBytes, 10) |