-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
roachtest: ignore unrelated tags when looking for build version #33446
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's also a git describe
command in the Makefile that we should fix at the same time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you make the same changes here?
Line 1007 in 94516a1
@{ git describe --tags --dirty 2> /dev/null || git rev-parse --short HEAD; } | tr -d \\n > $@ cockroach/pkg/cmd/internal/issues/issues.go
Line 143 in 94516a1
cmd := exec.Command("git", "describe", "--abbrev=0", "--tags") cockroach/scripts/release-notes.py
Lines 722 to 723 in 94516a1
current_version = subprocess.check_output(["git", "describe", "--tags", options.until_commit], universal_newlines=True).strip() previous_version = subprocess.check_output(["git", "describe", "--tags", options.from_commit], universal_newlines=True).strip() cockroach/build/teamcity-post-failures.py
Line 66 in 94516a1
tag = subprocess.check_output(['git', 'describe', '--abbrev=0', '--tags'],
🙈
Release note: None
e3f8331
to
7146751
Compare
Done. That's some nice grepping |
Thanks for the reviews! bors r=bdarnell,benesch |
33020: sql, roachpb: save representative logical plans in statement stats r=jordanlewis a=celiala _[This is based off initial work done in #26494]_ We want to show sample logical plans on the Admin UI Statement Details page. This change introduces logic to sample logical plans and store into statement statistics. A future commit will surface theses plans in the Admin UI. Every `n` times a query with a particular fingerprint is run (currently n is hardcoded to 1000), convert its logical plan to a simplified form suitable for serialization to JSON or protobuf, and save that plan in memory as part of the StatementStatistics struct. Since the admin server's `Queries` method returns the full, unscrubbed StatementStats proto for each fingerprint, this change exposes these plans to the admin UI, via [the newly-created] StatementStatistics.SensitiveInfo. Notes: - A future commit could scrub the plans so they can be sent to the reg cluster. - This implementation uses query plans; however, we can adapt this to use the optimizer later, if desired. - Over time, we may also want to consider moving the statement reporting code into a goroutine that isn't the primary execution goroutine, both for performance reasons and for failure isolation ones. Release note (sql change): Sample logical plans and store into statement statistics. 33446: roachtest: ignore unrelated tags when looking for build version r=bdarnell,benesch a=danhhz Release note: None Co-authored-by: Pete Vilter <[email protected]> Co-authored-by: Celia La <[email protected]> Co-authored-by: Daniel Harrison <[email protected]>
Build succeeded |
Release note: None