-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into decommission/get-ap…
…i-fix
- Loading branch information
Showing
53 changed files
with
1,697 additions
and
79 deletions.
There are no files selected for viewing
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
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
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
182 changes: 182 additions & 0 deletions
182
...analysis-common/src/main/java/org/opensearch/analysis/common/EnglishPluralStemFilter.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| /* | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
|
|
||
| package org.opensearch.analysis.common; | ||
|
|
||
| import org.apache.lucene.analysis.TokenFilter; | ||
| import org.apache.lucene.analysis.TokenStream; | ||
| import org.apache.lucene.analysis.en.EnglishMinimalStemFilter; | ||
| import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; | ||
| import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public final class EnglishPluralStemFilter extends TokenFilter { | ||
| private final EnglishPluralStemmer stemmer = new EnglishPluralStemmer(); | ||
| private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); | ||
| private final KeywordAttribute keywordAttr = addAttribute(KeywordAttribute.class); | ||
|
|
||
| public EnglishPluralStemFilter(TokenStream input) { | ||
| super(input); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean incrementToken() throws IOException { | ||
| if (input.incrementToken()) { | ||
| if (!keywordAttr.isKeyword()) { | ||
| final int newlen = stemmer.stem(termAtt.buffer(), termAtt.length()); | ||
| termAtt.setLength(newlen); | ||
| } | ||
| return true; | ||
| } else { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Plural stemmer for English based on the {@link EnglishMinimalStemFilter} | ||
| * <p> | ||
| * This stemmer removes plurals but beyond EnglishMinimalStemFilter adds | ||
| * four new suffix rules to remove dangling e characters: | ||
| * <ul> | ||
| * <li>xes - "boxes" becomes "box"</li> | ||
| * <li>sses - "dresses" becomes "dress"</li> | ||
| * <li>shes - "dishes" becomes "dish"</li> | ||
| * <li>tches - "watches" becomes "watch"</li> | ||
| * </ul> | ||
| * See https://github.com/elastic/elasticsearch/issues/42892 | ||
| * <p> | ||
| * In addition the s stemmer logic is amended so that | ||
| * <ul> | ||
| * <li>ees->ee so that bees matches bee</li> | ||
| * <li>ies->y only on longer words to that ties matches tie</li> | ||
| * <li>oes->o rule so that tomatoes matches tomato but retains e for some words eg shoes to shoe</li> | ||
| * </ul> | ||
| */ | ||
| public static class EnglishPluralStemmer { | ||
|
|
||
| // Words ending in oes that retain the e when stemmed | ||
| public static final char[][] oesExceptions = { "shoes".toCharArray(), "canoes".toCharArray(), "oboes".toCharArray() }; | ||
| // Words ending in ches that retain the e when stemmed | ||
| public static final char[][] chesExceptions = { | ||
| "cliches".toCharArray(), | ||
| "avalanches".toCharArray(), | ||
| "mustaches".toCharArray(), | ||
| "moustaches".toCharArray(), | ||
| "quiches".toCharArray(), | ||
| "headaches".toCharArray(), | ||
| "heartaches".toCharArray(), | ||
| "porsches".toCharArray(), | ||
| "tranches".toCharArray(), | ||
| "caches".toCharArray() }; | ||
|
|
||
| @SuppressWarnings("fallthrough") | ||
| public int stem(char s[], int len) { | ||
| if (len < 3 || s[len - 1] != 's') return len; | ||
|
|
||
| switch (s[len - 2]) { | ||
| case 'u': | ||
| case 's': | ||
| return len; | ||
| case 'e': | ||
| // Modified ies->y logic from original s-stemmer - only work on strings > 4 | ||
| // so spies -> spy still but pies->pie. | ||
| // The original code also special-cased aies and eies for no good reason as far as I can tell. | ||
| // ( no words of consequence - eg http://www.thefreedictionary.com/words-that-end-in-aies ) | ||
| if (len > 4 && s[len - 3] == 'i') { | ||
| s[len - 3] = 'y'; | ||
| return len - 2; | ||
| } | ||
|
|
||
| // Suffix rules to remove any dangling "e" | ||
| if (len > 3) { | ||
| // xes (but >1 prefix so we can stem "boxes->box" but keep "axes->axe") | ||
| if (len > 4 && s[len - 3] == 'x') { | ||
| return len - 2; | ||
| } | ||
| // oes | ||
| if (len > 3 && s[len - 3] == 'o') { | ||
| if (isException(s, len, oesExceptions)) { | ||
| // Only remove the S | ||
| return len - 1; | ||
| } | ||
| // Remove the es | ||
| return len - 2; | ||
| } | ||
| if (len > 4) { | ||
| // shes/sses | ||
| if (s[len - 4] == 's' && (s[len - 3] == 'h' || s[len - 3] == 's')) { | ||
| return len - 2; | ||
| } | ||
|
|
||
| // ches | ||
| if (len > 4) { | ||
| if (s[len - 4] == 'c' && s[len - 3] == 'h') { | ||
| if (isException(s, len, chesExceptions)) { | ||
| // Only remove the S | ||
| return len - 1; | ||
| } | ||
| // Remove the es | ||
| return len - 2; | ||
|
|
||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| default: | ||
| return len - 1; | ||
| } | ||
| } | ||
|
|
||
| private boolean isException(char[] s, int len, char[][] exceptionsList) { | ||
| for (char[] oesRule : exceptionsList) { | ||
| int rulePos = oesRule.length - 1; | ||
| int sPos = len - 1; | ||
| boolean matched = true; | ||
| while (rulePos >= 0 && sPos >= 0) { | ||
| if (oesRule[rulePos] != s[sPos]) { | ||
| matched = false; | ||
| break; | ||
| } | ||
| rulePos--; | ||
| sPos--; | ||
| } | ||
| if (matched) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| } |
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
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
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
19 changes: 19 additions & 0 deletions
19
...-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_decommission_awareness.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "cluster.delete_decommission_awareness": { | ||
| "documentation": { | ||
| "url": "https://opensearch.org/docs/latest/opensearch/rest-api/decommission/", | ||
| "description": "Delete any existing decommission." | ||
| }, | ||
| "stability": "experimental", | ||
| "url": { | ||
| "paths": [ | ||
| { | ||
| "path": "/_cluster/decommission/awareness/", | ||
| "methods": [ | ||
| "DELETE" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 881333b463d47828eda7443b19811763367b1916 |
Oops, something went wrong.