opt

Author: James Cor

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/lestrrat-go/strftime v1.0.4
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0
-	github.com/shopspring/decimal v1.3.1
+	github.com/shopspring/decimal v1.4.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/otel v1.31.0

go.sum

@@ -66,8 +66,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

sql/types/datetime.go

@@ -487,15 +487,12 @@ func (t datetimeType) SQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqlt
 	}
 	switch t.baseType {
 	case sqltypes.Date:
-		// TODO: move this to values package
 		t := values.ReadDate(v.Val)
 		dest = t.AppendFormat(dest, sql.DateLayout)
-
 	case sqltypes.Datetime, sqltypes.Timestamp:
 		x := values.ReadInt64(v.Val)
 		t := time.UnixMicro(x).UTC()
 		dest = t.AppendFormat(dest, sql.TimestampDatetimeLayout)
-
 	default:
 		return sqltypes.Value{}, sql.ErrInvalidBaseType.New(t.baseType.String(), "datetime")
 	}

sql/types/decimal.go

@@ -216,7 +216,7 @@ func (t DecimalType_) ConvertToNullDecimal(v interface{}) (decimal.NullDecimal,
 	case int64:
 		return t.ConvertToNullDecimal(decimal.NewFromInt(value))
 	case uint64:
-		return t.ConvertToNullDecimal(decimal.NewFromBigInt(new(big.Int).SetUint64(value), 0))
+		return t.ConvertToNullDecimal(decimal.NewFromUint64(value))
 	case float32:
 		return t.ConvertToNullDecimal(decimal.NewFromFloat32(value))
 	case float64:
@@ -351,8 +351,7 @@ func (t DecimalType_) SQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqlt
 		return sqltypes.NULL, nil
 	}
 	d := values.ReadDecimal(v.Val)
-	val := AppendAndSliceString(dest, t.DecimalValueStringFixed(d))
-	return sqltypes.MakeTrusted(sqltypes.Decimal, val), nil
+	return sqltypes.MakeTrusted(sqltypes.Decimal, []byte(t.DecimalValueStringFixed(d))), nil
 }
 
 // String implements Type interface.
@@ -437,8 +436,7 @@ func convertValueToDecimal(ctx *sql.Context, v sql.Value) (decimal.Decimal, erro
 		return decimal.NewFromInt(int64(x)), nil
 	case sqltypes.Uint64:
 		x := values.ReadUint64(v.Val)
-		bi := new(big.Int).SetUint64(x)
-		return decimal.NewFromBigInt(bi, 0), nil
+		return decimal.NewFromUint64(x), nil
 	case sqltypes.Float32:
 		x := values.ReadFloat32(v.Val)
 		return decimal.NewFromFloat32(x), nil
@@ -450,8 +448,7 @@ func convertValueToDecimal(ctx *sql.Context, v sql.Value) (decimal.Decimal, erro
 		return x, nil
 	case sqltypes.Bit:
 		x := values.ReadUint64(v.Val)
-		bi := new(big.Int).SetUint64(x)
-		return decimal.NewFromBigInt(bi, 0), nil
+		return decimal.NewFromUint64(x), nil
 	case sqltypes.Year:
 		x := values.ReadUint16(v.Val)
 		return decimal.NewFromInt(int64(x)), nil

sql/types/decimal_test.go

@@ -701,7 +701,7 @@ func TestConvertValueToDecimal(t *testing.T) {
 				Val: binary.LittleEndian.AppendUint64(nil, math.MaxUint64),
 				Typ: sqltypes.Uint64,
 			},
-			exp: decimal.NewFromBigInt(new(big.Int).SetUint64(math.MaxUint64), 0),
+			exp: decimal.NewFromUint64(math.MaxUint64),
 		},
 
 		// Float32 -> Decimal
@@ -835,7 +835,7 @@ func TestConvertValueToDecimal(t *testing.T) {
 				Val: binary.LittleEndian.AppendUint64(nil, math.MaxUint64),
 				Typ: sqltypes.Bit,
 			},
-			exp: decimal.NewFromBigInt(new(big.Int).SetUint64(math.MaxUint64), 0),
+			exp: decimal.NewFromUint64(math.MaxUint64),
 		},
 
 		// Year -> Decimal

sql/types/set.go

@@ -285,7 +285,7 @@ func (t SetType) SQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltypes.
 	}
 
 	// TODO: write append style encoder
-	res, ok := resultCharset.Encoder().Encode(encodings.StringToBytes(value)) // TODO: use unsafe string to byte
+	res, ok := resultCharset.Encoder().Encode([]byte(value))
 	if !ok {
 		if len(value) > 50 {
 			value = value[:50]

sql/types/time.go

@@ -279,9 +279,8 @@ func (t TimespanType_) SQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sql
 		return sqltypes.NULL, nil
 	}
 	x := values.ReadInt64(v.Val)
-	// TODO: write version of this that takes advantage of dest
-	v.Val = Timespan(x).Bytes()
-	return sqltypes.MakeTrusted(sqltypes.Time, v.Val), nil
+	dest = Timespan(x).AppendBytes(dest)
+	return sqltypes.MakeTrusted(sqltypes.Time, dest), nil
 }
 
 // String implements Type interface.
@@ -502,6 +501,35 @@ func (t Timespan) Bytes() []byte {
 	return ret[:i]
 }
 
+func (t Timespan) AppendBytes(dest []byte) []byte {
+	isNegative, hours, minutes, seconds, microseconds := t.timespanToUnits()
+	sz := 10
+	if microseconds > 0 {
+		sz += 7
+	}
+
+	i := 0
+	if isNegative {
+		dest = append(dest, '-')
+		i++
+	}
+
+	i = appendDigit(int64(hours), 2, dest, i)
+	dest[i] = ':'
+	i++
+	i = appendDigit(int64(minutes), 2, dest, i)
+	dest[i] = ':'
+	i++
+	i = appendDigit(int64(seconds), 2, dest, i)
+	if microseconds > 0 {
+		dest[i] = '.'
+		i++
+		i = appendDigit(int64(microseconds), 6, dest, i)
+	}
+
+	return dest[:i]
+}
+
 // appendDigit format prints 0-entended integer into buffer
 func appendDigit(v int64, extend int, buf []byte, i int) int {
 	cmp := int64(1)

sql/values/encoding.go

@@ -250,29 +250,6 @@ func WriteUint16(buf []byte, val uint16) []byte {
 	return buf
 }
 
-func WriteInt24(buf []byte, val int32) []byte {
-	expectSize(buf, Int24Size)
-
-	var tmp [4]byte
-	binary.LittleEndian.PutUint32(tmp[:], uint32(val))
-	// copy |tmp| to |buf|
-	buf[2], buf[1], buf[0] = tmp[2], tmp[1], tmp[0]
-	return buf
-}
-
-func WriteUint24(buf []byte, val uint32) []byte {
-	expectSize(buf, Uint24Size)
-	if val > maxUint24 {
-		panic("uint is greater than max uint24")
-	}
-
-	var tmp [4]byte
-	binary.LittleEndian.PutUint32(tmp[:], uint32(val))
-	// copy |tmp| to |buf|
-	buf[2], buf[1], buf[0] = tmp[2], tmp[1], tmp[0]
-	return buf
-}
-
 func WriteInt32(buf []byte, val int32) []byte {
 	expectSize(buf, Int32Size)
 	binary.LittleEndian.PutUint32(buf, uint32(val))