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

evalengine: Implement LOCATE and friends #15195

Merged
merged 3 commits into from
Feb 12, 2024

Conversation

dbussink
Copy link
Contributor

@dbussink dbussink commented Feb 9, 2024

This implements LOCATE, POSITION and INSTR to find substrings inside another string.

It diverges in behavior for multibyte characters because of the bugs in MySQL identified in https://bugs.mysql.com/bug.php?id=113933.

Related Issue(s)

Part of #9647

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

@dbussink dbussink added Type: Enhancement Logical improvement (somewhere between a bug and feature) Component: Evalengine changes to the evaluation engine labels Feb 9, 2024
Copy link
Contributor

vitess-bot bot commented Feb 9, 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 Feb 9, 2024
@github-actions github-actions bot added this to the v20.0.0 milestone Feb 9, 2024
to = len(src)
}
return src[from:to]
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added a number of these optimized / simplified implementations where possible as well (we check for this interface when slicing in the helper).

@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 Feb 9, 2024
Copy link

codecov bot commented Feb 9, 2024

Codecov Report

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

Comparison is base (eddb39e) 47.29% compared to head (789bbad) 67.36%.
Report is 135 commits behind head on main.

Files Patch % Lines
go/cmd/vtcombo/cli/main.go 0.00% 17 Missing ⚠️
go/cmd/vttablet/cli/cli.go 0.00% 13 Missing ⚠️
go/cmd/vtgate/cli/cli.go 0.00% 8 Missing ⚠️
go/mysql/collations/charset/eightbit/8bit.go 0.00% 8 Missing ⚠️
go/mysql/conn.go 53.84% 6 Missing ⚠️
go/mysql/capabilities/capability.go 91.48% 4 Missing ⚠️
go/mysql/query.go 77.77% 4 Missing ⚠️
go/cmd/vtadmin/main.go 0.00% 3 Missing ⚠️
go/cmd/vtctl/vtctl.go 0.00% 3 Missing ⚠️
go/event/syslogger/syslogger.go 57.14% 3 Missing ⚠️
... and 16 more
Additional details and impacted files
@@             Coverage Diff             @@
##             main   #15195       +/-   ##
===========================================
+ Coverage   47.29%   67.36%   +20.06%     
===========================================
  Files        1137     1560      +423     
  Lines      238684   192576    -46108     
===========================================
+ Hits       112895   129733    +16838     
+ Misses     117168    62843    -54325     
+ Partials     8621        0     -8621     

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

@@ -719,7 +725,7 @@ func (ast *astCompiler) translateCallable(call sqlparser.Callable) (IR, error) {

case *sqlparser.CurTimeFuncExpr:
if call.Fsp > 6 {
return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "Too-big precision 12 specified for '%s'. Maximum is 6.", call.Name.String())
return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "Too-big precision %d specified for '%s'. Maximum is 6.", call.Fsp, call.Name.String())
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was incorrectly hardcoding a value instead of using the one provided by the user.

@@ -282,8 +282,8 @@ func (b *builtinDateFormat) eval(env *ExpressionEnv) (eval, error) {
case *evalTemporal:
t = e.toDateTime(datetime.DefaultPrecision, env.now)
default:
t = evalToDateTime(date, datetime.DefaultPrecision, env.now, env.sqlmode.AllowZeroDate())
if t == nil || t.isZero() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Did a little cleanup of the zero date handling as well, since it's equivalent to convert not allowing zero dates if we check against nil and the zero date anyway.

@dbussink dbussink force-pushed the locate-and-friends branch 2 times, most recently from 13a3d83 to 4416195 Compare February 12, 2024 10:50
Copy link
Collaborator

@vmg vmg left a comment

Choose a reason for hiding this comment

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

Looks great. I love the zero-date cleanups. 🙇

This implements `LOCATE`, `POSITION` and `INSTR` to find substrings
inside another string.

It diverges in behavior for multibyte characters because of the bugs in
MySQL identified in https://bugs.mysql.com/bug.php?id=113933.

Signed-off-by: Dirkjan Bussink <[email protected]>
We have a bunch of cases where we convert to zero date with the runtime
flag, but then check both nil and zero date. It's equivalent to convert
without allowing zero dates to simplify the code here.

Signed-off-by: Dirkjan Bussink <[email protected]>
@dbussink dbussink merged commit d4f0c2a into vitessio:main Feb 12, 2024
102 checks passed
@dbussink dbussink deleted the locate-and-friends branch February 12, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Evalengine changes to the evaluation engine Type: Enhancement Logical improvement (somewhere between a bug and feature)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants