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

expression rewriting: enable more rewrites and limit CNF rewrites #14560

Merged
merged 4 commits into from Nov 22, 2023
Merged

expression rewriting: enable more rewrites and limit CNF rewrites #14560

merged 4 commits into from Nov 22, 2023

Conversation

systay
Copy link
Collaborator

@systay systay commented Nov 21, 2023

Description

When we can't find a good vindex to use, we try rewriting the WHERE clause into CNF (conjuctive normal form), and this transformation can in the worst case become an exponentially large expression. To stop this from happening, we count the number of OR expression we are dealing to stop the worst case from happening.

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

@systay
expression rewriting: enable more rewrites and limit CNF rewrites
65167dc 
Signed-off-by: Andres Taylor <andres@planetscale.com>
@systay systay added Type: Bug Component: Query Serving Backport to: release-16.0 Backport to: release-17.0 Needs to be back ported to release-17.0 Backport to: release-18.0 Needs to be back ported to release-18.0 labels Nov 21, 2023
@vitess-bot vitess-bot
Copy link
Contributor

vitess-bot bot commented Nov 21, 2023

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 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 Nov 21, 2023
@github-actions github-actions bot added this to the v19.0.0 milestone Nov 21, 2023
@systay systay 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 labels Nov 21, 2023
frouioui
frouioui previously approved these changes Nov 21, 2023
View reviewed changes
Copy link
Member

@frouioui frouioui left a comment

Choose a reason for hiding this comment

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

Tests are failing, otherwise looks good to me.

@frouioui
Fix test TestRewritePredicate
8373442 
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
@frouioui
update filter_cases.json
c443ce1 
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
@frouioui frouioui dismissed their stale review November 21, 2023 22:33

Something is off in the rewritten queries.

frouioui
frouioui reviewed Nov 21, 2023
View reviewed changes
go/vt/vtgate/planbuilder/testdata/filter_cases.json
@@ -4110,7 +4110,7 @@
"Sharded": true
},
"FieldQuery": "select id from `user` where 1 != 1",
"Query": "select id from `user` where id = 5 and `name` = 'foo' or id = 12 and `name` = 'bar'",
"Query": "select id from `user` where id in ::__vals and (id = 5 or `name` = 'bar') and (`name` = 'foo' or id = 12) and `name` in ('foo', 'bar')",
Copy link
Member

Choose a reason for hiding this comment

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

Sorry i had a doubt about this re-written query but turns out it looks good to me!

@frouioui
fix TestSelectINFromOR
4359717 
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
@frouioui frouioui merged commit ae8d61e into vitessio:main Nov 22, 2023
115 checks passed
@frouioui frouioui deleted the cnf-limit branch November 22, 2023 00:55
@vitess-bot vitess-bot bot mentioned this pull request Nov 22, 2023
Merged
vitess-bot pushed a commit that referenced this pull request Nov 22, 2023
@vitess-bot @frouioui
expression rewriting: enable more rewrites and limit CNF rewrites (#1…
8bc62b5 
…4560)

Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
@vitess-bot vitess-bot bot mentioned this pull request Nov 22, 2023
Merged
vitess-bot pushed a commit that referenced this pull request Nov 22, 2023
@vitess-bot @frouioui
expression rewriting: enable more rewrites and limit CNF rewrites (#1…
07f76df 
…4560)

Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
@vitess-bot vitess-bot bot mentioned this pull request Nov 22, 2023
Merged
vitess-bot pushed a commit that referenced this pull request Nov 22, 2023
@vitess-bot @frouioui
expression rewriting: enable more rewrites and limit CNF rewrites (#1…
02e3968 
…4560)

Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
frouioui added a commit that referenced this pull request Nov 22, 2023
@vitess-bot @frouioui
[release-18.0] expression rewriting: enable more rewrites and limit C…
e93ca44 
…NF rewrites (#14560) (#14576)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
frouioui added a commit that referenced this pull request Nov 22, 2023
@vitess-bot @frouioui
[release-17.0] expression rewriting: enable more rewrites and limit C…
94e85d9 
…NF rewrites (#14560) (#14575)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
frouioui added a commit that referenced this pull request Nov 22, 2023
@vitess-bot @frouioui
[release-16.0] expression rewriting: enable more rewrites and limit C…
53dfd30 
…NF rewrites (#14560) (#14574)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
This was referenced Nov 22, 2023
Merged
Merged
Merged
Merged
ejortegau pushed a commit to slackhq/vitess that referenced this pull request Dec 13, 2023
@systay @frouioui @ejortegau
expression rewriting: enable more rewrites and limit CNF rewrites (vi…
f89ade4 
…tessio#14560)

Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
@hmaurer hmaurer mentioned this pull request Mar 21, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arthurschreiber arthurschreiber arthurschreiber approved these changes

@frouioui frouioui frouioui approved these changes

@harshit-gangal harshit-gangal Awaiting requested review from harshit-gangal harshit-gangal is a code owner

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

Assignees
No one assigned
Labels
Backport to: release-17.0 Needs to be back ported to release-17.0 Backport to: release-18.0 Needs to be back ported to release-18.0 Component: Query Serving Type: Bug
Projects
None yet
Milestone
v19.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@systay @arthurschreiber @frouioui