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 switch statements for readability, simplify .NewGoMySQLReader() #1135

Merged
merged 3 commits into from
Jul 6, 2022

Conversation

timvaillancourt
Copy link
Collaborator

@timvaillancourt timvaillancourt commented Jun 5, 2022

Description

This PR moves 2 x blocks of code to use switch statements for a bit more clarity, as suggested by the gocritic linter. Also the .NewGoMySQLReader() func of go/binlog/gomysql_reader.go was simplified (unused err removed, etc)

This change should result in the exact same behaviour as before

Details:

  1. Simplify .NewGoMySQLReader() func in go/binlog/gomysql_reader.go
    • Remove unused err return
  2. Use a type-based switch for binlog event type in go/binlog/gomysql_reader.go
    • This simplifies a future PR for GTID support
  3. Use switch on the CutOverType field to pick cutover logic
  • contributed code is using same conventions as original code
  • script/cibuild returns with no formatting errors, build errors or unit test errors

@timvaillancourt timvaillancourt changed the title Use switch statements for readability Use switch statements for readability, simplify .NewGoMySQLReader() Jun 9, 2022
@timvaillancourt timvaillancourt merged commit 0b066c1 into master Jul 6, 2022
@timvaillancourt timvaillancourt deleted the simplify-switch-stmts branch July 6, 2022 21:45
dm-2 pushed a commit that referenced this pull request Jul 7, 2022
…)` (#1135)

* Use `switch` statements for readability

* Simplify initBinlogReader()
@dm-2 dm-2 mentioned this pull request Jul 7, 2022
dm-2 pushed a commit that referenced this pull request Jul 7, 2022
…)` (#1135)

* Use `switch` statements for readability

* Simplify initBinlogReader()
RainbowDashy pushed a commit to RainbowDashy/gh-ost that referenced this pull request Jul 11, 2022
…)` (github#1135)

* Use `switch` statements for readability

* Simplify initBinlogReader()
d-bytebase pushed a commit to bytebase/gh-ost that referenced this pull request Jul 13, 2022
* Merge pull request github#1143 from github/codeql-run-on-prs

Run CodeQL analysis on PRs

* Merge pull request github#1141 from shaohk/fix-two-phase-commit-lost-data_v2

fix(lost data in mysql two-phase commit): lost data in mysql two-phas…

* compound pk tests (github#387)

* compound pk tests

* more details in failure diff

* more elaborate test; the pk-ts one consistently fails

* Fix merge conflict

Co-authored-by: Shlomi Noach <shlomi-noach@github.com>
Co-authored-by: Tim Vaillancourt <timvaillancourt@github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use `switch` statements for readability, simplify `.NewGoMySQLReader()` (github#1135)

* Use `switch` statements for readability

* Simplify initBinlogReader()

* Add context/timeout to HTTP throttle check (github#1131)

* Add context/timeout to HTTP throttle check

* Dont run `.GetThrottleHTTPInterval()` on every loop

* Update help message

* Var rename

* 2022

* Add timeout flag

* Add unix/tcp server commands, use ParseInt() for string->int64

* Var rename

* Re-check http timeout on every loop iteration

* Remove stale comment

* Make throttle interval idempotent

* var rename

* Usage grammar

* Make http timeout idempotent too

* Parse time.Duration once

* Move timeout to NewThrottler

* Help update

* Set User-Agent header

* Re-add newline

Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com>

* Default to `go1.17.11` (github#1136)

* Default to go1.17.11

* `go mod vendor`

Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com>

* Cancel any row count queries before attempting to cut over (github#846)

* Cancel any row count queries before attempting to cut over

Closes github#830. Switches from using `QueryRow` to `QueryRowContext`, and
stores a context.CancelFunc in the migration context, which is called to
halt any running row count query before beginning the cut over.

* Make it threadsafe

* Kill the count query on the database side as well

* Explicitly grab a connection to run the count, store its connection id
* When the query context is canceled, run a `KILL QUERY ?` on that connection id

* Rewrite these to use the threadsafe functions, stop exporting the cancel func

* Update logger

* Update logger

Co-authored-by: Tim Vaillancourt <timvaillancourt@github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com>

Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com>
Co-authored-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Co-authored-by: Shlomi Noach <shlomi-noach@github.com>
Co-authored-by: Tim Vaillancourt <timvaillancourt@github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Andrew Mason <amason@hey.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants