-
Notifications
You must be signed in to change notification settings - Fork 25.2k
Use preconfigured filters correctly in Analyze API #43568
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
Merged
romseygeek
merged 9 commits into
elastic:master
from
romseygeek:analyze-preconfig-filters
Jun 27, 2019
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
7bdeed0
Use preconfig filters when no index and no config
romseygeek 9442e41
Fall back to global components if there are no prebuilt ones under th…
romseygeek 04d5155
Add unit-test for fallback
romseygeek fd4086b
Add fix for #43582
romseygeek 8c01ed3
Fixes #43621
romseygeek 4e4d08a
Merge remote-tracking branch 'origin/master' into analyze-preconfig-f…
romseygeek 99ba487
Merge remote-tracking branch 'origin/master' into analyze-preconfig-f…
romseygeek b593496
dry up tests a bit
romseygeek 62e9822
checkstyle
romseygeek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
98 changes: 98 additions & 0 deletions
98
...lysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java
This file contains hidden or 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,98 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| package org.elasticsearch.analysis.common; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.env.Environment; | ||
| import org.elasticsearch.env.TestEnvironment; | ||
| import org.elasticsearch.index.IndexSettings; | ||
| import org.elasticsearch.index.analysis.IndexAnalyzers; | ||
| import org.elasticsearch.index.analysis.NamedAnalyzer; | ||
| import org.elasticsearch.indices.analysis.AnalysisModule; | ||
| import org.elasticsearch.test.ESTokenStreamTestCase; | ||
| import org.elasticsearch.test.IndexSettingsModule; | ||
| import org.elasticsearch.test.VersionUtils; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
|
|
||
| public class EdgeNGramTokenizerTests extends ESTokenStreamTestCase { | ||
|
|
||
| private IndexAnalyzers buildAnalyzers(Version version, String tokenizer) throws IOException { | ||
| Settings settings = Settings.builder() | ||
| .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) | ||
| .build(); | ||
| Settings indexSettings = Settings.builder() | ||
| .put(IndexMetaData.SETTING_VERSION_CREATED, version) | ||
| .put("index.analysis.analyzer.my_analyzer.tokenizer", tokenizer) | ||
| .build(); | ||
| IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", indexSettings); | ||
| return new AnalysisModule(TestEnvironment.newEnvironment(settings), | ||
| Collections.singletonList(new CommonAnalysisPlugin())).getAnalysisRegistry().build(idxSettings); | ||
| } | ||
|
|
||
| public void testPreConfiguredTokenizer() throws IOException { | ||
|
|
||
| // Before 7.3 we return ngrams of length 1 only | ||
| { | ||
| Version version = VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, | ||
| VersionUtils.getPreviousVersion(Version.V_7_3_0)); | ||
| try (IndexAnalyzers indexAnalyzers = buildAnalyzers(version, "edge_ngram")) { | ||
| NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer"); | ||
| assertNotNull(analyzer); | ||
| assertAnalyzesTo(analyzer, "test", new String[]{"t"}); | ||
| } | ||
| } | ||
|
|
||
| // Check deprecated name as well | ||
| { | ||
| Version version = VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, | ||
| VersionUtils.getPreviousVersion(Version.V_7_3_0)); | ||
| try (IndexAnalyzers indexAnalyzers = buildAnalyzers(version, "edgeNGram")) { | ||
| NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer"); | ||
| assertNotNull(analyzer); | ||
| assertAnalyzesTo(analyzer, "test", new String[]{"t"}); | ||
| } | ||
| } | ||
|
|
||
| // Afterwards, we return ngrams of length 1 and 2, to match the default factory settings | ||
| { | ||
| try (IndexAnalyzers indexAnalyzers = buildAnalyzers(Version.CURRENT, "edge_ngram")) { | ||
| NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer"); | ||
| assertNotNull(analyzer); | ||
| assertAnalyzesTo(analyzer, "test", new String[]{"t", "te"}); | ||
| } | ||
| } | ||
|
|
||
| // Check deprecated name as well | ||
| { | ||
| try (IndexAnalyzers indexAnalyzers = buildAnalyzers(Version.CURRENT, "edgeNGram")) { | ||
| NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer"); | ||
| assertNotNull(analyzer); | ||
| assertAnalyzesTo(analyzer, "test", new String[]{"t", "te"}); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
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.
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.
same here