[release-18.0] bugfix: don't treat join predicates as filter predicat…

…es (#16472) (#16473)

Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: Andrés Taylor <[email protected]>

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

@@ -291,3 +291,20 @@ func TestAnalyze(t *testing.T) {
 		})
 	}
 }
+
+// TestAliasesInOuterJoinQueries tests that aliases work in queries that have outer join clauses.
+func TestAliasesInOuterJoinQueries(t *testing.T) {
+	version, err := cluster.GetMajorVersion("vtgate")
+	require.NoError(t, err)
+	if version != 18 {
+		t.Skip("only run on version 18")
+	}
+
+	mcmp, closer := start(t)
+	defer closer()
+
+	// Insert data into the 2 tables
+	mcmp.Exec("insert into t1(id1, id2) values (1,2), (42,5), (5, 42)")
+	mcmp.Exec("insert into tbl(id, unq_col, nonunq_col) values (1,2,3), (2,5,3), (3, 42, 2)")
+	mcmp.ExecWithColumnCompare("select * from t1 t left join tbl on t.id1 = 666 and t.id2 = tbl.id")
+}

go/vt/vtgate/planbuilder/operators/route_planning.go

@@ -383,19 +383,23 @@ func mergeOrJoin(ctx *plancontext.PlanningContext, lhs, rhs ops.Operator, joinPr
 		}
 
 		join := NewApplyJoin(Clone(rhs), Clone(lhs), nil, !inner)
-		newOp, err := pushJoinPredicates(ctx, joinPredicates, join)
-		if err != nil {
-			return nil, nil, err
+		for _, pred := range joinPredicates {
+			err := join.AddJoinPredicate(ctx, pred)
+			if err != nil {
+				return nil, nil, err
+			}
 		}
-		return newOp, rewrite.NewTree("logical join to applyJoin, switching side because LIMIT", newOp), nil
+		return join, rewrite.NewTree("logical join to applyJoin, switching side because LIMIT", join), nil
 	}
 
 	join := NewApplyJoin(Clone(lhs), Clone(rhs), nil, !inner)
-	newOp, err := pushJoinPredicates(ctx, joinPredicates, join)
-	if err != nil {
-		return nil, nil, err
+	for _, pred := range joinPredicates {
+		err := join.AddJoinPredicate(ctx, pred)
+		if err != nil {
+			return nil, nil, err
+		}
 	}
-	return newOp, rewrite.NewTree("logical join to applyJoin ", newOp), nil
+	return join, rewrite.NewTree("logical join to applyJoin ", join), nil
 }
 
 func operatorsToRoutes(a, b ops.Operator) (*Route, *Route) {
@@ -614,18 +618,3 @@ func hexEqual(a, b *sqlparser.Literal) bool {
 	}
 	return false
 }
-
-func pushJoinPredicates(ctx *plancontext.PlanningContext, exprs []sqlparser.Expr, op *ApplyJoin) (ops.Operator, error) {
-	if len(exprs) == 0 {
-		return op, nil
-	}
-
-	for _, expr := range exprs {
-		_, err := AddPredicate(ctx, op, expr, true, newFilter)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return op, nil
-}

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

@@ -808,6 +808,59 @@
       ]
     }
   },
+  {
+    "comment": "Outer join with join predicates that only depend on the inner side",
+    "query": "select 1 from user left join user_extra on user.foo = 42 and user.bar = user_extra.bar",
+    "plan": {
+      "QueryType": "SELECT",
+      "Original": "select 1 from user left join user_extra on user.foo = 42 and user.bar = user_extra.bar",
+      "Instructions": {
+        "OperatorType": "Projection",
+        "Expressions": [
+          "INT64(1) as 1"
+        ],
+        "Inputs": [
+          {
+            "OperatorType": "Join",
+            "Variant": "LeftJoin",
+            "JoinVars": {
+              "user_bar": 1,
+              "user_foo": 0
+            },
+            "TableName": "`user`_user_extra",
+            "Inputs": [
+              {
+                "OperatorType": "Route",
+                "Variant": "Scatter",
+                "Keyspace": {
+                  "Name": "user",
+                  "Sharded": true
+                },
+                "FieldQuery": "select `user`.foo, `user`.bar from `user` where 1 != 1",
+                "Query": "select `user`.foo, `user`.bar from `user`",
+                "Table": "`user`"
+              },
+              {
+                "OperatorType": "Route",
+                "Variant": "Scatter",
+                "Keyspace": {
+                  "Name": "user",
+                  "Sharded": true
+                },
+                "FieldQuery": "select 1 from user_extra where 1 != 1",
+                "Query": "select 1 from user_extra where user_extra.bar = :user_bar and :user_foo = 42",
+                "Table": "user_extra"
+              }
+            ]
+          }
+        ]
+      },
+      "TablesUsed": [
+        "user.user",
+        "user.user_extra"
+      ]
+    }
+  },
   {
     "comment": "Parenthesized, single chunk",
     "query": "select user.col from user join (unsharded as m1 join unsharded as m2)",