/cockroach

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.

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

backport-2.1: sql: better memory accounting in windower; fix flaky TestShowQueries #31302

Merged
merged 2 commits into from Oct 12, 2018

Conversation

Reviewers

@knz knz

@cockroachdb/sql-execution-prs sql-execution-prs

@cockroachdb/sql-planning-prs sql-planning-prs

@cockroachdb/distsql-prs distsql-prs

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@jordanlewis @cockroach-teamcity @knz
@jordanlewis
Member

jordanlewis commented Oct 12, 2018

Backport:

  • 1/1 commits from "sql: better memory accounting in windower" (#30776)
  • 1/1 commits from "sql: fix flaky TestShowQueries" (#31241)

Please see individual PRs for details.

/cc @cockroachdb/release

jordanlewis added some commits Sep 28, 2018

@jordanlewis
sql: better memory accounting in windower 
Previously, the size of the bucket key wasn't taken into account. Also,
now nil out the partition map when closing the windower to ensure memory
is freed in a timely manner.

Release note: None
Verified
This commit was signed with a verified signature.
@jordanlewis jordanlewis Jordan Lewis
GPG key ID: CB92F5D43A08059A Learn about signing commits
896a39d
@jordanlewis
sql: fix flaky TestShowQueries 
There was a potential data race, and an incorrect check for a common
query (it's SHOW CLUSTER SETTING version, not capital VERSION).

Release note: None
Verified
This commit was signed with a verified signature.
@jordanlewis jordanlewis Jordan Lewis
GPG key ID: CB92F5D43A08059A Learn about signing commits
Loading status checks…
a1165a6

@jordanlewis jordanlewis requested a review from knz Oct 12, 2018

@jordanlewis jordanlewis requested review from cockroachdb/distsql-prs as code owners Oct 12, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 12, 2018

Member

This change is Reviewable
Member

cockroach-teamcity commented Oct 12, 2018

This change is Reviewable
@knz

knz approved these changes Oct 12, 2018
View changes

@jordanlewis jordanlewis merged commit 6c689c7 into cockroachdb:release-2.1 Oct 12, 2018
2 checks passed

2 checks passed

GitHub CI (Cockroach) TeamCity build finished
Details
license/cla Contributor License Agreement is signed.
Details

@jordanlewis jordanlewis deleted the jordanlewis:backport2.1-30776-31241 branch Oct 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment