normalize on string in-mem representation

Author: zachmu

server/ast/expr.go

@@ -476,8 +476,11 @@ func nodeExpr(ctx *Context, node tree.Expr) (vitess.Expr, error) {
 	case *tree.DArray:
 		return nil, errors.Errorf("the statement is not yet supported")
 	case *tree.DBitArray:
+		// We convert bitarray to string representation for engine representation purposes so that we don't have to
+		// represent another fundamental type golang type. This means our representation in memory is more verbose.
+		bitStr := tree.AsStringWithFlags(node, tree.FmtPgwireText)
 		return vitess.InjectedExpr{
-			Expression: pgexprs.NewUnsafeLiteral(node, pgtypes.Bit),
+			Expression: pgexprs.NewUnsafeLiteral(bitStr, pgtypes.Bit),
 		}, nil
 	case *tree.DBool:
 		return vitess.InjectedExpr{

server/functions/bit.go

@@ -45,6 +45,7 @@ var bitin = framework.Function3{
 		input := val1.(string)
 		typmod := val3.(int32)
 
+		// validation and normalization
 		array, err := tree.ParseDBitArray(input)
 		if err != nil {
 			return nil, err
@@ -55,7 +56,7 @@ var bitin = framework.Function3{
 			return nil, pgtypes.ErrWrongLengthBit.New(len(input), expectedLength)
 		}
 
-		return array, nil
+		return tree.AsStringWithFlags(array, tree.FmtPgwireText), nil
 	},
 }
 
@@ -66,8 +67,8 @@ var bitout = framework.Function1{
 	Parameters: [1]*pgtypes.DoltgresType{pgtypes.Bit},
 	Strict:     true,
 	Callable: func(ctx *sql.Context, t [2]*pgtypes.DoltgresType, val any) (any, error) {
-		bitStr := val.(*tree.DBitArray)
-		return tree.AsStringWithFlags(bitStr, tree.FmtPgwireText), nil
+		bitStr := val.(string)
+		return bitStr, nil
 	},
 }
 
@@ -83,7 +84,7 @@ var bitrecv = framework.Function3{
 			return nil, nil
 		}
 		reader := utils.NewReader(data)
-		return tree.ParseDBitArray(reader.String())
+		return reader.String(), nil
 	},
 }
 
@@ -94,8 +95,7 @@ var bitsend = framework.Function1{
 	Parameters: [1]*pgtypes.DoltgresType{pgtypes.Bit},
 	Strict:     true,
 	Callable: func(ctx *sql.Context, _ [2]*pgtypes.DoltgresType, val any) (any, error) {
-		bitStr := val.(*tree.DBitArray)
-		str := tree.AsStringWithFlags(bitStr, tree.FmtPgwireText)
+		str := val.(string)
 		wr := utils.NewWriter(uint64(4 + len(str)))
 		wr.String(str)
 		return wr.Data(), nil

server/functions/varbit.go

@@ -45,6 +45,7 @@ var varbitin = framework.Function3{
 		input := val1.(string)
 		typmod := val3.(int32)
 
+		// validation and normalization
 		bitStr, err := tree.ParseDBitArray(input)
 		if err != nil {
 			return nil, err
@@ -58,7 +59,7 @@ var varbitin = framework.Function3{
 			}
 		}
 
-		return bitStr, nil
+		return tree.AsStringWithFlags(bitStr, tree.FmtPgwireText), nil
 	},
 }
 
@@ -69,20 +70,14 @@ var varbitout = framework.Function1{
 	Parameters: [1]*pgtypes.DoltgresType{pgtypes.VarBit},
 	Strict:     true,
 	Callable: func(ctx *sql.Context, t [2]*pgtypes.DoltgresType, val any) (any, error) {
-		var bitArray *tree.DBitArray
 		bitStr, ok, err := sql.Unwrap[string](ctx, val)
 		if err != nil {
 			return nil, err
 		}
-		if ok {
-			bitArray, err = tree.ParseDBitArray(bitStr)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			bitArray = val.(*tree.DBitArray)
+		if !ok {
+			return nil, fmt.Errorf("varbit_out function returned false")
 		}
-		return tree.AsStringWithFlags(bitArray, tree.FmtPgwireText), nil
+		return bitStr, nil
 	},
 }
 
@@ -98,7 +93,7 @@ var varbitrecv = framework.Function3{
 			return nil, nil
 		}
 		reader := utils.NewReader(data)
-		return tree.ParseDBitArray(reader.String())
+		return reader.String(), nil
 	},
 }
 
@@ -109,9 +104,9 @@ var varbitsend = framework.Function1{
 	Parameters: [1]*pgtypes.DoltgresType{pgtypes.VarBit},
 	Strict:     true,
 	Callable: func(ctx *sql.Context, _ [2]*pgtypes.DoltgresType, val any) (any, error) {
-		bitStr := val.(*tree.DBitArray)
-		writer := utils.NewWriter(uint64(bitStr.BitLen() + 4))
-		writer.String(tree.AsStringWithFlags(bitStr, tree.FmtPgwireText))
+		bitStr := val.(string)
+		writer := utils.NewWriter(uint64(len(bitStr) + 4))
+		writer.String(bitStr)
 		return writer.Data(), nil
 	},
 }

testing/go/types_test.go

@@ -302,8 +302,7 @@ var typesTests = []ScriptTest{
 		},
 	},
 	{
-		Name:  "Bit varying type",
-		Focus: true,
+		Name: "Bit varying type",
 		SetUpScript: []string{
 			"CREATE TABLE t_bit_varying (id INTEGER primary key, v1 BIT VARYING(16));",
 			"INSERT INTO t_bit_varying VALUES (1, B'1101101010101010'), (2, B'0010101101010101');",
@@ -323,8 +322,7 @@ var typesTests = []ScriptTest{
 		},
 	},
 	{
-		Name:  "Bit varying type, unbounded",
-		Focus: true,
+		Name: "Bit varying type, unbounded",
 		SetUpScript: []string{
 			"CREATE TABLE t_bit_varying (id INTEGER primary key, v1 BIT VARYING);",
 			"INSERT INTO t_bit_varying VALUES (1, B'1101101010101010'), (2, B'0010101101010101');",