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

Added "cjk" analyzer. #604

Merged
merged 4 commits into from
Aug 22, 2023
Merged

Conversation

MikePieperSer
Copy link
Contributor

Description

Add support for "cjk" analyzer.

Issues Resolved

Closes #592

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.

CHANGELOG.md Show resolved Hide resolved
@reta
Copy link
Collaborator

reta commented Aug 21, 2023

Ahhh, DCO check is failing for some reasons ...

reta
reta previously approved these changes Aug 21, 2023
@MikePieperSer
Copy link
Contributor Author

Sorry, gave my complete name, again. Shall I fix it and force push?

@reta
Copy link
Collaborator

reta commented Aug 21, 2023

Sorry, gave my complete name, again. Shall I fix it and force push?

Yes please, thank you

VachaShah
VachaShah previously approved these changes Aug 21, 2023
Copy link
Collaborator

@VachaShah VachaShah left a comment

Choose a reason for hiding this comment

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

This is great, thanks @MikePieperSer!

It would also be helpful if we have these code snippets listed in the user guide in an upcoming PR.

@VachaShah
Copy link
Collaborator

Also can you please fix the merge conflicts since the other PR is merged?

@@ -90,6 +90,8 @@ public enum Kind implements JsonEnum {

Whitespace("whitespace"),

Cjk("cjk"),
Copy link
Member

Choose a reason for hiding this comment

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

Tabs vs. spaces!

Signed-off-by: pieper <mike.pieper@ser.de>
Signed-off-by: pieper <mike.pieper@ser.de>
Signed-off-by: pieper <mike.pieper@ser.de>
Signed-off-by: pieper <mike.pieper@ser.de>
@MikePieperSer
Copy link
Contributor Author

Can we also backport this to 2.x please?

@VachaShah VachaShah merged commit e8fcb43 into opensearch-project:main Aug 22, 2023
29 checks passed
@VachaShah VachaShah added the backport 2.x Backport to 2.x branch label Aug 22, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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-604-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e8fcb43ea2e0ee67079bd092a9d1a5da9d90bff7
# Push it to GitHub
git push --set-upstream origin backport/backport-604-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 base branch is 2.x and the compare/head branch is backport/backport-604-to-2.x.

VachaShah pushed a commit to VachaShah/opensearch-java that referenced this pull request Aug 22, 2023
* Added "cjk" analyzer.

Signed-off-by: pieper <mike.pieper@ser.de>

* Adapted changelog.

Signed-off-by: pieper <mike.pieper@ser.de>

* Fixed license headers.

Signed-off-by: pieper <mike.pieper@ser.de>

* Tab vs. Spaces fix.

Signed-off-by: pieper <mike.pieper@ser.de>

---------

Signed-off-by: pieper <mike.pieper@ser.de>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
reta pushed a commit that referenced this pull request Aug 22, 2023
* Added "smartcn" analyzer. (#605)

* Added "smartcn" analyzer.

Signed-off-by: pieper <mike.pieper@ser.de>

* Adapted changelog.

Signed-off-by: pieper <mike.pieper@ser.de>

* Fixed license headers.

Signed-off-by: pieper <mike.pieper@ser.de>

* Fixed release number.

Signed-off-by: pieper <mike.pieper@ser.de>

---------

Signed-off-by: pieper <mike.pieper@ser.de>
Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Added "cjk" analyzer. (#604)

* Added "cjk" analyzer.

Signed-off-by: pieper <mike.pieper@ser.de>

* Adapted changelog.

Signed-off-by: pieper <mike.pieper@ser.de>

* Fixed license headers.

Signed-off-by: pieper <mike.pieper@ser.de>

* Tab vs. Spaces fix.

Signed-off-by: pieper <mike.pieper@ser.de>

---------

Signed-off-by: pieper <mike.pieper@ser.de>
Signed-off-by: Vacha Shah <vachshah@amazon.com>

---------

Signed-off-by: pieper <mike.pieper@ser.de>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Co-authored-by: MikePieperSer <41434171+MikePieperSer@users.noreply.github.com>
@MikePieperSer MikePieperSer deleted the add_cjk branch August 23, 2023 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Missing support for "cjk" analyzer
4 participants