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

Dead code cleanup #14894

Merged
merged 3 commits into from
Jan 5, 2024
Merged

Conversation

dbussink
Copy link
Contributor

@dbussink dbussink commented Jan 5, 2024

This cleans up dead code in two areas. First in topotools there's a bunch of unused code and code that can be replaced by more standard library logic.

Second, we can clean up some unused code in collations. See each specific commit message for more details.

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

This removes a bunch of unused code and removes some helpers that are
available in standard Go packages these days.

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

vitess-bot bot commented Jan 5, 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 5, 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 5, 2024
@github-actions github-actions bot added this to the v19.0.0 milestone Jan 5, 2024
This removes a trie that is not use for anything except for the tests.
Also fixes some tests when colldump has been run, the path was wrong
after a recent refactor for these tests to run.

Signed-off-by: Dirkjan Bussink <[email protected]>
@@ -17,10 +17,8 @@ limitations under the License.
package topotools

import (
"context"
Copy link
Contributor

Choose a reason for hiding this comment

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

💥 🧹

@@ -58,7 +56,7 @@ func findContractedCollations(t testing.TB, unique bool) (result []CollationWith
continue
}

rf, err := os.Open(fmt.Sprintf("testdata/mysqldata/%s.json", collation.Name()))
rf, err := os.Open(fmt.Sprintf("../testdata/mysqldata/%s.json", collation.Name()))
Copy link
Contributor

Choose a reason for hiding this comment

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

was this not working before, or maybe a VTROOT issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was not working before anymore but that was not noticed since there tests only run when you manually generate the collation data.

Comment on lines -116 to +112
testMatch(t, "ContractTrie", cnt, result, nil, 2)

result = cwc.ContractFast.FindContextual(head, tail)
result := cwc.ContractFast.FindContextual(head, tail)
Copy link
Member

Choose a reason for hiding this comment

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

Why are we removing the testMatch on ContractTrie here?

Copy link
Member

Choose a reason for hiding this comment

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

got my answer below :)

@dbussink dbussink force-pushed the dbussink/more-code-cleanup branch from f9f4350 to f3cfe90 Compare January 5, 2024 17:54
@dbussink dbussink merged commit b37a802 into vitessio:main Jan 5, 2024
99 checks passed
@dbussink dbussink deleted the dbussink/more-code-cleanup branch January 5, 2024 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: General Changes throughout the code base Type: Internal Cleanup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants