-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Fix mapping char_filter when mapping a hashtag #7591
Fix mapping char_filter when mapping a hashtag #7591
Conversation
01e3675
to
f5535d1
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
022c01c
to
13131f3
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #7591 +/- ##
============================================
- Coverage 70.84% 70.75% -0.10%
+ Complexity 56508 56114 -394
============================================
Files 4721 4680 -41
Lines 267470 266072 -1398
Branches 39211 39069 -142
============================================
- Hits 189477 188247 -1230
+ Misses 61970 61844 -126
+ Partials 16023 15981 -42
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this change we have two code paths, one that removes comments and another that doesn't. Why? In what cases would one want both behaviors? What tests break if you get rid of supporting comments altogether?
Assuming the answer is "we don't need comments", for 3.0 we could just do it. Then we can discuss options for backporting this into 2.x, for example we could tream # =>
as something special.
Signed-off-by: Nathan Myles <[email protected]> Issue: opensearch-project#7308
a034883
to
e83bf87
Compare
Gradle Check (Jenkins) Run Completed with:
|
@dblock I think this PR is pretty much good to go, just hitting some pipeline instability. I've been rebasing when I can, hopefully it'll be resolved soon. |
@dblock Looks like the checks are all green now, though I haven't rebased this today. Is this good to go now? Or should I rebase this again today? |
Merged, thank you. Watch the backports for failures, might need manual ones. |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-7591-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e049338c714db77517c5e8bb94b6b24a7b0a3281
# Push it to GitHub
git push --set-upstream origin backport/backport-7591-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-7591-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e049338c714db77517c5e8bb94b6b24a7b0a3281
# Push it to GitHub
git push --set-upstream origin backport/backport-7591-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-7591-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e049338c714db77517c5e8bb94b6b24a7b0a3281
# Push it to GitHub
git push --set-upstream origin backport/backport-7591-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.3 Then, create a pull request where the |
Backports will need to be manual :( will you do them please @nathanmyles ? |
Yep, I'll look at these. I'll link the PRs to this one. Let me know if there's anything special I should do. |
Signed-off-by: Nathan Myles <[email protected]> Issue: opensearch-project#7308 (cherry picked from commit e049338)
Signed-off-by: Nathan Myles <[email protected]> Issue: #7308 (cherry picked from commit e049338)
@nathanmyles #8121 has been merged. Please create similar backport PRs for t |
Signed-off-by: Nathan Myles <[email protected]> Issue: opensearch-project#7308 (cherry picked from commit e049338)
Signed-off-by: Nathan Myles <[email protected]> Issue: opensearch-project#7308 (cherry picked from commit e049338)
@kartg Created the other backport PRs, let me know if there's anything else I need to do. Also, would you know when this change would make it into the AWS opensearch versions? |
Signed-off-by: Nathan Myles <[email protected]> Issue: #7308 (cherry picked from commit e049338)
Signed-off-by: Nathan Myles <[email protected]> Issue: #7308 (cherry picked from commit e049338)
…) (opensearch-project#8146) Signed-off-by: Nathan Myles <[email protected]> Issue: opensearch-project#7308 (cherry picked from commit e049338)
@nathanmyles Can't confirm or deny which versions of AWS OpenSearch it will go into and when, but if you do open a customer support ticket they can certainly find out and track it for you. |
Signed-off-by: Nathan Myles <[email protected]> Issue: opensearch-project#7308 Signed-off-by: Rishab Nahata <[email protected]>
Signed-off-by: Nathan Myles <[email protected]> Issue: opensearch-project#7308 Signed-off-by: Shivansh Arora <[email protected]>
Description
Fix the mapping
char_filter
to allow mapping hashtags, example:More details in the issue below.
Related Issues
Resolves: #7308
Check List
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.