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

Jump to bottom

colexec: fix coalescing logic in the spilling queue #59057

Merged
merged 1 commit into from
Jan 15, 2021
Merged

colexec: fix coalescing logic in the spilling queue #59057

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
2 changes: 0 additions & 2 deletions pkg/sql/colexec/routers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/types"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/colcontainerutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/util/humanizeutil"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
Expand Down Expand Up @@ -861,7 +860,6 @@ func TestHashRouterOneOutput(t *testing.T) {

func TestHashRouterRandom(t *testing.T) {
defer leaktest.AfterTest(t)()
skip.WithIssue(t, 58956, "flaky test")
defer log.Scope(t).Close(t)
ctx := context.Background()

Expand Down
22 changes: 12 additions & 10 deletions pkg/sql/colexec/spilling_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,11 @@ func (q *spillingQueue) enqueue(ctx context.Context, batch coldata.Batch) error

alreadyCopied := 0
if q.numInMemoryItems > 0 {
// If we have already enqueued at least one batch, let's try to append
// as many tuples to it as it has the capacity for.
// If we have already enqueued at least one batch, let's try to copy
// as many tuples into it as it has the capacity for.
tailBatchIdx := q.curTailIdx - 1
if tailBatchIdx < 0 {
tailBatchIdx = 0
tailBatchIdx = len(q.items) - 1
}
tailBatch := q.items[tailBatchIdx]
if l, c := tailBatch.Length(), tailBatch.Capacity(); l < c {
Expand All @@ -252,13 +252,15 @@ func (q *spillingQueue) enqueue(ctx context.Context, batch coldata.Batch) error
}
q.unlimitedAllocator.PerformOperation(tailBatch.ColVecs(), func() {
for i := range q.typs {
tailBatch.ColVec(i).Append(
coldata.SliceArgs{
Src: batch.ColVec(i),
Sel: batch.Selection(),
DestIdx: l,
SrcStartIdx: 0,
SrcEndIdx: alreadyCopied,
tailBatch.ColVec(i).Copy(
coldata.CopySliceArgs{
SliceArgs: coldata.SliceArgs{
Src: batch.ColVec(i),
Sel: batch.Selection(),
DestIdx: l,
SrcStartIdx: 0,
SrcEndIdx: alreadyCopied,
},
},
)
}
Expand Down