forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix caching for PreConfiguredTokenFilter (elastic#50912)
The PreConfiguredTokenFilter#singletonWithVersion uses the version internaly for the token filter factories but it registers only one instance in the cahce and not one instance per version. This can lead to exceptions like the one described in elastic#50734 since the singleton is created and cached using the version created of the first index that is processed. Remove the singletonWithVersion() methods and use the elasticsearchVersion() methods instead. Fixes: elastic#50734
- Loading branch information
Showing
4 changed files
with
142 additions
and
21 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
130 changes: 130 additions & 0 deletions
130
server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.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,130 @@ | ||
| /* | ||
| * 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.index.analysis; | ||
|
|
||
| import org.apache.lucene.analysis.TokenFilter; | ||
| 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.test.ESTestCase; | ||
| import org.elasticsearch.test.IndexSettingsModule; | ||
| import org.elasticsearch.test.VersionUtils; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class PreConfiguredTokenFilterTests extends ESTestCase { | ||
|
|
||
| private final Settings emptyNodeSettings = Settings.builder() | ||
| .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) | ||
| .build(); | ||
|
|
||
| public void testCachingWithSingleton() throws IOException { | ||
| PreConfiguredTokenFilter pctf = | ||
| PreConfiguredTokenFilter.singleton("singleton", randomBoolean(), | ||
| (tokenStream) -> new TokenFilter(tokenStream) { | ||
| @Override | ||
| public boolean incrementToken() { | ||
| return false; | ||
| } | ||
| }); | ||
|
|
||
| IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("test", Settings.EMPTY); | ||
|
|
||
| Version version1 = VersionUtils.randomVersion(random()); | ||
| Settings settings1 = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version1) | ||
| .build(); | ||
| TokenFilterFactory tff_v1_1 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "singleton", settings1); | ||
| TokenFilterFactory tff_v1_2 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "singleton", settings1); | ||
| assertSame(tff_v1_1, tff_v1_2); | ||
|
|
||
| Version version2 = randomValueOtherThan(version1, () -> randomFrom(VersionUtils.allVersions())); | ||
| Settings settings2 = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version2) | ||
| .build(); | ||
|
|
||
| TokenFilterFactory tff_v2 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "singleton", settings2); | ||
| assertSame(tff_v1_1, tff_v2); | ||
| } | ||
|
|
||
| public void testCachingWithElasticsearchVersion() throws IOException { | ||
| PreConfiguredTokenFilter pctf = | ||
| PreConfiguredTokenFilter.elasticsearchVersion("elasticsearch_version", randomBoolean(), | ||
| (tokenStream, esVersion) -> new TokenFilter(tokenStream) { | ||
| @Override | ||
| public boolean incrementToken() { | ||
| return false; | ||
| } | ||
| }); | ||
|
|
||
| IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("test", Settings.EMPTY); | ||
|
|
||
| Version version1 = VersionUtils.randomVersion(random()); | ||
| Settings settings1 = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version1) | ||
| .build(); | ||
| TokenFilterFactory tff_v1_1 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "elasticsearch_version", settings1); | ||
| TokenFilterFactory tff_v1_2 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "elasticsearch_version", settings1); | ||
| assertSame(tff_v1_1, tff_v1_2); | ||
|
|
||
| Version version2 = randomValueOtherThan(version1, () -> randomFrom(VersionUtils.allVersions())); | ||
| Settings settings2 = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version2) | ||
| .build(); | ||
|
|
||
| TokenFilterFactory tff_v2 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "elasticsearch_version", settings2); | ||
| assertNotSame(tff_v1_1, tff_v2); | ||
| } | ||
|
|
||
| public void testCachingWithLuceneVersion() throws IOException { | ||
| PreConfiguredTokenFilter pctf = | ||
| PreConfiguredTokenFilter.luceneVersion("lucene_version", randomBoolean(), | ||
| (tokenStream, luceneVersion) -> new TokenFilter(tokenStream) { | ||
| @Override | ||
| public boolean incrementToken() { | ||
| return false; | ||
| } | ||
| }); | ||
|
|
||
| IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("test", Settings.EMPTY); | ||
|
|
||
| Version version1 = Version.CURRENT; | ||
| Settings settings1 = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version1) | ||
| .build(); | ||
| TokenFilterFactory tff_v1_1 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "lucene_version", settings1); | ||
| TokenFilterFactory tff_v1_2 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "lucene_version", settings1); | ||
| assertSame(tff_v1_1, tff_v1_2); | ||
|
|
||
| byte major = VersionUtils.getFirstVersion().major; | ||
| Version version2 = Version.fromString(major - 1 + ".0.0"); | ||
| Settings settings2 = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version2) | ||
| .build(); | ||
|
|
||
| TokenFilterFactory tff_v2 = | ||
| pctf.get(indexSettings, TestEnvironment.newEnvironment(emptyNodeSettings), "lucene_version", settings2); | ||
| assertNotSame(tff_v1_1, tff_v2); | ||
| } | ||
| } |