Review feedback and optimizer bug fix

Signed-off-by: Zach Musgrave <zach@liquidata.co>
src-d · Jul 9, 2019 · 89d4baa · 89d4baa
2 parents 47eb30c + b5d50aa
commit 89d4baa
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 34 deletions.
diff --git a/engine_test.go b/engine_test.go
@@ -108,6 +108,14 @@ var queries = []struct {
 		"SELECT i FROM mytable ORDER BY i DESC;",
 		[]sql.Row{{int64(3)}, {int64(2)}, {int64(1)}},
 	},
+	{
+		"SELECT i FROM mytable WHERE 'hello';",
+		[]sql.Row{},
+	},
+	{
+		"SELECT i FROM mytable WHERE not 'hello';",
+		[]sql.Row{{int64(1)}, {int64(2)}, {int64(3)}},
+	},
 	{
 		"SELECT i FROM mytable WHERE s = 'first row' ORDER BY i DESC;",
 		[]sql.Row{{int64(1)}},
@@ -157,12 +165,12 @@ var queries = []struct {
 		[]sql.Row{{int64(2)}, {nil}, {nil}},
 	},
 	{
-		"SELECT i FROM niltable WHERE b IS FALSE",
-		[]sql.Row{{int64(2)}, {nil}, {nil}},
+		"SELECT f FROM niltable WHERE b IS FALSE",
+		[]sql.Row{{3.0}},
 	},
 	{
 		"SELECT i FROM niltable WHERE b IS NOT FALSE",
-		[]sql.Row{{int64(1)}, {int64(4)}},
+		[]sql.Row{{int64(1)}, {int64(2)}, {int64(4)}, {nil}},
 	},
 	{
 		"SELECT COUNT(*) FROM mytable;",

diff --git a/go.mod b/go.mod
@@ -28,3 +28,9 @@ require (
 	gopkg.in/yaml.v2 v2.2.2
 	vitess.io/vitess v3.0.0-rc.3.0.20190602171040-12bfde34629c+incompatible
 )
+
+replace vitess.io/vitess => github.com/liquidata-inc/vitess v0.0.0-20190625235908-66745781a796
+
+// For local development, clone vitess into $GOPATH/src like so: git clone git@github.com:liquidata-inc/vitess.git vitess.io/vitess
+// Then use this local override:
+//replace vitess.io/vitess => ../../../vitess.io/vitess
diff --git a/sql/analyzer/optimization_rules.go b/sql/analyzer/optimization_rules.go
@@ -1,10 +1,10 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-errors.v1"
 	"github.com/src-d/go-mysql-server/sql"
 	"github.com/src-d/go-mysql-server/sql/expression"
 	"github.com/src-d/go-mysql-server/sql/plan"
+	"gopkg.in/src-d/go-errors.v1"
 )
 
 func eraseProjection(ctx *sql.Context, a *Analyzer, node sql.Node) (sql.Node, error) {
@@ -379,39 +379,21 @@ func evalFilter(ctx *sql.Context, a *Analyzer, node sql.Node) (sql.Node, error)
 					return e.Left, nil
 				}
 
+				return e, nil
+			case *expression.Literal, expression.Tuple:
 				return e, nil
 			default:
 				if !isEvaluable(e) {
 					return e, nil
 				}
 
-				if _, ok := e.(*expression.Literal); ok {
-					return e, nil
-				}
-
-				// UnaryMinus expressions come back from the parser when a negative float is evaluated. Treat them just like
-				// normal literal expressions.
-				if um, ok := e.(*expression.UnaryMinus); ok {
-					negated, err := e.Eval(ctx, nil)
-					if err != nil {
-						return nil, err
-					}
-					return expression.NewLiteral(negated, um.Type()), nil
-				}
-
+				// All other expressions types can be evaluated once and turned into literals for the rest of query execution
 				val, err := e.Eval(ctx, nil)
 				if err != nil {
 					return nil, err
 				}
 
-				val, err = sql.Boolean.Convert(val)
-				if err != nil {
-					// don't make it fail because of this, just return the
-					// original expression
-					return e, nil
-				}
-
-				return expression.NewLiteral(val.(bool), sql.Boolean), nil
+				return expression.NewLiteral(val, e.Type()), nil
 			}
 		})
 		if err != nil {

diff --git a/sql/expression/istrue.go b/sql/expression/istrue.go
@@ -2,7 +2,7 @@ package expression
 
 import "github.com/src-d/go-mysql-server/sql"
 
-// IsNull is an expression that checks if an expression is null.
+// IsTrue is an expression that checks if an expression is true.
 type IsTrue struct {
 	UnaryExpression
 	invert bool
@@ -40,7 +40,7 @@ func (e *IsTrue) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 
 	var boolVal interface{}
 	if v == nil {
-		boolVal = false
+		return false, nil
 	} else {
 		boolVal, err = sql.Boolean.Convert(v)
 		if err != nil {
@@ -70,8 +70,7 @@ func (e *IsTrue) TransformUp(f sql.TransformExprFunc) (sql.Expression, error) {
 	}
 	if e.invert {
 		return f(NewIsFalse(child))
-	} else {
-		return f(NewIsTrue(child))
 	}
+	return f(NewIsTrue(child))
 }
 
diff --git a/sql/expression/istrue_test.go b/sql/expression/istrue_test.go
@@ -25,6 +25,24 @@ func TestIsTrue(t *testing.T) {
 	require.Equal(true, eval(t, e, sql.NewRow(100)))
 	require.Equal(true, eval(t, e, sql.NewRow(-1)))
 	require.Equal(false, eval(t, e, sql.NewRow(0)))
+
+	floatF := NewGetField(0, sql.Float64, "col1", true)
+	e = NewIsTrue(floatF)
+	require.Equal(sql.Boolean, e.Type())
+	require.False(e.IsNullable())
+	require.Equal(false, eval(t, e, sql.NewRow(nil)))
+	require.Equal(true, eval(t, e, sql.NewRow(1.5)))
+	require.Equal(true, eval(t, e, sql.NewRow(-1.5)))
+	require.Equal(false, eval(t, e, sql.NewRow(0)))
+
+	stringF := NewGetField(0, sql.Text, "col1", true)
+	e = NewIsTrue(stringF)
+	require.Equal(sql.Boolean, e.Type())
+	require.False(e.IsNullable())
+	require.Equal(false, eval(t, e, sql.NewRow(nil)))
+	require.Equal(false, eval(t, e, sql.NewRow("")))
+	require.Equal(false, eval(t, e, sql.NewRow("false")))
+	require.Equal(false, eval(t, e, sql.NewRow("true")))
 }
 
 func TestIsFalse(t *testing.T) {
@@ -34,16 +52,34 @@ func TestIsFalse(t *testing.T) {
 	e := NewIsFalse(boolF)
 	require.Equal(sql.Boolean, e.Type())
 	require.False(e.IsNullable())
-	require.Equal(true, eval(t, e, sql.NewRow(nil)))
+	require.Equal(false, eval(t, e, sql.NewRow(nil)))
 	require.Equal(false, eval(t, e, sql.NewRow(true)))
 	require.Equal(true, eval(t, e, sql.NewRow(false)))
 
 	intF := NewGetField(0, sql.Int64, "col1", true)
 	e = NewIsFalse(intF)
 	require.Equal(sql.Boolean, e.Type())
 	require.False(e.IsNullable())
-	require.Equal(true, eval(t, e, sql.NewRow(nil)))
+	require.Equal(false, eval(t, e, sql.NewRow(nil)))
 	require.Equal(false, eval(t, e, sql.NewRow(100)))
 	require.Equal(false, eval(t, e, sql.NewRow(-1)))
 	require.Equal(true, eval(t, e, sql.NewRow(0)))
-}
+
+	floatF := NewGetField(0, sql.Float64, "col1", true)
+	e = NewIsFalse(floatF)
+	require.Equal(sql.Boolean, e.Type())
+	require.False(e.IsNullable())
+	require.Equal(false, eval(t, e, sql.NewRow(nil)))
+	require.Equal(false, eval(t, e, sql.NewRow(1.5)))
+	require.Equal(false, eval(t, e, sql.NewRow(-1.5)))
+	require.Equal(true, eval(t, e, sql.NewRow(0)))
+
+	stringF := NewGetField(0, sql.Text, "col1", true)
+	e = NewIsFalse(stringF)
+	require.Equal(sql.Boolean, e.Type())
+	require.False(e.IsNullable())
+	require.Equal(false, eval(t, e, sql.NewRow(nil)))
+	require.Equal(true, eval(t, e, sql.NewRow("")))
+	require.Equal(true, eval(t, e, sql.NewRow("false")))
+	require.Equal(true, eval(t, e, sql.NewRow("true")))
+}
diff --git a/sql/type.go b/sql/type.go
@@ -708,7 +708,7 @@ func (t booleanT) Convert(v interface{}) (interface{}, error) {
 	case float32, float64:
 		return int(math.Round(v.(float64))) != 0, nil
 	case string:
-		return false, fmt.Errorf("unable to cast string to bool")
+		return false, nil
 
 	case nil:
 		return nil, fmt.Errorf("unable to cast nil to bool")

diff --git a/sql/type_test.go b/sql/type_test.go
@@ -28,6 +28,21 @@ func TestText(t *testing.T) {
 	var3, err := VarChar(3).Convert("abc")
 	require.NoError(t, err)
 	convert(t, Text, var3, "abc")
+
+func TestBoolean(t *testing.T) {
+	convert(t, Boolean, "", false)
+	convert(t, Boolean, "true", false)
+	convert(t, Boolean, 0, false)
+	convert(t, Boolean, 1, true)
+	convert(t, Boolean, -1, true)
+	convert(t, Boolean, 0.0, false)
+	convert(t, Boolean, 0.4, false)
+	convert(t, Boolean, 0.5, true)
+	convert(t, Boolean, 1.0, true)
+	convert(t, Boolean, -1.0, true)
+
+	eq(t, Boolean, true, true)
+	eq(t, Boolean, false, false)
 }
 
 func TestInt32(t *testing.T) {