Skip to content
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

sql: remove no longer used channel in createStatsNode #99750

Merged
merged 1 commit into from
Mar 30, 2023
+4 −8
Merged

sql: remove no longer used channel in createStatsNode #99750

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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
/pkg/sql/stats/ @cockroachdb/sql-queries

/pkg/sql/col* @cockroachdb/sql-queries
/pkg/sql/create_stats* @cockroachdb/sql-queries
/pkg/sql/distsql*.go @cockroachdb/sql-queries
/pkg/sql/exec* @cockroachdb/sql-queries
#!/pkg/sql/exec_log*.go @cockroachdb/sql-queries-noreview
Expand Down
11 changes: 3 additions & 8 deletions pkg/sql/create_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,19 @@ type createStatsNode struct {
// createStatsRun contains the run-time state of createStatsNode during local
// execution.
type createStatsRun struct {
resultsCh chan tree.Datums
errCh chan error
errCh chan error
}

func (n *createStatsNode) startExec(params runParams) error {
telemetry.Inc(sqltelemetry.SchemaChangeCreateCounter("stats"))
n.run.resultsCh = make(chan tree.Datums)
n.run.errCh = make(chan error)
go func() {
err := n.startJob(params.ctx, n.run.resultsCh)
err := n.startJob(params.ctx)
select {
case <-params.ctx.Done():
case n.run.errCh <- err:
}
close(n.run.errCh)
close(n.run.resultsCh)
}()
return nil
}
Expand All @@ -130,16 +127,14 @@ func (n *createStatsNode) Next(params runParams) (bool, error) {
return false, params.ctx.Err()
case err := <-n.run.errCh:
return false, err
case <-n.run.resultsCh:
return true, nil
}
}

func (*createStatsNode) Close(context.Context) {}
func (*createStatsNode) Values() tree.Datums { return nil }

// startJob starts a CreateStats job to plan and execute statistics creation.
func (n *createStatsNode) startJob(ctx context.Context, resultsCh chan<- tree.Datums) error {
func (n *createStatsNode) startJob(ctx context.Context) error {
record, err := n.makeJobRecord(ctx)
if err != nil {
return err
Expand Down