Percent-encode invalid flint index characters #215
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
Signed-off-by: Sean Kao <[email protected]>
seankao-az
requested review from
dai-chen,
rupal-bq,
vamsimanohar,
penghuo,
anirudha,
kaituo and
YANG-DB
as code owners
Signed-off-by: Sean Kao <[email protected]>
dai-chen
reviewed
Jan 9, 2024
flint-spark-integration/src/main/scala/org/opensearch/flint/spark/FlintSparkIndex.scala
Outdated
Show resolved
Hide resolved
noCharger
reviewed
Jan 9, 2024
flint-spark-integration/src/main/scala/org/opensearch/flint/spark/FlintSparkIndex.scala
Outdated
Show resolved
Hide resolved
Signed-off-by: Sean Kao <[email protected]>
seankao-az
commented
Jan 9, 2024
| StringBuilder builder = new StringBuilder(indexName.length()); | ||
| for (char ch : indexName.toCharArray()) { | ||
| if (charsToEncode.contains(ch)) { | ||
| builder.append("%").append(String.format("%02X", (int) ch)); |
There was a problem hiding this comment.
slightly prefer this over builder.append(String.format("%%%02X", (int) ch)). suggestions are welcome
edit: did a bit more reading and changed my mind
dai-chen
approved these changes
Jan 9, 2024
flint-core/src/main/scala/org/opensearch/flint/core/storage/FlintOpenSearchClient.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Sean Kao <[email protected]>
|
FYI, the |
Signed-off-by: Sean Kao <[email protected]>
|
@dai-chen I couldn't merge nor add label 😞 |
No worries. Let me do it. :) |
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-spark/backport-0.1 0.1
# Navigate to the new working tree
pushd ../.worktrees/opensearch-spark/backport-0.1
# Create a new branch
git switch --create backport/backport-215-to-0.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3528b6660f7f1ddb2fbb9d0af8a0748e545424e3
# Push it to GitHub
git push --set-upstream origin backport/backport-215-to-0.1
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-spark/backport-0.1Then, create a pull request where the |
|
@seankao-az Auto backport failed. Could you check if any conflict and publish backport PR manually? |
seankao-az
added a commit
to seankao-az/opensearch-spark
that referenced
this pull request
Jan 9, 2024
* percent-encode invalid flint index characters Signed-off-by: Sean Kao <[email protected]> * formatting Signed-off-by: Sean Kao <[email protected]> * move encoding logic to FlintOpenSearchClient Signed-off-by: Sean Kao <[email protected]> * minor arg fix and string format fix Signed-off-by: Sean Kao <[email protected]> * fix import order Signed-off-by: Sean Kao <[email protected]> --------- Signed-off-by: Sean Kao <[email protected]> (cherry picked from commit 3528b66)
dai-chen
pushed a commit
that referenced
this pull request
Jan 9, 2024
* percent-encode invalid flint index characters Signed-off-by: Sean Kao <[email protected]> * formatting Signed-off-by: Sean Kao <[email protected]> * move encoding logic to FlintOpenSearchClient Signed-off-by: Sean Kao <[email protected]> * minor arg fix and string format fix Signed-off-by: Sean Kao <[email protected]> * fix import order Signed-off-by: Sean Kao <[email protected]> --------- Signed-off-by: Sean Kao <[email protected]> (cherry picked from commit 3528b66)
6 tasks
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.
Description
Handle special characters when generating Flint index name by percent-encoding the invalid OpenSearch index name characters.
Issues Resolved
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.