clean up

Author: James Cor

sql/analyzer/fix_exec_indexes.go

@@ -32,7 +32,7 @@ func assignExecIndexes(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Sc
 	if !scope.IsEmpty() {
 		// triggers
 		s.triggerScope = true
-		s.insertSourceScope = scope.InInsertSource
+		s.insertSourceScope = scope.InInsertSource()
 		s.addSchema(scope.Schema())
 		s = s.push()
 	}
@@ -300,9 +300,6 @@ func (s *idxScope) copy() *idxScope {
 		parentScopes:  parentCopy,
 		columns:       varsCopy,
 		ids:           idsCopy,
-
-		triggerScope:      s.triggerScope,
-		insertSourceScope: s.insertSourceScope,
 	}
 }
 
@@ -369,42 +366,10 @@ func (s *idxScope) visitChildren(n sql.Node) error {
 		// keep only the first union scope to avoid double counting
 		s.childScopes = append(s.childScopes, keepScope)
 	case *plan.InsertInto:
-		// TODO: special case into sources when in triggers with groupby/window functions
-		var newSrc sql.Node
-		var err error
-
-		// TODO: do something cleaner
-		//var isInTrigger bool
-		//for _, ps := range s.parentScopes {
-		//	if ps.triggerScope {
-		//		isInTrigger = true
-		//		break
-		//	}
-		//}
-		//if isInTrigger {
-		//	if proj, isProj := n.Source.(*plan.Project); isProj {
-		//		switch proj.Child.(type) {
-		//		case *plan.GroupBy, *plan.Window:
-		//			subScope := s.copy()
-		//			subScope.parentScopes = subScope.parentScopes[:0]
-		//			newSrc, _, err = assignIndexesHelper(proj, subScope)
-		//		default:
-		//			newSrc, _, err = assignIndexesHelper(n.Source, s)
-		//		}
-		//	} else {
-		//		newSrc, _, err = assignIndexesHelper(n.Source, s)
-		//	}
-		//} else {
-		//	newSrc, _, err = assignIndexesHelper(n.Source, s)
-		//}
-
-		s.insertSourceScope = true
-		newSrc, _, err = assignIndexesHelper(n.Source, s)
+		newSrc, _, err := assignIndexesHelper(n.Source, s)
 		if err != nil {
 			return err
 		}
-		s.insertSourceScope = false
-
 		newDst, dScope, err := assignIndexesHelper(n.Destination, s)
 		if err != nil {
 			return err
@@ -426,9 +391,6 @@ func (s *idxScope) visitChildren(n sql.Node) error {
 		}
 	default:
 		for _, c := range n.Children() {
-			if _, ok := c.(*plan.GroupBy); ok {
-				print()
-			}
 			newC, cScope, err := assignIndexesHelper(c, s)
 			if err != nil {
 				return err
@@ -600,7 +562,9 @@ func (s *idxScope) visitSelf(n sql.Node) error {
 			n.DestSch[colIdx].Default = newDef.(*sql.ColumnDefaultValue)
 		}
 	default:
-		// TODO: this very specific pattern
+		// Group By and Window functions already account for the new/old columns present from triggers
+		// This means that when indexing the Projections, we should not include the trigger scope(s), which are
+		// within s.parentScopes.
 		if proj, isProj := n.(*plan.Project); isProj {
 			switch proj.Child.(type) {
 			case *plan.GroupBy, *plan.Window:
@@ -771,9 +735,6 @@ func fixExprToScope(e sql.Expression, scopes ...*idxScope) sql.Expression {
 			//  don't have the destination schema, and column references in default values are determined in the build phase)
 
 			idx, _ := newScope.getIdxId(e.Id(), e.String())
-			if e.String() == "modeldisambig.id_modelinfo" && e.Index() == 1 {
-				print()
-			}
 			if idx >= 0 {
 				return e.WithIndex(idx), transform.NewTree, nil
 			}

sql/analyzer/inserts.go

@@ -59,17 +59,7 @@ func resolveInsertRows(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Sc
 					plan.NewSubqueryAlias("dummy", "", insert.Source),
 				))
 			}
-			//if proj, ok := insert.Source.(*plan.Project); ok {
-			//	if _, ok := proj.Child.(*plan.GroupBy); ok {
-			//		scope = &plan.Scope{}
-			//	}
-			//	if _, ok := proj.Child.(*plan.Window); ok {
-			//		scope = &plan.Scope{}
-			//	}
-			//}
-			if scope != nil {
-				scope.InInsertSource = true // TODO: use a setter?
-			}
+			scope.SetInInsertSource(true)
 			source, _, err = a.analyzeWithSelector(ctx, insert.Source, scope, SelectAllBatches, newInsertSourceSelector(sel), qFlags)
 			if err != nil {
 				return nil, transform.SameTree, err

sql/plan/scope.go

@@ -45,21 +45,7 @@ type Scope struct {
 	joinSiblings  []sql.Node
 	JoinTrees     []string
 
-	InInsertSource bool
-}
-
-func (s *Scope) SetJoin(b bool) {
-	if s == nil {
-		return
-	}
-	s.inJoin = b
-}
-
-func (s *Scope) SetLateralJoin(b bool) {
-	if s == nil {
-		return
-	}
-	s.inLateralJoin = b
+	inInsertSource bool
 }
 
 func (s *Scope) IsEmpty() bool {
@@ -320,18 +306,37 @@ func (s *Scope) Schema() sql.Schema {
 	return schema
 }
 
-func (s *Scope) InJoin() bool {
+func (s *Scope) SetJoin(b bool) {
 	if s == nil {
-		return false
+		return
 	}
-	return s.inJoin
+	s.inJoin = b
 }
 
-func (s *Scope) InLateralJoin() bool {
+func (s *Scope) SetLateralJoin(b bool) {
 	if s == nil {
-		return false
+		return
+	}
+	s.inLateralJoin = b
+}
+
+func (s *Scope) SetInInsertSource(b bool) {
+	if s == nil {
+		return
 	}
-	return s.inLateralJoin
+	s.inInsertSource = b
+}
+
+func (s *Scope) InJoin() bool {
+	return s != nil && s.inJoin
+}
+
+func (s *Scope) InLateralJoin() bool {
+	return s != nil && s.inLateralJoin
+}
+
+func (s *Scope) InInsertSource() bool {
+	return s != nil && s.inInsertSource
 }
 
 func (s *Scope) JoinSiblings() []sql.Node {