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

Improve err extraction logic #14887

Merged
merged 1 commit into from
Jan 4, 2024
Merged

Improve err extraction logic #14887

merged 1 commit into from
Jan 4, 2024

Conversation

dbussink
Copy link
Contributor

@dbussink dbussink commented Jan 4, 2024

The previous regexp had superfluous wildcard matching at the beginning and end. This results in eagerly matching the whole string and subsequently matches the last occurance of the match.

Instead we don't want to use the wildcard so the default left to right matching is used and we get the first occurence.

Related Issue(s)

Fixes #14866

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

@vitess-bot vitess-bot
Copy link
Contributor

vitess-bot bot commented Jan 4, 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 4, 2024
@dbussink dbussink 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 4, 2024
@github-actions github-actions bot added this to the v19.0.0 milestone Jan 4, 2024
mdlayher
mdlayher approved these changes Jan 4, 2024
View reviewed changes
go/mysql/sqlerror/sql_error_test.go Outdated Show resolved Hide resolved
go/mysql/sqlerror/sql_error_test.go Show resolved Hide resolved
@dbussink
Improve err extraction logic
8d8d1d3 
The previous regexp had superfluous wildcard matching at the beginning
and end. This results in eagerly matching the whole string and
subsequently matches the last occurance of the match.

Instead we don't want to use the wildcard so the default left to right
matching is used and we get the first occurence.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
@dbussink dbussink force-pushed the dbussink/improve-err-extract branch from 5586329 to 8d8d1d3 Compare January 4, 2024 13:43
@dbussink dbussink merged commit b303639 into vitessio:main Jan 4, 2024
99 checks passed
@dbussink dbussink deleted the dbussink/improve-err-extract branch January 4, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohit-nayak-ps rohit-nayak-ps rohit-nayak-ps approved these changes

@frouioui frouioui frouioui approved these changes

@harshit-gangal harshit-gangal harshit-gangal approved these changes

@mdlayher mdlayher mdlayher approved these changes

@systay systay Awaiting requested review from systay systay is a code owner

@mattlord mattlord Awaiting requested review from mattlord mattlord is a code owner

Assignees
No one assigned
Labels
Component: Query Serving Type: Bug
Projects
None yet
Milestone
v19.0.0
Development

Successfully merging this pull request may close these issues.

Bug Report: The returned error code is inconsistent with MySQL
5 participants
@dbussink @mdlayher @harshit-gangal @frouioui @rohit-nayak-ps