wip

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
vitessio · Feb 18, 2025 · 73f2520 · 73f2520
1 parent 35b65ef
commit 73f2520
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/go/vt/vtgate/planbuilder/operators/query_planning.go b/go/vt/vtgate/planbuilder/operators/query_planning.go
@@ -105,7 +105,7 @@ func runRewriters(ctx *plancontext.PlanningContext, root Operator) Operator {
 		case *RecurseCTE:
 			return tryMergeRecurse(ctx, in)
 		case *Values:
-			return tryPushValues(in)
+			return tryPushValues(ctx, in)
 		default:
 			return in, NoRewrite
 		}
@@ -121,8 +121,20 @@ func runRewriters(ctx *plancontext.PlanningContext, root Operator) Operator {
 	return FixedPointBottomUp(root, TableID, visitor, stopAtRoute)
 }
 
-func tryPushValues(in *Values) (Operator, *ApplyResult) {
-	if src, ok := in.Source.(*Route); ok {
+func tryPushValues(ctx *plancontext.PlanningContext, in *Values) (Operator, *ApplyResult) {
+	switch src := in.Source.(type) {
+	case *ValuesJoin:
+		src.LHS = in.Clone([]Operator{src.LHS})
+		src.RHS = in.Clone([]Operator{src.RHS})
+		return src, Rewrote("pushed values under value join")
+	case *Filter:
+		return Swap(in, src, "pushed values under filter")
+	// case *Values:
+	// 	ctx.ValuesJoinColumns
+	case *Route:
+		if !reachedPhase(ctx, initialPlanning) {
+			return in, NoRewrite
+		}
 		return Swap(in, src, "pushed values under route")
 	}
 	return in, NoRewrite

diff --git a/go/vt/vtgate/planbuilder/operators/values.go b/go/vt/vtgate/planbuilder/operators/values.go
@@ -31,6 +31,10 @@ type Values struct {
 
 func (v *Values) Clone(inputs []Operator) Operator {
 	clone := *v
+
+	if len(inputs) > 0 {
+		clone.Source = inputs[0]
+	}
 	return &clone
 }
 

diff --git a/go/vt/vtgate/planbuilder/testdata/onecase.json b/go/vt/vtgate/planbuilder/testdata/onecase.json
@@ -1,7 +1,7 @@
 [
   {
     "comment": "Add your test case here for debugging and run go test -run=One.",
-    "query": "select /*vt+ ALLOW_VALUES_JOIN */ user.foo, user_extra.user_id from user, user_extra where user.id = user_extra.toto",
+    "query": "select /*vt+ ALLOW_VALUES_JOIN */ user.foo, user_extra.user_id, user_metadata.name from user, user_extra, user_metadata where user.id = user_extra.toto and user_extra.age = user_metadata.age",
     "plan": {
       "QueryType": "SELECT",
       "Original": "select user.foo, user_extra.user_id from user, user_extra where user.id = user_extra.toto",