Merge pull request #65848 from yuzefovich/backport21.1-65819

release-21.1: colexecutils: make closure of nil spilling queue a no-op
cockroachdb · May 29, 2021 · 4837b15 · 4837b15
2 parents 506159b + 77c8069
commit 4837b15
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/sql/colexec/colexecutils/spilling_queue.go b/pkg/sql/colexec/colexecutils/spilling_queue.go
@@ -513,7 +513,7 @@ func (q *SpillingQueue) MemoryUsage() int64 {
 
 // Close closes the spilling queue.
 func (q *SpillingQueue) Close(ctx context.Context) error {
-	if q.closed {
+	if q == nil || q.closed {
 		return nil
 	}
 	if q.diskQueue != nil {