*.: fix bug on column field in where | order by clause radondb#713

[summary]
1. add checkField() function to check the column field illegal or not if
the delete statment has field in where | order by clause.
e.g.:
mysql> delete from t where x.a=1;
ERROR 1054 (42S22): Unknown column 'x.a' in 'where clause'
mysql> delete from t where t.a=1 order by xx.a;
ERROR 1054 (42S22): Unknown column 'xx.a' in 'order clause'

2. add rewriteField() function to rewrite the column field in where | order by clause.
e.g.:
delete from t where a=1;
after rewrite maybe:
delete from test.t_0001 where test.t_0001.a=1;

[test case]
src/planner/delete_plan_test.go

[patch codecov]
src/planner/common.go  95.8%
src/planner/delete_plan.go 96.2%

intergration/radon-test/r/delete.result

@@ -21,6 +21,29 @@ a	b
 
 INSERT INTO integrate_test.t1 VALUES (1,1);
 
+DELETE from integrate_test.t1 where t1.a=t1.b;
+
+select sleep(0.2);
+sleep(0.2)
+0
+
+select * from integrate_test.t1;
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where x.a=t1.b;
+ERROR 1054 (42S22): Unknown column 'x.a' in 'where clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=t1.b order by x.a;
+ERROR 1054 (42S22): Unknown column 'x.a' in 'order clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=x.b;
+ERROR 1054 (42S22): Unknown column 'x.b' in 'where clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=1 order by x.x.a;
+ERROR 1054 (42S22): Unknown column 'x.x.a' in 'order clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where t1.a=t1.b limit a;
+ERROR 1327 (42000): Undeclared variable: a
+
 DELETE quick from integrate_test.t1;
 
 select * from integrate_test.t1;
@@ -107,7 +130,7 @@ CREATE /*test error, column not exist*/ TABLE integrate_test.t1 (
 );
 
 DELETE FROM integrate_test.t1 WHERE post='1';
-ERROR 1054 (42S22): Unknown column 'post' in 'where clause'
+ERROR 1054 (42S22): Unknown column 'integrate_test.t1_0032.post' in 'where clause'
 
 drop table integrate_test.t1;
 
@@ -130,6 +153,24 @@ ERROR 1105 (HY000): unsupported: currently.not.support.partitions.in.delete
 DELETE /*test unsupport, currently not support delete with subquery*/ FROM integrate_test.t2 ORDER BY (SELECT x);
 ERROR 1105 (HY000): unsupported: subqueries.in.delete
 
+DELETE /*test error: unkown column*/ from integrate_test.t1 where x.a=t2.b;
+ERROR 1054 (42S22): Unknown column 'x.a' in 'where clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t2.a=t2.b order by x.a;
+ERROR 1054 (42S22): Unknown column 'integrate_test.t2.a' in 'where clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t2.a=x.b;
+ERROR 1054 (42S22): Unknown column 'integrate_test.t2.a' in 'where clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t2.a=1 order by x.x.a;
+ERROR 1054 (42S22): Unknown column 'integrate_test.t2.a' in 'where clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where t2.a=t2.b limit a;
+ERROR 1054 (42S22): Unknown column 't2.a' in 'where clause'
+
+DELETE quick from integrate_test.t1;
+ERROR 1146 (42S02): Table 't1' doesn't exist
+
 drop table integrate_test.t2;
 
 
@@ -168,6 +209,23 @@ SELECT * FROM integrate_test.t1;
 a
 0
 
+DELETE /*test error: unkown column*/ from integrate_test.t1 where x.a=t1.b;
+ERROR 1054 (42S22): Unknown column 'x.a' in 'where clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=t1.b order by x.a;
+ERROR 1054 (42S22): Unknown column 'x.a' in 'order clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=x.b;
+ERROR 1054 (42S22): Unknown column 'x.b' in 'where clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=1 order by x.x.a;
+ERROR 1054 (42S22): Unknown column 'x.x.a' in 'order clause'
+
+DELETE /*test error: unkown column*/ from integrate_test.t1 where t1.a=t1.b limit a;
+ERROR 1327 (42000): Undeclared variable: a
+
+DELETE quick from integrate_test.t1;
+
 DROP TABLE integrate_test.t1;
 
 

intergration/radon-test/r/desc_explain.result

