Skip to content

sql: harden a few processors #160409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craig merged 1 commit into from
Jan 3, 2026
Merged

sql: harden a few processors #160409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/sql/bulkingest/ingest_file_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ func (p *ingestFileProcessor) Run(ctx context.Context, output execinfra.RowRecei
ctx, span = execinfra.ProcessorSpan(ctx, p.flowCtx, "ingestFile", p.processorID)
defer span.Finish()
}
defer output.ProducerDone()
defer execinfra.SendTraceData(ctx, p.flowCtx, output)
err := p.runIngest(ctx)
if err != nil {
output.Push(nil, &execinfrapb.ProducerMetadata{Err: err})
}
execinfra.SendTraceData(ctx, p.flowCtx, output)
output.ProducerDone()
}

// runIngest starts a set of worker goroutines to process SST files concurrently.
Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/inspect/inspect_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ func (p *inspectProcessor) Run(ctx context.Context, output execinfra.RowReceiver
ctx, span = execinfra.ProcessorSpan(ctx, p.flowCtx, "inspect", p.processorID)
defer span.Finish()
}
defer output.ProducerDone()
defer execinfra.SendTraceData(ctx, p.flowCtx, output)
err := p.runInspect(ctx, output)
if err != nil {
output.Push(nil, &execinfrapb.ProducerMetadata{Err: err})
}
execinfra.SendTraceData(ctx, p.flowCtx, output)
output.ProducerDone()
}

// runInspect starts a set of worker goroutines to process spans concurrently.
Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/rowexec/columnbackfiller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ func (cb *columnBackfiller) Run(ctx context.Context, output execinfra.RowReceive
ctx = logtags.AddTag(ctx, opName, int(cb.spec.Table.ID))
ctx, span := execinfra.ProcessorSpan(ctx, cb.flowCtx, opName, cb.processorID)
defer span.Finish()
defer output.ProducerDone()
defer execinfra.SendTraceData(ctx, cb.flowCtx, output)
meta := cb.doRun(ctx)
execinfra.SendTraceData(ctx, cb.flowCtx, output)
output.Push(nil /* row */, meta)
output.ProducerDone()
}

// Resume is part of the execinfra.Processor interface.
Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/ttl/ttljob/ttljob_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ func (t *ttlProcessor) Start(context.Context) {}
// Run implements the execinfra.Processor interface.
func (t *ttlProcessor) Run(ctx context.Context, output execinfra.RowReceiver) {
ctx = t.StartInternal(ctx, "ttl")
defer output.ProducerDone()
defer execinfra.SendTraceData(ctx, t.FlowCtx, output)
err := t.work(ctx, output)
if err != nil {
output.Push(nil, &execinfrapb.ProducerMetadata{Err: err})
}
execinfra.SendTraceData(ctx, t.FlowCtx, output)
output.ProducerDone()
}

func getTableInfo(
Expand Down