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

11085: Pre PinotConfig commons-configuartions2 upgrade #11868

Merged

Conversation

abhioncbr
Copy link
Contributor

@abhioncbr abhioncbr commented Oct 25, 2023

  • As per the issue, This is the pre-steps for upgrading the PinotConfiguration to commons-configuration2.
  • In continuation of the last PR

cc: @Jackie-Jiang / @xiangfu0 / @walterddr

@codecov-commenter
Copy link

codecov-commenter commented Oct 25, 2023

Codecov Report

Merging #11868 (9bc5984) into master (91bba48) will increase coverage by 0.03%.
Report is 10 commits behind head on master.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master   #11868      +/-   ##
============================================
+ Coverage     61.39%   61.43%   +0.03%     
  Complexity      207      207              
============================================
  Files          2373     2375       +2     
  Lines        128276   128519     +243     
  Branches      19803    19849      +46     
============================================
+ Hits          78760    78950     +190     
- Misses        43837    43865      +28     
- Partials       5679     5704      +25     
Flag Coverage Δ
custom-integration1 <0.01% <0.00%> (-0.01%) ⬇️
integration <0.01% <0.00%> (-0.01%) ⬇️
integration1 <0.01% <0.00%> (-0.01%) ⬇️
integration2 0.00% <0.00%> (ø)
java-11 61.36% <100.00%> (-0.01%) ⬇️
java-21 61.31% <100.00%> (+0.05%) ⬆️
skip-bytebuffers-false 61.42% <100.00%> (+0.03%) ⬆️
skip-bytebuffers-true 61.26% <100.00%> (+0.03%) ⬆️
temurin 61.43% <100.00%> (+0.03%) ⬆️
unittests 61.42% <100.00%> (+0.03%) ⬆️
unittests1 46.65% <100.00%> (-0.01%) ⬇️
unittests2 27.58% <0.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...pache/pinot/spi/env/CommonsConfigurationUtils.java 70.83% <100.00%> (-8.86%) ⬇️

... and 24 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@abhioncbr abhioncbr force-pushed the 11085-PinotConfig-configuartions2-upgrade branch from f8ac3a6 to 8588f1e Compare October 26, 2023 01:37
@abhioncbr abhioncbr changed the title 11085: PinotConfig commons-configuartions2 upgrade 11085: Pre PinotConfig commons-configuartions2 upgrade Oct 26, 2023
@abhioncbr abhioncbr marked this pull request as ready for review October 26, 2023 01:43
@@ -211,7 +211,7 @@ protected PinotConfiguration getDefaultServerConfiguration() {
CertBasedTlsChannelAccessControlFactory.class.getName());
prop.put("pinot.server.adminapi.access.protocols", "internal");
prop.put("pinot.server.adminapi.access.protocols.internal.protocol", "https");
prop.put("pinot.server.adminapi.access.protocols.internal.port", "7443");
prop.put("pinot.server.adminapi.access.protocols.internal.port", "9443");
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I always get the issue in binding to this port on my local Mac machine with Intellij, Is it okay to change the port to 9443?

Copy link
Contributor

Choose a reason for hiding this comment

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

I plan to randomize ports for tests: #11861

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reversed my change. Thanks

public static Stream<String> getKeysStream(Configuration configuration) {
return StreamSupport.stream(getIterable(configuration.getKeys()).spliterator(), false);
}

public static Stream<String> getKeysStream(org.apache.commons.configuration2.Configuration configuration) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Put org.apache.commons.configuration2.Configuration to import section and make the deprecated org.apache.commons.configuration.Configuration to full name.

@xiangfu0 xiangfu0 merged commit 8e8bd32 into apache:master Oct 28, 2023
20 of 21 checks passed
@abhioncbr abhioncbr deleted the 11085-PinotConfig-configuartions2-upgrade branch April 25, 2024 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants