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

Move to native sqlite3 queries #17124

Merged
merged 3 commits into from
Nov 4, 2024
Merged

Move to native sqlite3 queries #17124

merged 3 commits into from
Nov 4, 2024

Conversation

dbussink
Copy link
Contributor

@dbussink dbussink commented Oct 31, 2024 •
edited
Loading

We don't have to support anything but sqlite3 here, so let's use the proper sqlite syntax. This allows removing the find / replace logic and regexp matching which reduces vtorc CPU usage significantly.

@timvaillancourt I was also tempted I guess to remove a bunch of code, but we can go for your PR in #17120. Opened this still to see what CI does on these changes.

Related Issue(s)

Fixes #17114

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
Move to native sqlite3 queries
7e7cf3f 
We don't have to support anything but sqlite3 here, so let's use the
proper sqlite syntax. This allows removing the find / replace logic and
regexp matching which reduces vtorc CPU usage significantly.

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

vitess-bot bot commented Oct 31, 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 Oct 31, 2024
@github-actions github-actions bot added this to the v22.0.0 milestone Oct 31, 2024
@codecov Codecov
Copy link

codecov bot commented Oct 31, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 65.95745% with 16 lines in your changes missing coverage. Please review.

Project coverage is 67.42%. Comparing base (ffaeba0) to head (cd0777a).
Report is 5 commits behind head on main.

Files with missing lines Patch % Lines
go/vt/vtorc/logic/topology_recovery_dao.go 0.00% 7 Missing ⚠️
go/vt/vtorc/db/db.go 25.00% 3 Missing ⚠️
go/vt/vtorc/inst/instance_dao.go 88.46% 3 Missing ⚠️
go/vt/vtorc/inst/analysis_dao.go 85.71% 1 Missing ⚠️
go/vt/vtorc/logic/disable_recovery.go 0.00% 1 Missing ⚠️
go/vt/vtorc/process/health.go 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main   #17124      +/-   ##
==========================================
- Coverage   67.43%   67.42%   -0.01%     
==========================================
  Files        1571     1569       -2     
  Lines      252249   252132     -117     
==========================================
- Hits       170098   169999      -99     
+ Misses      82151    82133      -18

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

@dbussink dbussink added Type: Internal Cleanup Type: Performance Component: VTorc Vitess Orchestrator integration 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 Oct 31, 2024
@dbussink dbussink marked this pull request as ready for review October 31, 2024 15:54
@timvaillancourt
Copy link
Contributor

@timvaillancourt I was also tempted I guess to remove a bunch of code, but we can go for your PR in #17120. Opened this still to see what CI does on these changes.

@dbussink yeah, in hindsight a wholesale change in SQL dialect should have been 1 PR 😆. Looking forward to some cleanup iterations on this code

@timvaillancourt timvaillancourt mentioned this pull request Oct 31, 2024
Closed
4 tasks
@timvaillancourt
Copy link
Contributor

@dbussink pre-backporting this to our v19 branch to validate this (with the %%s -> %s fix) 👍

dbussink and others added 2 commits October 31, 2024 20:50
@dbussink
Remove more unused code
d5b3ffd 
Signed-off-by: Dirkjan Bussink <[email protected]>
@dbussink @timvaillancourt
Fix strftime call
cd0777a 
Co-authored-by: Tim Vaillancourt <[email protected]>
Signed-off-by: Dirkjan Bussink <[email protected]>
This was referenced Oct 31, 2024
Closed
Closed
timvaillancourt
timvaillancourt reviewed Nov 1, 2024
View reviewed changes
go/vt/vtorc/db/db.go
@@ -82,25 +77,12 @@ func deployStatements(db *sql.DB, queries []string) error {
tx, err := db.Begin()
if err != nil {
log.Fatal(err.Error())
return err
Copy link
Contributor

Choose a reason for hiding this comment

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

@dbussink looked at this more - this line will never be reached due to the log.Fatal(...) before it

There is also another log.Fatal(...) in this func; it might be cleaner for registerVTOrcDeployment to only return errs (no log.Fatals) and initVTOrcDB can do a single log.Fatal(...) if registerVTOrcDeployment errors - then all the fatal-ing code is in the init function

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah yeah, this seems pretty inconsistent style wise at the moment, so I think that's more something for a separate PR to make consistent.

Copy link
Contributor

Choose a reason for hiding this comment

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

Makes sense 👍

shlomi-noach
shlomi-noach reviewed Nov 4, 2024
View reviewed changes
Copy link
Contributor

@shlomi-noach shlomi-noach left a comment

Choose a reason for hiding this comment

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

My beautiful regexp-based SQL manipulation! 😭 😆

GuptaManan100
GuptaManan100 approved these changes Nov 4, 2024
View reviewed changes
Copy link
Member

@GuptaManan100 GuptaManan100 left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@dbussink dbussink merged commit 9ed8ee2 into vitessio:main Nov 4, 2024
98 checks passed
@dbussink dbussink deleted the dbussink/native-sqlite-queries branch November 4, 2024 10:59
timvaillancourt added a commit to slackhq/vitess that referenced this pull request Nov 7, 2024
@dbussink @timvaillancourt
Move to native sqlite3 queries (vitessio#17124)
95de1fc 
Signed-off-by: Dirkjan Bussink <[email protected]>
Co-authored-by: Tim Vaillancourt <[email protected]>
@timvaillancourt timvaillancourt mentioned this pull request Nov 7, 2024
Merged
4 tasks
timvaillancourt added a commit to slackhq/vitess that referenced this pull request Nov 12, 2024
@timvaillancourt @dbussink @mattlord
slack-19.0: backport vtorc optimisations, pt. 1 (#555)
a925663 
* Move to native sqlite3 queries (vitessio#17124)

Signed-off-by: Dirkjan Bussink <[email protected]>
Co-authored-by: Tim Vaillancourt <[email protected]>

* missing updates

Signed-off-by: Tim Vaillancourt <[email protected]>

* fix %

Signed-off-by: Tim Vaillancourt <[email protected]>

* missing comma

Signed-off-by: Tim Vaillancourt <[email protected]>

* Improve efficiency of `vtorc` topo calls  (vitessio#17071)

Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Matt Lord <[email protected]>

---------

Signed-off-by: Dirkjan Bussink <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Dirkjan Bussink <[email protected]>
Co-authored-by: Matt Lord <[email protected]>
@timvaillancourt timvaillancourt mentioned this pull request Dec 3, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timvaillancourt timvaillancourt timvaillancourt approved these changes

@shlomi-noach shlomi-noach shlomi-noach left review comments

@GuptaManan100 GuptaManan100 GuptaManan100 approved these changes

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

Assignees
No one assigned
Labels
Component: VTorc Vitess Orchestrator integration Type: Internal Cleanup Type: Performance
Projects
None yet
Milestone
v22.0.0
Development

Successfully merging this pull request may close these issues.

Feature Request: Optimize sqlutils.ToSqlite3Dialect for queries + DML/DDLs
4 participants
@dbussink @timvaillancourt @shlomi-noach @GuptaManan100