place transaction iters under tracked iters

James Cor · James Cor · commit 6426aeea8caa · 2024-10-21T10:19:03.000-07:00
diff --git a/sql/rowexec/transaction_iters.go b/sql/rowexec/transaction_iters.go
@@ -79,6 +79,11 @@ func AddTransactionCommittingIter(child sql.RowIter, qFlags *sql.QueryFlags) sql
 	if qFlags != nil && qFlags.IsSet(sql.QFlagShowWarnings) {
 		return child
 	}
+	// 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}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,11 @@ func AddTransactionCommittingIter(child sql.RowIter, qFlags *sql.QueryFlags) sql`
`79`	`79`	`if qFlags != nil && qFlags.IsSet(sql.QFlagShowWarnings) {`
`80`	`80`	`return child`
`81`	`81`	`}`
	`82`	`+ // TODO: remove this once trackedRowIter is moved out of planbuilder`
	`83`	`+ // Insert TransactionCommittingIter as child of TrackedRowIter`
	`84`	`+ if trackedRowIter, ok := child.(*plan.TrackedRowIter); ok {`
	`85`	`+ return trackedRowIter.WithChildIter(&TransactionCommittingIter{childIter: trackedRowIter.GetIter()})`
	`86`	`+ }`
`82`	`87`	`return &TransactionCommittingIter{childIter: child}`
`83`	`88`	`}`
`84`	`89`