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

release-22.1: sql/sqlstats: record QuerySummary when merging stats, sql: fix prepared statement query summary #87618

Merged
merged 2 commits into from
Sep 9, 2022
Merged

release-22.1: sql/sqlstats: record QuerySummary when merging stats, sql: fix prepared statement query summary #87618

merged 2 commits into from
Sep 9, 2022
+59 −2

Conversation

ericharmeling
Copy link
Contributor

@ericharmeling ericharmeling commented Sep 8, 2022 •
edited
Loading

Backport:

Please see individual PRs for details.

/cc @cockroachdb/release

Release justification: low risk, high benefit change to existing functionality

stevendanna and others added 2 commits September 8, 2022 10:55
@stevendanna @ericharmeling
sql/sqlstats: record QuerySummary when merging stats
863d9a4 
During execution of a transaction, all statement statistics are
collected in an struct local to that transaction, and then flushed to
the main ApplicationStats container when the transaction finishes.

Previously, when flushing, we failed to copy the QuerySummary field,
leading to `metadata->'querySummary'` from being empty in most cases.

Prior to ce1b42b this only affected
statements in an explicit transaction. After that commit, it affected
all statements.

Release note (bug fix): Fix a bug that led to the querySummary field
in crdb_internal.statements_statistics's metadata column being empty.
@ericharmeling
sql: fix prepared statement query summary
fa6e124 
This commit sets the StmtSummary metadata field for prepared
statements to the StatementSummary value in the prepared statement
metadata for prepared statements at execution.

Fixes cockroachdb#79152.

Release note (bug fix): Previously, the querySummary metadata field in
the crdb_internal.statement_statistics table was inconsistent with the
query metadata field for executed prepared statements. These fields
are now consistent for prepared statements.
@blathers-crl
Copy link

blathers-crl bot commented Sep 8, 2022 •
edited by ericharmeling
Loading

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ericharmeling ericharmeling requested review from stevendanna and a team September 8, 2022 15:02
@ericharmeling ericharmeling marked this pull request as ready for review September 8, 2022 15:07
maryliag
maryliag approved these changes Sep 8, 2022
View reviewed changes
Copy link
Contributor

@maryliag maryliag 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 2 of 2 files at r1, 4 of 4 files at r2, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @stevendanna)

@ericharmeling ericharmeling merged commit fa42e3b into cockroachdb:release-22.1 Sep 9, 2022
@ericharmeling ericharmeling deleted the backport22.1-84170-83673 branch September 9, 2022 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maryliag maryliag maryliag approved these changes

@stevendanna stevendanna Awaiting requested review from stevendanna

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ericharmeling @cockroach-teamcity @maryliag @stevendanna