Changes for migration to commons-configuration2 #11985
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #11985 +/- ##
============================================
- Coverage 61.64% 61.64% -0.01%
- Complexity 1152 1153 +1
============================================
Files 2407 2407
Lines 130923 130907 -16
Branches 20223 20222 -1
============================================
- Hits 80705 80693 -12
+ Misses 44338 44325 -13
- Partials 5880 5889 +9
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
abhioncbr
force-pushed
the
upgrade-metadata-commons-configuration2
branch
2 times, most recently
from
cb96abd
to
49a2203
Compare
abhioncbr
commented
Dec 4, 2023
pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
Outdated
Show resolved
Hide resolved
abhioncbr
commented
Dec 5, 2023
...c/test/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessorTest.java
Show resolved
Hide resolved
|
@Jackie-Jiang / @xiangfu0 / @walterddr please review. Thanks |
Jackie-Jiang
reviewed
Dec 6, 2023
pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
Outdated
Show resolved
Hide resolved
...c/test/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessorTest.java
Outdated
Show resolved
Hide resolved
pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
Outdated
Show resolved
Hide resolved
Jackie-Jiang
added
the
incompatible
abhioncbr
force-pushed
the
upgrade-metadata-commons-configuration2
branch
from
b744ebe
to
34d976c
Compare
|
Please review once more @Jackie-Jiang. Thanks |
pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
Outdated
Show resolved
Hide resolved
| @@ -288,6 +195,7 @@ public static <T> T convert(Object value, Class<T> returnType) { | |||
| * - Escaping comma with backslash doesn't work when comma is preceded by a backslash | |||
| */ | |||
| public static String replaceSpecialCharacterInPropertyValue(String value) { | |||
| value = StringEscapeUtils.escapeJava(value); | |||
There was a problem hiding this comment.
This is needed in commons-configuration2, as it does not support string escape/unescape like commons-configuration1.
There was a problem hiding this comment.
Can you give an example of what the property will look like in v1 vs v2? Will v1 automatically escape/unescape the value?
pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
Outdated
Show resolved
Hide resolved
abhioncbr
force-pushed
the
upgrade-metadata-commons-configuration2
branch
from
34d976c
to
e502b71
Compare
abhioncbr
force-pushed
the
upgrade-metadata-commons-configuration2
branch
from
60988cd
to
3c9c15a
Compare
Jackie-Jiang
approved these changes
Dec 15, 2023
pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/SegmentMetadataUtils.java
Outdated
Show resolved
Hide resolved
pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
Outdated
Show resolved
Hide resolved
| @@ -288,6 +195,7 @@ public static <T> T convert(Object value, Class<T> returnType) { | |||
| * - Escaping comma with backslash doesn't work when comma is preceded by a backslash | |||
| */ | |||
| public static String replaceSpecialCharacterInPropertyValue(String value) { | |||
| value = StringEscapeUtils.escapeJava(value); | |||
There was a problem hiding this comment.
Can you give an example of what the property will look like in v1 vs v2? Will v1 automatically escape/unescape the value?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As per the issue and in continuation of the previous work #11792, #11868, #11916, This PR upgrade the
Metadatatocommons-configuartion2.