wip

vitessio · Feb 20, 2025 · e82817a · e82817a
1 parent df126a2
commit e82817a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/go/vt/vtgate/planbuilder/operators/op_to_ast.go b/go/vt/vtgate/planbuilder/operators/op_to_ast.go
@@ -154,6 +154,7 @@ func buildValues(op *Values, qb *queryBuilder) {
 	apa := semantics.EmptyTableSet()
 	for _, ae := range qb.ctx.ValuesJoinColumns[op.Name] {
 		apa = apa.Merge(qb.ctx.SemTable.RecursiveDeps(ae.Expr))
+		fmt.Printf("%v\n", apa)
 	}
 
 	tableName := getTableName(qb.ctx, apa)

diff --git a/go/vt/vtgate/planbuilder/operators/query_planning.go b/go/vt/vtgate/planbuilder/operators/query_planning.go
@@ -128,10 +128,15 @@ func runPushDownRewriters(ctx *plancontext.PlanningContext, root Operator) Opera
 
 func tryPushValues(ctx *plancontext.PlanningContext, in *Values) (Operator, *ApplyResult) {
 	switch src := in.Source.(type) {
+	case *Values:
+		// we can merge two values operators into one
+		cols := ctx.ValuesJoinColumns[in.Name]
+		ctx.ValuesJoinColumns[src.Name] = append(ctx.ValuesJoinColumns[src.Name], cols...)
+		ctx.ValueJoins[in.Name] = ctx.ValueJoins[src.Name]
+		return src, Rewrote("merged two values operators")
 	case *ValuesJoin:
 		src.LHS = in.Clone([]Operator{src.LHS})
-		src.RHS = in.Clone([]Operator{src.RHS})
-		return src, Rewrote("pushed values under value join")
+		return src, Rewrote("pushed values to the LHS of values join")
 	case *Filter:
 		return Swap(in, src, "pushed values under filter")
 	case *Route:

diff --git a/go/vt/vtgate/planbuilder/operators/values_join.go b/go/vt/vtgate/planbuilder/operators/values_join.go
@@ -160,7 +160,7 @@ func (vj *ValuesJoin) GetOrdering(ctx *plancontext.PlanningContext) []OrderBy {
 }
 
 func (vj *ValuesJoin) planOffsets(ctx *plancontext.PlanningContext) Operator {
-	exprs := ctx.ValuesJoinColumns[vj.ValuesDestination]
+	exprs := ctx.GetColumns(vj.ValuesDestination)
 	for _, jc := range vj.JoinColumns {
 		newExprs := vj.planOffsetsForLHSExprs(ctx, jc.LHS)
 		exprs = append(exprs, newExprs...)
@@ -172,7 +172,7 @@ func (vj *ValuesJoin) planOffsets(ctx *plancontext.PlanningContext) Operator {
 		newExprs := vj.planOffsetsForLHSExprs(ctx, jc.LHS)
 		exprs = append(exprs, newExprs...)
 	}
-	ctx.ValuesJoinColumns[vj.ValuesDestination] = exprs
+	ctx.SetColumns(vj.ValuesDestination, exprs)
 	return vj
 }
 

diff --git a/go/vt/vtgate/planbuilder/plancontext/planning_context.go b/go/vt/vtgate/planbuilder/plancontext/planning_context.go
@@ -474,6 +474,15 @@ func (ctx *PlanningContext) ActiveCTE() *ContextCTE {
 	return ctx.CurrentCTE[len(ctx.CurrentCTE)-1]
 }
 
+func (ctx *PlanningContext) GetColumns(joinName string) []*sqlparser.AliasedExpr {
+	valuesName := ctx.ValueJoins[joinName]
+	return ctx.ValuesJoinColumns[valuesName]
+}
+func (ctx *PlanningContext) SetColumns(joinName string, cols []*sqlparser.AliasedExpr) {
+	valuesName := ctx.ValueJoins[joinName]
+	ctx.ValuesJoinColumns[valuesName] = cols
+}
+
 func (ctx *PlanningContext) UseMirror() *PlanningContext {
 	if ctx.isMirrored {
 		panic(vterrors.VT13001("cannot mirror already mirrored planning context"))

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": "",
+    "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": {
     }
   }