This change is 

Review status: all files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from Reviewable

Review status: all files reviewed at latest revision, all discussions resolved, all commit checks successful.

pkg/sql/distsqlplan/aggregator_funcs_test.go, line 71 at r1 (raw file):

	var rowBuf distsqlrun.RowBuffer

	ctx, flow, err := distSQLSrv.SetupSyncFlow(context.TODO(), distSQLSrv.ParentMemoryMonitor, &req, &rowBuf)

It's a bit confusing that you use ParentMemoryMonitor in this test but memMonitor in flow_registry_test. I believe the difference is that the first one is the root monitor and memMonitor is the distsql monitor created in NewServer. I would use memMonitor here and add a comment to ParentMemoryMonitor that it should only be used when setting up a server.

pkg/sql/distsqlrun/server.go, line 406 at r1 (raw file):

// Flow.Cleanup.
func (ds *ServerImpl) SetupSyncFlow(
	ctx context.Context, mon *mon.BytesMonitor, req *SetupFlowRequest, output RowReceiver,

nit: I would also call this parentMonitor to be clear

Comments from Reviewable

Review status: 3 of 4 files reviewed at latest revision, 2 unresolved discussions, all commit checks successful.

pkg/sql/distsqlplan/aggregator_funcs_test.go, line 71 at r1 (raw file):

Yeah... but this is in a different package, so you can't use the unexported memMonitor field :(

I'll add a comment to ParentMemoryMonitor though.

Comments from Reviewable

bors r+

Build succeeded

• GitHub CI (Cockroach)