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

types: merge json and types pkg #37578

Merged
merged 2 commits into from
Sep 5, 2022
Merged

types: merge json and types pkg #37578

merged 2 commits into from
Sep 5, 2022

Conversation

YangKeao
Copy link
Member

@YangKeao YangKeao commented Sep 2, 2022 •
edited by lance6716
Loading

Signed-off-by: YangKeao yangkeao@chunibyo.icu

What problem does this PR solve?

Issue Number: close #37577 close #37628

What is changed and how it works?

Simply copy every codes from the json pkg to the types pkg, and rename some of the confusing variables/functions to a better name.

Another circular dependency occurs in the /config, I rewrote them to a manually implementation which doesn't depend on the json pkg.

I NEED NAMESPACE 😿 !

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 2, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • xiongjiwei

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 2, 2022
@YangKeao YangKeao mentioned this pull request Sep 2, 2022
Merged
4 tasks
@YangKeao YangKeao force-pushed the merge-json-and-types branch 5 times, most recently from 9576587 to 77dcad7 Compare September 2, 2022 12:03
@hawkingrei
Copy link
Member

Now, we use the bazel Visibility ability to avoid wrongly importing dependencies.

@hawkingrei
Copy link
Member

Here is an example

@xiongjiwei
Copy link
Contributor

is it ready to review?

@YangKeao
Copy link
Member Author

YangKeao commented Sep 5, 2022

is it ready to review?

Yes! #37579 still needs to fix some tests, but this one is ready (and simple)

@hawkingrei hawkingrei self-requested a review September 5, 2022 08:10
xiongjiwei
xiongjiwei reviewed Sep 5, 2022
View reviewed changes
@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Sep 5, 2022
@YangKeao YangKeao added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Sep 5, 2022
@YangKeao YangKeao force-pushed the merge-json-and-types branch from 77dcad7 to 151dbeb Compare September 5, 2022 08:49
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 5, 2022
hawkingrei
hawkingrei reviewed Sep 5, 2022
View reviewed changes
build/nogo_config.json
@@ -200,8 +200,8 @@
"br/pkg/lightning/mydump/": "br/pkg/lightning/mydump/",
"br/pkg/lightning/restore/opts": "br/pkg/lightning/restore/opts",
"executor/aggregate.go": "executor/aggregate.go",
"types/json/binary_functions.go": "types/json/binary_functions.go",
Copy link
Member

@hawkingrei hawkingrei Sep 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

If you have time to make nogo enable for all the types folder. it is better.

@YangKeao YangKeao force-pushed the merge-json-and-types branch from 9e58f85 to fa67262 Compare September 5, 2022 09:17
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 5, 2022
@YangKeao YangKeao force-pushed the merge-json-and-types branch from fa67262 to b1ebcbc Compare September 5, 2022 09:31
@YangKeao
merge json and types pkg
d6a3a96 
Signed-off-by: YangKeao <yangkeao@chunibyo.icu>
@YangKeao YangKeao force-pushed the merge-json-and-types branch from b1ebcbc to d6a3a96 Compare September 5, 2022 09:33
@YangKeao
add fetch-depth config for dumpling test
5d568cb 
Signed-off-by: YangKeao <yangkeao@chunibyo.icu>
YangKeao
YangKeao commented Sep 5, 2022
View reviewed changes
.github/workflows/integration-test-dumpling-common.yml
# the release version will be empty and the program will panic.
#
# See the `DUMPLING_LDFLAGS` in `Makefile.common` for more information
fetch-depth: 0
Copy link
Member Author

Choose a reason for hiding this comment

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

@hawkingrei PTAL, I let it download the full history of TiDB to get the version through git describe --tags --dirty='-dev'. I think it's necessary to pass the dumpling integration test 🤦‍♂️

Copy link
Member

Choose a reason for hiding this comment

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

@lance6716 PTAL

Copy link
Contributor

Choose a reason for hiding this comment

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

I created an issue just a minutes ago. #37628

LGTM

@lance6716
Copy link
Contributor

/check-issue-triage-complete

@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 5d568cb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 5, 2022
@ti-chi-bot ti-chi-bot merged commit 170dafc into pingcap:master Sep 5, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Sep 5, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test ✅ all 17 tests passed 14 min Fixed
idc-jenkins-ci/integration-cdc-test 🟢 all 37 tests passed 23 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 13 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 8 min 31 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 41 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 5 min 23 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 5 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 53 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 6 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lance6716 lance6716 lance6716 left review comments

@hawkingrei hawkingrei hawkingrei approved these changes

@xiongjiwei xiongjiwei xiongjiwei approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
6 participants
@YangKeao @ti-chi-bot @hawkingrei @xiongjiwei @lance6716 @sre-bot