simplify

Author: max-hoffman

server/handler.go

@@ -933,15 +933,10 @@ func updateMaxUsedConnectionsStatusVariable() {
 
 func toSqlHelper(ctx *sql.Context, typ sql.Type, buf *sql.ByteBuffer, val interface{}) (sqltypes.Value, error) {
 	if buf == nil {
-		return typ.SQL(ctx, buf.Get(), val)
+		return typ.SQL(ctx, nil, val)
 	}
-	spare := buf.Spare()
 	ret, err := typ.SQL(ctx, buf.Get(), val)
-	if ret.Len() > spare {
-		buf.Double()
-	} else {
-		buf.Advance(ret.Len())
-	}
+	buf.Update(ret.Raw())
 	return ret, err
 }
 

server/handler_test.go

@@ -15,6 +15,7 @@
 package server
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -799,27 +800,29 @@ func TestHandlerKillQuery(t *testing.T) {
 	}()
 
 	time.Sleep(100 * time.Millisecond)
-	var sleepQueryID string
+	var sleepQueryID []byte
 	err = handler.ComQuery(context.Background(), conn2, "SHOW PROCESSLIST", func(res *sqltypes.Result, more bool) error {
 		// 1,  ,  , test, Query, 0, ...    , SELECT SLEEP(1000)
 		// 2,  ,  , test, Query, 0, running, SHOW PROCESSLIST
 		require.Equal(2, len(res.Rows))
 		hasSleepQuery := false
+		fmt.Println(res.Rows[0][0].ToString(), res.Rows[0][7].ToString())
+		fmt.Println(res.Rows[1][0].ToString(), res.Rows[1][7].ToString())
 		for _, row := range res.Rows {
-			if row[7].ToString() != sleepQuery {
+			if !bytes.Equal(row[7].Raw(), []byte(sleepQuery)) {
 				continue
 			}
 			hasSleepQuery = true
-			sleepQueryID = row[0].ToString()
-			require.Equal("Query", row[4].ToString())
+			sleepQueryID = row[0].Raw()
+			require.Equal([]byte("Query"), row[4].Raw())
 		}
 		require.True(hasSleepQuery)
 		return nil
 	})
 	require.NoError(err)
 
 	time.Sleep(100 * time.Millisecond)
-	err = handler.ComQuery(context.Background(), conn2, "KILL QUERY "+sleepQueryID, func(res *sqltypes.Result, more bool) error {
+	err = handler.ComQuery(context.Background(), conn2, "KILL QUERY "+string(sleepQueryID), func(res *sqltypes.Result, more bool) error {
 		return nil
 	})
 	require.NoError(err)
@@ -832,12 +835,12 @@ func TestHandlerKillQuery(t *testing.T) {
 		require.Equal(2, len(res.Rows))
 		hasSleepQueryID := false
 		for _, row := range res.Rows {
-			if row[0].ToString() != sleepQueryID {
+			if !bytes.Equal(row[0].ToBytes(), sleepQueryID) {
 				continue
 			}
 			hasSleepQueryID = true
-			require.Equal("Sleep", row[4].ToString())
-			require.Equal("", row[7].ToString())
+			require.Equal([]byte("Sleep"), row[4].ToBytes())
+			require.Equal([]byte{}, row[7].ToBytes())
 		}
 		require.True(hasSleepQueryID)
 		return nil

sql/byte_buffer.go

@@ -4,69 +4,32 @@ import (
 	"sync"
 )
 
-var SingletonBuf = NewByteBuffer(16000)
-
-var defaultByteBuffCap = 1000
+const defaultByteBuffCap = 1024
 
 var ByteBufPool = sync.Pool{
 	New: func() any {
-		// The Pool's New function should generally only return pointer
-		// types, since a pointer can be put into the return interface
-		// value without an allocation:
 		return NewByteBuffer(defaultByteBuffCap)
 	},
 }
 
 type ByteBuffer struct {
 	buf []byte
-	i   int
 }
 
 func NewByteBuffer(initCap int) *ByteBuffer {
-	return &ByteBuffer{buf: make([]byte, initCap)}
-}
-
-func (b *ByteBuffer) Bytes() []byte {
-	return b.buf
+	return &ByteBuffer{buf: make([]byte, 0, initCap)}
 }
 
-func (b *ByteBuffer) GetFull(i int) []byte {
-	start := b.i
-	b.i = start + i
-	if b.i > len(b.buf) {
-		newBuf := make([]byte, len(b.buf)*2)
-		copy(newBuf, b.buf[:])
-		b.buf = newBuf
+func (b *ByteBuffer) Update(buf []byte) {
+	if cap(buf) > cap(b.buf) {
+		b.buf = buf
 	}
-	return b.buf[start:b.i]
-}
-
-func (b *ByteBuffer) Double() {
-	newBuf := make([]byte, len(b.buf)*2)
-	copy(newBuf, b.buf[:])
-	b.buf = newBuf
-}
-
-func (b *ByteBuffer) Advance(i int) {
-	b.i += i
-}
-
-func (b *ByteBuffer) Spare() int {
-	return len(b.buf) - b.i
 }
 
 func (b *ByteBuffer) Get() []byte {
-	//start := b.i
-	//b.i = start + i
-	//if b.i > len(b.buf) {
-	//	newBuf := make([]byte, len(b.buf)*2)
-	//	copy(newBuf, b.buf[:])
-	//	b.buf = newBuf
-	//}
-	//return b.buf[start:b.i][:0]
-	return b.buf[b.i:b.i]
+	return b.buf[len(b.buf):]
 }
 
 func (b *ByteBuffer) Reset() {
-	b.i = 0
+	b.buf = b.buf[:0]
 }