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

[Multi-Database Support] Remove unused datasource configs #4754

Merged
merged 2 commits into from Mar 1, 2023

Conversation

shoothzj
Copy link
Member

@shoothzj shoothzj commented Mar 1, 2023

What's the purpose of this PR

Remove unnecessary set names utf8mb4.
We have set names utf8mb4 configed in apollo-common's application.yaml spring.jpa.datasource.hikari.connectionInitSql.
I preferred to keep application.yaml, it's more flexible.
Tested with wireshark
image

@codecov
Copy link

codecov bot commented Mar 1, 2023

Codecov Report

Merging #4754 (a5d4fbe) into master (645b215) will increase coverage by 0.04%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #4754      +/-   ##
============================================
+ Coverage     47.22%   47.27%   +0.04%     
+ Complexity     1657     1655       -2     
============================================
  Files           349      346       -3     
  Lines         10691    10662      -29     
  Branches       1062     1058       -4     
============================================
- Hits           5049     5040       -9     
+ Misses         5336     5316      -20     
  Partials        306      306              
Impacted Files Coverage Δ
...oServiceRegistryDeregisterApplicationListener.java 30.00% <0.00%> (-45.00%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@nobodyiam
Copy link
Member

nobodyiam commented Mar 1, 2023

I believe we could remove this file as well as the datasource folder, application-ctrip.properties and application-ctrip.yml, they are for Ctrip internal use only.

@shoothzj shoothzj changed the title [Multi-Database Support] Remove duplicate set names utf8mb4 [Multi-Database Support] Remove unused datasource configs Mar 1, 2023
@shoothzj
Copy link
Member Author

shoothzj commented Mar 1, 2023

@nobodyiam Fixed. Thanks for your sharing.

Copy link
Member

@nobodyiam nobodyiam left a comment

Choose a reason for hiding this comment

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

LGTM

@nobodyiam nobodyiam merged commit a76521e into apolloconfig:master Mar 1, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Mar 1, 2023
@shoothzj shoothzj deleted the remove-duplicate-set-names branch March 1, 2023 13:19
@nobodyiam nobodyiam added this to the 2.2.0 milestone Aug 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants