todos

Author: James Cor

server/handler.go

@@ -483,8 +483,8 @@ func (h *Handler) doQuery(
 	var processedAtLeastOneBatch bool
 
 	buf := sql.ByteBufPool.Get().(*sql.ByteBuffer)
+	buf.Reset()
 	defer func() {
-		buf.Reset()
 		sql.ByteBufPool.Put(buf)
 	}()
 
@@ -1196,6 +1196,10 @@ func toSqlHelper(ctx *sql.Context, typ sql.Type, buf *sql.ByteBuffer, val interf
 	if buf == nil {
 		return typ.SQL(ctx, nil, val)
 	}
+	// TODO: possible to predict max amount of space needed in backing array.
+	//  Only number types are written to byte buffer due to strconv.Append...
+	//  String types already create a new []byte, so it's better to not copy to backing array.
+
 	ret, err := typ.SQL(ctx, buf.Get(), val)
 	buf.Grow(ret.Len()) // TODO: shouldn't we check capacity beforehand?
 	return ret, err

sql/byte_buffer.go

@@ -41,11 +41,10 @@ func NewByteBuffer(initCap int) *ByteBuffer {
 // they expect to be protected.
 func (b *ByteBuffer) Grow(n int) {
 	newI := b.i
-	if b.i+n <= len(b.buf) {
+	if b.i+n <= cap(b.buf) {
 		// Increment |b.i| if no alloc
 		newI += n
-	}
-	if b.i+n >= len(b.buf) {
+	} else if b.i+n >= cap(b.buf) {
 		// No more space, double.
 		// An external allocation doubled the cap using the size of
 		// the override object, which if used could lead to overall
@@ -59,6 +58,7 @@ func (b *ByteBuffer) Grow(n int) {
 // here because the runtime only doubles based on slice
 // length.
 func (b *ByteBuffer) Double() {
+	// TODO: This wastes memory. The first half of b.buf won't be referenced by anything.
 	buf := make([]byte, len(b.buf)*2)
 	copy(buf, b.buf)
 	b.buf = buf