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.

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

Use the correct parser for truncation #14985

Merged

Conversation

dbussink
Copy link
Contributor

This was broken in the parser injection refactor and this didn't inject the properly configured object.

Also cleans up some global init() calls as well and moves it to the pattern of how we initialize the rest which we need to pass in the parser correctly anyway.

Related Issue(s)

Should have been done in #14822 as part of work on #14717

Checklist

  • "Backport to:" labels have been added if this change should be back-ported to release branches
  • If this change is to be back-ported to previous releases, a justification is included in the PR description
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on CI?
  • Documentation was added or is not required

This was broken in the parser injection refactor and this didn't inject
the properly configured object.

Also cleans up some global init() calls as well and moves it to the
pattern of how we initialize the rest which we need to pass in the
parser correctly anyway.

Signed-off-by: Dirkjan Bussink <[email protected]>
Copy link
Contributor

vitess-bot bot commented Jan 18, 2024

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

@vitess-bot vitess-bot bot added NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says labels Jan 18, 2024
@@ -55,10 +55,9 @@ var (
</thead>
`)
querylogzFuncMap = template.FuncMap{
"stampMicro": func(t time.Time) string { return t.Format(time.StampMicro) },
"cssWrappable": logz.Wrappable,
"truncateQuery": sqlparser.NewTestParser().TruncateForUI,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

sqlparser.NewTestParser() is the problematic bit here, I did that to then revisit later but I missed that 🤦

@dbussink dbussink added Type: Bug Component: General Changes throughout the code base and removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says NeedsIssue A linked issue is missing for this Pull Request NeedsBackportReason If backport labels have been applied to a PR, a justification is required labels Jan 18, 2024
@github-actions github-actions bot added this to the v19.0.0 milestone Jan 18, 2024
Copy link

codecov bot commented Jan 18, 2024

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (7800699) 47.29% compared to head (665b84a) 47.30%.

Files Patch % Lines
go/vt/vttablet/tabletserver/tabletserver.go 50.00% 4 Missing and 1 partial ⚠️
go/vt/vtgate/querylog.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main   #14985   +/-   ##
=======================================
  Coverage   47.29%   47.30%           
=======================================
  Files        1139     1139           
  Lines      238914   238918    +4     
=======================================
+ Hits       113004   113018   +14     
+ Misses     117315   117308    -7     
+ Partials     8595     8592    -3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shlomi-noach shlomi-noach merged commit 9036de8 into vitessio:main Jan 18, 2024
106 checks passed
@dbussink dbussink deleted the dbussink/fix-truncate-ui-len-usage branch January 18, 2024 11:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: General Changes throughout the code base Type: Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants