Skip to content

colexec: exhaust input in sorter benchmarks#45039

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
asubiotto:bncl
Feb 13, 2020
Merged

colexec: exhaust input in sorter benchmarks#45039
craig[bot] merged 1 commit intocockroachdb:masterfrom
asubiotto:bncl

Conversation

@asubiotto
Copy link
Copy Markdown
Contributor

Some benchmarks were only calling Next the expected number of times and
failing if a zero batch was encountered. However, operators perform cleanup
when a zero batch is returned, so this cleanup step was being elided. It's
also more in line with other benchmarks to exhaust the operator before
finishing a benchmark.

Release note: None (testing code cleanup)

@asubiotto asubiotto requested a review from yuzefovich February 12, 2020 22:18
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 3 of 3 files at r1.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @asubiotto)


pkg/sql/colexec/external_sort_test.go, line 203 at r1 (raw file):

						}
						sorter.Init()
						for {

[nit]: I think we tend to use form like for b := sorter.Next(ctx); b.Length() > 0; b = sorter.Next(ctx){} for this.

Some benchmarks were only calling `Next` the expected number of times and
failing if a zero batch was encountered. However, operators perform cleanup
when a zero batch is returned, so this cleanup step was being elided. It's
also more in line with other benchmarks to exhaust the operator before
finishing a benchmark.

Release note: None (testing code cleanup)
Copy link
Copy Markdown
Contributor Author

@asubiotto asubiotto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @yuzefovich)


pkg/sql/colexec/external_sort_test.go, line 203 at r1 (raw file):

Previously, yuzefovich wrote…

[nit]: I think we tend to use form like for b := sorter.Next(ctx); b.Length() > 0; b = sorter.Next(ctx){} for this.

Done.

@asubiotto
Copy link
Copy Markdown
Contributor Author

bors r=yuzefovich

@asubiotto
Copy link
Copy Markdown
Contributor Author

bors was canceled for some reason

bors r=yuzefovich

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 13, 2020

Build failed

@asubiotto
Copy link
Copy Markdown
Contributor Author

roachtest flake

bors r=yuzefovich

craig bot pushed a commit that referenced this pull request Feb 13, 2020
45039: colexec: exhaust input in sorter benchmarks r=yuzefovich a=asubiotto

Some benchmarks were only calling `Next` the expected number of times and
failing if a zero batch was encountered. However, operators perform cleanup
when a zero batch is returned, so this cleanup step was being elided. It's
also more in line with other benchmarks to exhaust the operator before
finishing a benchmark.

Release note: None (testing code cleanup)

45080: storage/concurrency: test and bugfix for clearing the locks when the r=sumeerbhola a=sumeerbhola

size limit of the lockTable is exceeded

Release note: None

Co-authored-by: Alfonso Subiotto Marques <alfonso@cockroachlabs.com>
Co-authored-by: sumeerbhola <sumeer@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 13, 2020

Build succeeded

@craig craig bot merged commit 406e37c into cockroachdb:master Feb 13, 2020
@asubiotto asubiotto deleted the bncl branch February 20, 2020 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants