more refactoring

Author: James Cor

server/handler.go

@@ -1131,7 +1131,7 @@ func toSqlHelper(ctx *sql.Context, typ sql.Type, buf *sql.ByteBuffer, val interf
 		return typ.SQL(ctx, nil, val)
 	}
 	ret, err := typ.SQL(ctx, buf.Get(), val)
-	buf.Grow(ret.Len())
+	buf.Grow(ret.Len()) // TODO: shouldn't we check capacity beforehand?
 	return ret, err
 }
 
@@ -1182,7 +1182,7 @@ func RowValueToSQLValues(ctx *sql.Context, sch sql.Schema, row sql.ValueRow, buf
 	outVals := make([]sqltypes.Value, len(sch))
 	for i, col := range sch {
 		// TODO: remove this check once all Types implement this
-		valType, ok := col.Type.(sql.Type2)
+		valType, ok := col.Type.(sql.ValueType)
 		if !ok {
 			if row[i].IsNull() {
 				outVals[i] = sqltypes.NULL

sql/expression/get_field.go

@@ -25,8 +25,7 @@ import (
 
 // GetField is an expression to get the field of a table.
 type GetField struct {
-	fieldType  sql.Type
-	fieldType2 sql.Type2
+	fieldType sql.Type
 	// schemaFormatter is the schemaFormatter used to quote field names
 	schemaFormatter sql.SchemaFormatter
 
@@ -58,13 +57,11 @@ func NewGetField(index int, fieldType sql.Type, fieldName string, nullable bool)
 
 // NewGetFieldWithTable creates a GetField expression with table name. The table name may be an alias.
 func NewGetFieldWithTable(index, tableId int, fieldType sql.Type, db, table, fieldName string, nullable bool) *GetField {
-	fieldType2, _ := fieldType.(sql.Type2)
 	return &GetField{
 		db:         db,
 		table:      table,
 		fieldIndex: index,
 		fieldType:  fieldType,
-		fieldType2: fieldType2,
 		name:       fieldName,
 		nullable:   nullable,
 		exprId:     sql.ColumnId(index),

sql/type.go

@@ -292,7 +292,7 @@ func IsDecimalType(t Type) bool {
 	return ok
 }
 
-type Type2 interface {
+type ValueType interface {
 	Type
 	ToSQLValue(*Context, Value, []byte) (sqltypes.Value, error)
 }

sql/types/bit.go

@@ -211,27 +211,23 @@ func (t BitType_) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltypes.Va
 	return sqltypes.MakeTrusted(sqltypes.Bit, val), nil
 }
 
-// ToSQLValue implements Type2 interface.
+// ToSQLValue implements ValueType interface.
 func (t BitType_) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltypes.Value, error) {
 	if v.IsNull() {
 		return sqltypes.NULL, nil
 	}
 
+	// Trim/Pad result to the appropriate length
 	numBytes := t.numOfBits / 8
 	if t.numOfBits%8 != 0 {
 		numBytes += 1
 	}
-
-	if uint8(len(v.Val)) < numBytes {
-		// already in little endian, so just pad with trailing 0s
-		for i := uint8(len(v.Val)); i <= t.numOfBits/8; i++ {
-			v.Val = append(v.Val, 0)
-		}
-	} else {
-		v.Val = v.Val[:numBytes]
+	for i := uint8(len(v.Val)); i < numBytes; i++ {
+		v.Val = append(v.Val, 0)
 	}
+	v.Val = v.Val[:numBytes]
 
-	// TODO: for whatever reason, TestTypesOverWire only works when this is a deep copy?
+	// TODO: for whatever reason TestTypesOverWire only works when this is a deep copy?
 	dest = append(dest, v.Val...)
 	// want the results in big endian
 	for i, j := 0, len(dest)-1; i < j; i, j = i+1, j-1 {

sql/types/number.go

@@ -102,7 +102,7 @@ type NumberTypeImpl_ struct {
 }
 
 var _ sql.Type = NumberTypeImpl_{}
-var _ sql.Type2 = NumberTypeImpl_{}
+var _ sql.ValueType = NumberTypeImpl_{}
 var _ sql.CollationCoercible = NumberTypeImpl_{}
 var _ sql.NumberType = NumberTypeImpl_{}
 var _ sql.RoundingNumberType = NumberTypeImpl_{}
@@ -867,7 +867,7 @@ func (t NumberTypeImpl_) Zero2() sql.Value {
 	}
 }
 
-// ToSQLValue implements Type2 interface.
+// ToSQLValue implements ValueType interface.
 func (t NumberTypeImpl_) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltypes.Value, error) {
 	if v.IsNull() {
 		return sqltypes.NULL, nil