Merge pull request #65849 from yuzefovich/backport20.2-65819

yuzefovich · web-flow · commit 760f605ea033 · 2021-05-28T21:17:15.000-07:00
release-20.2: colexecutils: make closure of nil spilling queue a no-op
diff --git a/pkg/sql/colexec/spilling_queue.go b/pkg/sql/colexec/spilling_queue.go
@@ -261,7 +261,7 @@ func (q *spillingQueue) spilled() bool {
 }
 
 func (q *spillingQueue) close(ctx context.Context) error {
-	if q.closed {
+	if q == nil || q.closed {
 		return nil
 	}
 	if q.diskQueue != nil {

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ func (q *spillingQueue) spilled() bool {`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`func (q *spillingQueue) close(ctx context.Context) error {`
`264`		`- if q.closed {`
	`264`	`+ if q == nil \|\| q.closed {`
`265`	`265`	`return nil`
`266`	`266`	`}`
`267`	`267`	`if q.diskQueue != nil {`