fixing stuff

Author: James Cor

engine.go

@@ -866,8 +866,8 @@ func findCreateEventNode(planTree sql.Node) (*plan.CreateEvent, error) {
 
 // finalizeIters applies the final transformations on sql.RowIter before execution.
 func finalizeIters(ctx *sql.Context, analyzed sql.Node, qFlags *sql.QueryFlags, iter sql.RowIter) sql.RowIter {
-	iter = plan.AddTrackedRowIter(ctx, analyzed, iter)
 	iter = rowexec.AddTransactionCommittingIter(qFlags, iter)
+	iter = plan.AddTrackedRowIter(ctx, analyzed, iter)
 	iter = rowexec.AddExpressionCloser(analyzed, iter)
 	return iter
 }

sql/plan/process.go

@@ -262,7 +262,6 @@ func shouldSetFoundRows(node sql.Node) bool {
 	return result
 }
 
-// TODO: possible to move to rowexec package?
 func AddTrackedRowIter(ctx *sql.Context, node sql.Node, iter sql.RowIter) sql.RowIter {
 	trackedIter := NewTrackedRowIter(node, iter, nil, func() {
 		ctx.ProcessList.EndQuery(ctx)

sql/rowexec/transaction_iters.go

@@ -74,17 +74,12 @@ type TransactionCommittingIter struct {
 	transactionDatabase string
 }
 
-func AddTransactionCommittingIter(qFlags *sql.QueryFlags, child sql.RowIter) sql.RowIter {
+func AddTransactionCommittingIter(qFlags *sql.QueryFlags, iter sql.RowIter) sql.RowIter {
 	// TODO: This is a bit of a hack. Need to figure out better relationship between new transaction node and warnings.
 	if qFlags != nil && qFlags.IsSet(sql.QFlagShowWarnings) {
-		return child
+		return iter
 	}
-	// TODO: remove this once trackedRowIter is moved out of planbuilder
-	// Insert TransactionCommittingIter as child of TrackedRowIter
-	if trackedRowIter, ok := child.(*plan.TrackedRowIter); ok {
-		return trackedRowIter.WithChildIter(&TransactionCommittingIter{childIter: trackedRowIter.GetIter()})
-	}
-	return &TransactionCommittingIter{childIter: child}
+	return &TransactionCommittingIter{childIter: iter}
 }
 
 func (t *TransactionCommittingIter) Next(ctx *sql.Context) (sql.Row, error) {