[release-18.0] Fix Join Predicate Cleanup Bug in Route Merging (#16386)…

… (#16388)

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Florent Poinsard <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
Co-authored-by: Florent Poinsard <[email protected]>

go/test/endtoend/vtgate/queries/misc/misc_test.go

@@ -103,6 +103,21 @@ func TestInvalidDateTimeTimestampVals(t *testing.T) {
 	require.Error(t, err)
 }
 
+func TestJoinWithThreeTables(t *testing.T) {
+	version, err := cluster.GetMajorVersion("vtgate")
+	require.NoError(t, err)
+	if version != 20 {
+		t.Skip("cannot run upgrade/downgrade test")
+	}
+
+	mcmp, closer := start(t)
+	defer closer()
+
+	mcmp.Exec("insert into t1(id1, id2) values (0,0), (1,1), (2,2)")
+	mcmp.Exec("insert into tbl(id, unq_col, nonunq_col) values (0,0,0), (1,1,1), (2,2,1)")
+	mcmp.Exec("select 42 from t1 u1, t1 u2, tbl u3 where u1.id1 = u2.id1 and u1.id1 = u3.id and (u1.id2 or u2.id2 or u3.unq_col)")
+}
+
 // TestIntervalWithMathFunctions tests that the Interval keyword can be used with math functions.
 func TestIntervalWithMathFunctions(t *testing.T) {
 	mcmp, closer := start(t)

go/test/endtoend/vtgate/queries/misc/schema.sql

@@ -2,4 +2,11 @@ create table if not exists t1(
                    id1 bigint,
                    id2 bigint,
                    primary key(id1)
+) Engine=InnoDB;
+
+create table if not exists tbl(
+                    id bigint,
+                    unq_col bigint,
+                    nonunq_col bigint,
+                    primary key(id)
 ) Engine=InnoDB;

go/test/endtoend/vtgate/queries/misc/vschema.json

@@ -13,6 +13,14 @@
           "name": "hash"
         }
       ]
+    },
+    "tbl": {
+      "column_vindexes": [
+        {
+          "column": "id",
+          "name": "hash"
+        }
+      ]
     }
   }
 }

go/vt/vtgate/planbuilder/operators/SQL_builder.go

@@ -220,7 +220,9 @@ func (qb *queryBuilder) joinInnerWith(other *queryBuilder, onCondition sqlparser
 		sel.Where = &sqlparser.Where{Type: sqlparser.WhereClause, Expr: predicate}
 	}
 
-	qb.addPredicate(onCondition)
+	for _, pred := range sqlparser.SplitAndExpression(nil, onCondition) {
+		qb.addPredicate(pred)
+	}
 }
 
 func (qb *queryBuilder) joinOuterWith(other *queryBuilder, onCondition sqlparser.Expr) {

go/vt/vtgate/planbuilder/testdata/from_cases.json

@@ -497,6 +497,30 @@
       ]
     }
   },
+  {
+    "comment": "three table join with join predicate touching all tables",
+    "query": "select 42 from user u join user_extra ue on u.id = ue.user_id join music m on m.user_id = u.id where u.foo or m.foo or ue.foo",
+    "plan": {
+      "QueryType": "SELECT",
+      "Original": "select 42 from user u join user_extra ue on u.id = ue.user_id join music m on m.user_id = u.id where u.foo or m.foo or ue.foo",
+      "Instructions": {
+        "OperatorType": "Route",
+        "Variant": "Scatter",
+        "Keyspace": {
+          "Name": "user",
+          "Sharded": true
+        },
+        "FieldQuery": "select 42 from `user` as u, user_extra as ue, music as m where 1 != 1",
+        "Query": "select 42 from `user` as u, user_extra as ue, music as m where u.id = ue.user_id and m.user_id = u.id and (u.foo or m.foo or ue.foo)",
+        "Table": "`user`, music, user_extra"
+      },
+      "TablesUsed": [
+        "user.music",
+        "user.user",
+        "user.user_extra"
+      ]
+    }
+  },
   {
     "comment": "Left join, multi-chunk",
     "query": "select u.col from user u left join unsharded m on u.a = m.b",