Merge branch 'james/queryprocess' of https://github.com/dolthub/go-mysql-server into james/queryprocess

James Cor · James Cor · commit f68a0b234823 · 2024-10-22T17:14:43.000-07:00
diff --git a/sql/plan/process.go b/sql/plan/process.go
@@ -263,7 +263,7 @@ func shouldSetFoundRows(node sql.Node) bool {
 }
 
 // TODO: possible to move to rowexec package?
-func AddTrackedRowIter(ctx *sql.Context, node sql.Node, iter sql.RowIter) sql.RowIter{
+func AddTrackedRowIter(ctx *sql.Context, node sql.Node, iter sql.RowIter) sql.RowIter {
 	trackedIter := NewTrackedRowIter(node, iter, nil, func() {
 		ctx.ProcessList.EndQuery(ctx)
 		if span := ctx.RootSpan(); span != nil {

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ func shouldSetFoundRows(node sql.Node) bool {`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`// TODO: possible to move to rowexec package?`
`266`		`-func AddTrackedRowIter(ctx *sql.Context, node sql.Node, iter sql.RowIter) sql.RowIter{`
	`266`	`+func AddTrackedRowIter(ctx *sql.Context, node sql.Node, iter sql.RowIter) sql.RowIter {`
`267`	`267`	`trackedIter := NewTrackedRowIter(node, iter, nil, func() {`
`268`	`268`	`ctx.ProcessList.EndQuery(ctx)`
`269`	`269`	`if span := ctx.RootSpan(); span != nil {`