diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index fd66fe999e3..fafce11d0e1 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -154,6 +154,9 @@ Optimizations * LUCENE-4854: Speed up TermsEnum of FieldCache.getDocTermOrds. (Robert Muir) +* LUCENE-4857: Don't unnecessarily copy stem override map in + StemmerOverrideFilter. (Simon Willnauer) + ======================= Lucene 4.2.0 ======================= Changes in backwards compatibility policy diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java index b44ac8fefca..bf2280df474 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java @@ -24,7 +24,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.util.CharArrayMap; -import org.apache.lucene.util.Version; /** * Provides the ability to override any {@link KeywordAttribute} aware stemmer @@ -44,10 +43,10 @@ public final class StemmerOverrideFilter extends TokenFilter { * so that they will not be stemmed with stemmers down the chain. *

*/ - public StemmerOverrideFilter(Version matchVersion, TokenStream input, + public StemmerOverrideFilter(TokenStream input, CharArrayMap dictionary) { super(input); - this.dictionary = CharArrayMap.copy(matchVersion, dictionary); + this.dictionary = dictionary; } @Override diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java index ed0ab575741..334f7fa0985 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java @@ -66,6 +66,6 @@ public class StemmerOverrideFilterFactory extends TokenFilterFactory implements @Override public TokenStream create(TokenStream input) { - return dictionary == null ? input : new StemmerOverrideFilter(luceneMatchVersion, input, dictionary); + return dictionary == null ? input : new StemmerOverrideFilter(input, dictionary); } }