sqlparser: normalize all bit literals to 0b

Signed-off-by: Vicent Marti <[email protected]>
vitessio · Oct 26, 2023 · 7c48726 · 7c48726
1 parent e77fe2c
commit 7c48726
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 27 deletions.
diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go
@@ -1314,12 +1314,10 @@ func (node *Literal) Format(buf *TrackedBuffer) {
 	switch node.Type {
 	case StrVal:
 		sqltypes.MakeTrusted(sqltypes.VarBinary, node.Bytes()).EncodeSQL(buf)
-	case IntVal, FloatVal, DecimalVal, HexNum:
+	case IntVal, FloatVal, DecimalVal, HexNum, BitNum:
 		buf.astPrintf(node, "%#s", node.Val)
 	case HexVal:
 		buf.astPrintf(node, "X'%#s'", node.Val)
-	case BitNum:
-		buf.astPrintf(node, "0b%#s", node.Val)
 	case DateVal:
 		buf.astPrintf(node, "date'%#s'", node.Val)
 	case TimeVal:

diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go
diff --git a/go/vt/sqlparser/normalizer.go b/go/vt/sqlparser/normalizer.go
@@ -366,7 +366,7 @@ func SQLToBindvar(node SQLNode) *querypb.BindVariable {
 		case BitNum:
 			out := make([]byte, 0, len(node.Bytes())+2)
 			out = append(out, '0', 'b')
-			out = append(out, node.Bytes()...)
+			out = append(out, node.Bytes()[2:]...)
 			v, err = sqltypes.NewValue(sqltypes.BitNum, out)
 		case DateVal:
 			v, err = sqltypes.NewValue(sqltypes.Date, node.Bytes())

diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go
diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y
@@ -1689,27 +1689,27 @@ text_literal
   }
 | BITNUM
   {
-  	$$ = NewBitLiteral($1[2:])
+  	$$ = NewBitLiteral($1)
   }
 | BIT_LITERAL
   {
-	$$ = NewBitLiteral($1)
+	$$ = NewBitLiteral("0b" + $1)
   }
 | VALUE_ARG
   {
     $$ = parseBindVariable(yylex, $1[1:])
   }
 | underscore_charsets BIT_LITERAL %prec UNARY
   {
-  	$$ = &IntroducerExpr{CharacterSet: $1, Expr: NewBitLiteral($2)}
+  	$$ = &IntroducerExpr{CharacterSet: $1, Expr: NewBitLiteral("0b" + $2)}
   }
 | underscore_charsets HEXNUM %prec UNARY
   {
   	$$ = &IntroducerExpr{CharacterSet: $1, Expr: NewHexNumLiteral($2)}
   }
 | underscore_charsets BITNUM %prec UNARY
   {
-  	$$ = &IntroducerExpr{CharacterSet: $1, Expr: NewBitLiteral($2[2:])}
+  	$$ = &IntroducerExpr{CharacterSet: $1, Expr: NewBitLiteral($2)}
   }
 | underscore_charsets HEX %prec UNARY
   {

diff --git a/go/vt/vtgate/evalengine/api_literal.go b/go/vt/vtgate/evalengine/api_literal.go
@@ -162,12 +162,8 @@ func parseBitNum(val []byte) ([]byte, error) {
 	if val[0] != '0' || val[1] != 'b' {
 		return nil, vterrors.Errorf(vtrpc.Code_INVALID_ARGUMENT, "malformed Bit literal: %q (missing 0b prefix)", val)
 	}
-	return parseBitLiteral(val[2:])
-}
-
-func parseBitLiteral(val []byte) ([]byte, error) {
 	var i big.Int
-	_, ok := i.SetString(hack.String(val), 2)
+	_, ok := i.SetString(hack.String(val)[2:], 2)
 	if !ok {
 		return nil, vterrors.Errorf(vtrpc.Code_INVALID_ARGUMENT, "malformed Bit literal: %q (not base 2)", val)
 	}
@@ -195,7 +191,7 @@ func NewLiteralBinaryFromHexNum(val []byte) (*Literal, error) {
 }
 
 func NewLiteralBinaryFromBit(val []byte) (*Literal, error) {
-	raw, err := parseBitLiteral(val)
+	raw, err := parseBitNum(val)
 	if err != nil {
 		return nil, err
 	}

diff --git a/go/vt/vtgate/evalengine/compiler_test.go b/go/vt/vtgate/evalengine/compiler_test.go
@@ -471,11 +471,6 @@ func TestCompilerSingle(t *testing.T) {
 			expression: `CONV(-1, -1.5e0, 3.141592653589793)`,
 			result:     `VARCHAR("11112220022122120101211020120210210211220")`,
 		},
-		{
-			expression: `column0 between 10 and 20`,
-			values:     []sqltypes.Value{sqltypes.NewInt16(15)},
-			result:     `INT64(1)`,
-		},
 		{
 			expression: `column0 between 10 and 20`,
 			values:     []sqltypes.Value{sqltypes.NULL},