@@ -389,7 +389,7 @@ EXPLAIN: {
 	"RawQuery": "explain delete from integrate_test.t where c1=2",
 	"Partitions": [
 		{
-			"Query": "delete from integrate_test.t_0061 where c1 = 2",
+			"Query": "delete from integrate_test.t_0061 where integrate_test.t_0061.c1 = 2",
 			"Backend": "backend2",
 			"Range": "[3904-3968)"
 		}

intergration/radon-test/r/replace.result

@@ -172,19 +172,19 @@ c1	c2
 2	4
 3	5
 
-replace into integrate_test.t_list values (1,4), (7,9), (2,8);
+replace into integrate_test.t_list values (5,4), (7,9), (8,8);
 
-replace /*Column count doesn't match value count*/ into integrate_test.t_list values (1,4,8), (7,9), (2,8,0);
+replace /*Column count doesn't match value count*/ into integrate_test.t_list values (1,4,8), (2,8,0);
 ERROR 1136 (21S01): Column count doesn't match value count at row 1
 
 select * from integrate_test.t_list order by integrate_test.t_list.c1 asc;
 c1	c2
-1	4
 1	2
-2	8
 2	4
 3	5
+5	4
 7	9
+8	8
 
 drop table integrate_test.t_list;
 

intergration/radon-test/t/delete.test

@@ -9,6 +9,14 @@ DELETE from integrate_test.t1 where a=1 limit 1;
 DELETE LOW_PRIORITY from integrate_test.t1 where a=2;
 select * from integrate_test.t1;
 INSERT INTO integrate_test.t1 VALUES (1,1);
+DELETE from integrate_test.t1 where t1.a=t1.b;
+select sleep(0.2);
+select * from integrate_test.t1;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where x.a=t1.b;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=t1.b order by x.a;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=x.b;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=1 order by x.x.a;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where t1.a=t1.b limit a;
 DELETE quick from integrate_test.t1;
 select * from integrate_test.t1;
 drop table integrate_test.t1;
@@ -60,6 +68,12 @@ select * from integrate_test.t2;
 delete /*test unsupport, currently not support delete multitables*/ integrate_test.t2 from integrate_test.t2, integrate_test.t2 as t1 where integrate_test.t2.b = integrate_test.t1.b and integrate_test.t2.a > integrate_test.t1.a;
 delete /*test unsupport, currently not support delete with partition*/ from integrate_test.t2 partition (p0) where a = 1;
 DELETE /*test unsupport, currently not support delete with subquery*/ FROM integrate_test.t2 ORDER BY (SELECT x);
+DELETE /*test error: unkown column*/ from integrate_test.t1 where x.a=t2.b;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t2.a=t2.b order by x.a;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t2.a=x.b;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t2.a=1 order by x.x.a;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where t2.a=t2.b limit a;
+DELETE quick from integrate_test.t1;
 drop table integrate_test.t2;
 
 CREATE TABLE integrate_test.t1(a INTEGER PRIMARY KEY) single;
@@ -77,6 +91,12 @@ DELETE FROM integrate_test.t1 WHERE a > 0 ORDER BY a;
 INSERT INTO integrate_test.t1 VALUES (0),(1),(2);
 DELETE FROM integrate_test.t1 WHERE a > 0 ORDER BY a LIMIT 1;
 SELECT * FROM integrate_test.t1;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where x.a=t1.b;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=t1.b order by x.a;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=x.b;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where integrate_test.t1.a=1 order by x.x.a;
+DELETE /*test error: unkown column*/ from integrate_test.t1 where t1.a=t1.b limit a;
+DELETE quick from integrate_test.t1;
 DROP TABLE integrate_test.t1;
 
 drop database integrate_test;

intergration/radon-test/t/replace.test

@@ -77,8 +77,8 @@ create /*test partition list*/ table integrate_test.t_list(c1 int, c2 int) ENGIN
 insert into integrate_test.t_list values (1,2), (3,5), (2,4);
 insert /*test error: has no parition*/ into integrate_test.t_list values (10,2), (13,5);
 select * from integrate_test.t_list order by integrate_test.t_list.c1 asc;
-replace into integrate_test.t_list values (1,4), (7,9), (2,8);
-replace /*Column count doesn't match value count*/ into integrate_test.t_list values (1,4,8), (7,9), (2,8,0);
+replace into integrate_test.t_list values (5,4), (7,9), (8,8);
+replace /*Column count doesn't match value count*/ into integrate_test.t_list values (1,4,8), (2,8,0);
 select * from integrate_test.t_list order by integrate_test.t_list.c1 asc;
 drop table integrate_test.t_list;
 

src/planner/common.go

@@ -10,8 +10,11 @@ package planner
 
 import (
 	"errors"
+	"fmt"
 
+	"github.com/xelabs/go-mysqlstack/sqldb"
 	"github.com/xelabs/go-mysqlstack/sqlparser"
+	"github.com/xelabs/go-mysqlstack/xlog"
 )
 
 func hasSubquery(node sqlparser.SQLNode) bool {
@@ -38,3 +41,83 @@ func isUpdateShardKey(exprs sqlparser.UpdateExprs, shardkey string) bool {
 	}
 	return false
 }
+
+// checkField is used to check if the field's Qualifier is illegal or not in where or order by clause.
+func checkField(database, table string, node sqlparser.SQLNode, log *xlog.Log) error {
+	switch node.(type) {
+	case *sqlparser.Delete:
+		// Here we not should do check on limit clause, leave it to the backend mysql.
+		nodePtr := node.(*sqlparser.Delete)
+		if err := checkFieldImpl(database, table, nodePtr.Where, "where clause"); err != nil {
+			return err
+		}
+		if err := checkFieldImpl(database, table, nodePtr.OrderBy, "order clause"); err != nil {
+			return err
+		}
+	default:
+		log.Warning("currently.check.field.only.support.delete.statement.")
+	}
+	return nil
+}
+
+// checkFieldImpl is an implementation of checkField() function.
+func checkFieldImpl(database, table string, node sqlparser.SQLNode, suffix string) error {
+	err := sqlparser.Walk(func(node sqlparser.SQLNode) (kontinue bool, err error) {
+		switch node.(type) {
+		case *sqlparser.ColName:
+			nodePtr := node.(*sqlparser.ColName)
+			colDB := nodePtr.Qualifier.Qualifier.String()
+			colTbl := nodePtr.Qualifier.Name.String()
+			colName := nodePtr.Name.String()
+
+			if colDB != "" && colTbl != "" {
+				// case 1: where/order by db.t.a
+				if colDB != database || colTbl != table {
+					badField := fmt.Sprintf("%s.%s.%s", colDB, colTbl, colName)
+					return false, sqldb.NewSQLError(sqldb.ER_BAD_FIELD_ERROR, badField, suffix)
+				}
+			} else if colDB == "" && colTbl != "" {
+				// case 2: where/order by t.a
+				if colTbl != table {
+					badField := fmt.Sprintf("%s.%s", colTbl, colName)
+					return false, sqldb.NewSQLError(sqldb.ER_BAD_FIELD_ERROR, badField, suffix)
+				}
+			}
+			// case 3: where/order by a, return
+			return true, nil
+		default:
+			// If node is not sqlparser.ColName type, return true and continue visit.
+			return true, nil
+		}
+	}, node)
+	return err
+}
+
+// rewriteField used to rewrite column field in where/order by clause.
+// Currently only used by delete statement.
+func rewriteField(database, partTable string, newNode sqlparser.SQLNode, log *xlog.Log) {
+	switch newNode.(type) {
+	case *sqlparser.Delete:
+		// Here we should not do rewrite on limit clause, leave it to the backend mysql.
+		nodePtr := newNode.(*sqlparser.Delete)
+		rewriteFieldImpl(database, partTable, nodePtr.Where, nodePtr.OrderBy)
+	default:
+		log.Warning("currently.rewrite.field.only.support.delete.statement.")
+	}
+}
+
+// rewriteFieldImpl is an implementation of rewriteField() function
+func rewriteFieldImpl(database, partTable string, newNodes ...sqlparser.SQLNode) {
+	sqlparser.Walk(func(node sqlparser.SQLNode) (kontinue bool, err error) {
+		switch node.(type) {
+		case *sqlparser.ColName:
+			nodePtr := node.(*sqlparser.ColName)
+			nodePtr.Qualifier.Name = sqlparser.NewTableIdent(partTable)
+			nodePtr.Qualifier.Qualifier = sqlparser.NewTableIdent(database)
+			return true, nil
+		default:
+			// If newNode is not sqlparser.ColName type, return true and continue visit.
+			return true, nil
+		}
+	}, newNodes...)
+}

src/planner/delete_plan.go

@@ -82,10 +82,11 @@ func (p *DeletePlan) analyze() error {
 
 // Build used to build distributed querys.
 func (p *DeletePlan) Build() error {
-	if err := p.analyze(); err != nil {
+	// step 1: analyze if delete has unsupported features.
+	var err error
+	if err = p.analyze(); err != nil {
 		return err
 	}
-
 	newNode := *p.node
 	// For single table, the len(TableRefs)=1 and the type of TableExpr must be AliasedTableExpr.
 	newAliseExpr := newNode.TableRefs[0].(*sqlparser.AliasedTableExpr)
@@ -97,8 +98,13 @@ func (p *DeletePlan) Build() error {
 		newAliseExpr.Expr = sqlparser.TableName{Name: tableID, Qualifier: databaseID}
 	}
 
+	// step 2: check if the column field illegal or not if delete statement has column field.
+	if err = checkField(databaseID.String(), tableID.String(), &newNode, p.log); err != nil {
+		return err
+	}
+
+	// step 3: get segments
 	var segments []router.Segment
-	var err error
 	if newNode.Where == nil {
 		// delete all datas, send sql to different backends, except for single table which has only one backend.
 		segments, err = p.router.Lookup(databaseID.String(), tableID.String(), nil, nil)
@@ -119,10 +125,13 @@ func (p *DeletePlan) Build() error {
 		}
 	}
 
-	// Rewritten the newNode to produce a new query.
+	// step 4: Rewritten the newNode to produce a new query.
 	for _, segment := range segments {
-		tableID = sqlparser.NewTableIdent(segment.Table)
-		newAliseExpr.Expr = sqlparser.TableName{Name: tableID, Qualifier: databaseID}
+		// rewrite column field
+		rewriteField(databaseID.String(), segment.Table, &newNode, p.log)
+		// rewrite table expr
+		newTableID := sqlparser.NewTableIdent(segment.Table)
+		newAliseExpr.Expr = sqlparser.TableName{Name: newTableID, Qualifier: databaseID}
 		tuple := xcontext.QueryTuple{
 			Query:   sqlparser.String(&newNode),
 			Backend: segment.Backend,